Olena-patches

Download

olena-patches@lrde.epita.fr

November 2010

7 participants
370 discussions

last-svn-commit-575-g9723ab6 Fix man error.
by Arthur Crepin-Leblond 18 Nov '10

18 Nov '10

* arthur/xml_transform/README * arthur/xml_transform/main.cc --- scribo/sandbox/ChangeLog | 7 +++++++ scribo/sandbox/arthur/xml_transform/README | 2 +- scribo/sandbox/arthur/xml_transform/main.cc | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index dcff59e..4583666 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,3 +1,10 @@ +2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> + + Fix man error. + + * arthur/xml_transform/README + * arthur/xml_transform/main.cc + 2010-08-05 Arthur Crepin-Leblond <crepin@ptaouchnok.lrde.epita.fr@> Output change in xml_tranform. diff --git a/scribo/sandbox/arthur/xml_transform/README b/scribo/sandbox/arthur/xml_transform/README index 1733535..33c4dd3 100644 --- a/scribo/sandbox/arthur/xml_transform/README +++ b/scribo/sandbox/arthur/xml_transform/README @@ -19,7 +19,7 @@ OpenDocument output: Base 64 operations: --to-base64 input.xml image output.xml Creates a container XML file. It will contain regions which are cropped and converted in base 64. - --to-base64-no-crop input.xml mage output.xml Same as --to-base64 but only the full picture will be converted, regions are not cropped + --to-base64-no-crop input.xml image output.xml Same as --to-base64 but only the full picture will be converted, regions are not cropped --from-base64 input.xml output_dir Decodes a XML file which has been encoded in base 64, regions will be converted into png files and saved in output_dir. Requirements: diff --git a/scribo/sandbox/arthur/xml_transform/main.cc b/scribo/sandbox/arthur/xml_transform/main.cc index 2270d2e..d35e80d 100644 --- a/scribo/sandbox/arthur/xml_transform/main.cc +++ b/scribo/sandbox/arthur/xml_transform/main.cc @@ -40,7 +40,7 @@ int main(int argc, char **argv) "\t\033[01m--to-base64\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.xml\033[00m" "\t\t\tCreates a container XML file. It will contain regions which are cropped and converted in base 64.\n" - "\t\033[01m--to-base64-no-crop\033[00m \033[04minput.xml\033[00m \033[04image\033[00m \033[04moutput.xml\033[00m" + "\t\033[01m--to-base64-no-crop\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.xml\033[00m" "\t\tSame as --to-base64 but only the full picture will be converted, regions are not cropped\n" "\t\033[01m--from-base64\033[00m \033[04minput.xml\033[00m \033[04moutput_dir\033[00m" -- 1.5.6.5

1 0

last-svn-commit-574-g432df10 Add arrows shortcuts.
by Arthur Crepin-Leblond 18 Nov '10

18 Nov '10

* demo/viewer/browser_widget.cc: prev/next binded to Ctrl+Left/Right. --- scribo/ChangeLog | 6 ++++++ scribo/demo/viewer/browser_widget.cc | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f2160fa..4fa6c77 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,11 @@ 2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> + Add arrows shortcuts. + + * demo/viewer/browser_widget.cc: prev/next binded to Ctrl+Left/Right. + +2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> + Add shortcuts in Qt interface. * demo/viewer/browser_widget.cc: Change arrows icon. diff --git a/scribo/demo/viewer/browser_widget.cc b/scribo/demo/viewer/browser_widget.cc index dd0bc1c..7e01789 100644 --- a/scribo/demo/viewer/browser_widget.cc +++ b/scribo/demo/viewer/browser_widget.cc @@ -36,6 +36,8 @@ BrowserWidget::BrowserWidget(QDirModel* files, QString dir) prev->setIcon(style()->standardIcon(QStyle::SP_ArrowLeft)); next->setIcon(style()->standardIcon(QStyle::SP_ArrowRight)); + next->setShortcut(QKeySequence("Ctrl+right")); + prev->setShortcut(QKeySequence("Ctrl+left")); QLabel* title = new QLabel(tr("Images")); title->setAlignment(Qt::AlignHCenter); -- 1.5.6.5

1 0

last-svn-commit-573-g1f5268f Add shortcuts in Qt interface.
by Arthur Crepin-Leblond 18 Nov '10

18 Nov '10

* demo/viewer/browser_widget.cc: Change arrows icon. * demo/viewer/help_dialog.cc: Add more informations. * demo/viewer/key_widget.cc, * demo/viewer/key_widget.hh: Add setAll(bool). * demo/viewer/viewer.cc, * demo/viewer/viewer.hh: Add shortcuts. --- scribo/ChangeLog | 11 ++++ scribo/demo/viewer/browser_widget.cc | 5 +- scribo/demo/viewer/help_dialog.cc | 13 ++++-- scribo/demo/viewer/key_widget.cc | 15 ++++++- scribo/demo/viewer/key_widget.hh | 3 + scribo/demo/viewer/viewer.cc | 85 +++++++++++++++++++++++----------- scribo/demo/viewer/viewer.hh | 1 + 7 files changed, 99 insertions(+), 34 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1417b40..f2160fa 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,14 @@ +2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> + + Add shortcuts in Qt interface. + + * demo/viewer/browser_widget.cc: Change arrows icon. + * demo/viewer/help_dialog.cc: Add more informations. + * demo/viewer/key_widget.cc, + * demo/viewer/key_widget.hh: Add setAll(bool). + * demo/viewer/viewer.cc, + * demo/viewer/viewer.hh: Add shortcuts. + 2010-08-04 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> Fix bug in Qt interface. diff --git a/scribo/demo/viewer/browser_widget.cc b/scribo/demo/viewer/browser_widget.cc index b9ccbec..dd0bc1c 100644 --- a/scribo/demo/viewer/browser_widget.cc +++ b/scribo/demo/viewer/browser_widget.cc @@ -33,8 +33,9 @@ BrowserWidget::BrowserWidget(QDirModel* files, QString dir) { QToolButton* next= new QToolButton(); QToolButton* prev= new QToolButton(); - next->setArrowType(Qt::RightArrow); - prev->setArrowType(Qt::LeftArrow); + + prev->setIcon(style()->standardIcon(QStyle::SP_ArrowLeft)); + next->setIcon(style()->standardIcon(QStyle::SP_ArrowRight)); QLabel* title = new QLabel(tr("Images")); title->setAlignment(Qt::AlignHCenter); diff --git a/scribo/demo/viewer/help_dialog.cc b/scribo/demo/viewer/help_dialog.cc index 932d66f..836413a 100644 --- a/scribo/demo/viewer/help_dialog.cc +++ b/scribo/demo/viewer/help_dialog.cc @@ -40,10 +40,15 @@ HelpDialog::HelpDialog() "Document layout viewer:\n" "\n" "Usage:\n" - " - Choose an image file in the file browser\n" - " - If the document layout is present\n" - " (XML file with the same name),\n" - " select regions to display their properties.\n" + " - Choose an image file in the file browser,\n" + "if XML file(s) whose prefix name is the same as\n" + "the image name (i.e.image _name(_ .*)?.xml) is present\n" + "then you can choose the one you want in the step\n" + "chooser to display it on the scene.\n" + "- To load a base 64 encoded XML file,\n" + "its extension has to be .xmlc otherwise \n" + "the program won't recognize it !\n" + " - Select regions to display their properties.\n" " - Use the mouse or keyboard to move and zoom\n" " (Arrows, PageUp, PageDown, Home, End).\n" "\n"); diff --git a/scribo/demo/viewer/key_widget.cc b/scribo/demo/viewer/key_widget.cc index 228ad67..f567992 100644 --- a/scribo/demo/viewer/key_widget.cc +++ b/scribo/demo/viewer/key_widget.cc @@ -39,9 +39,10 @@ KeyWidget::KeyWidget(const region::KeyMap& key_map) items_->setHeaderHidden(true); text_->setCheckState(0, Qt::Checked); + text_->setExpanded(true); + regions_->setCheckState(0, Qt::Checked); regions_->setExpanded(true); - text_->setExpanded(true); for (int i = 0; i < 3; ++i) add_item_(key_map.at(i).first, key_map.at(i).second, @@ -70,6 +71,18 @@ void KeyWidget::update_all() update(regions_->child(i)); } +void KeyWidget::setAll(bool b) +{ + Qt::CheckState state; + if (b) + state = Qt::Checked; + else + state = Qt::Unchecked; + + text_->setCheckState(0, state); + regions_->setCheckState(0, state); +} + void KeyWidget::setAllCheck(QTreeWidgetItem* parent) { for (int i = 0; i < parent->childCount(); ++i) diff --git a/scribo/demo/viewer/key_widget.hh b/scribo/demo/viewer/key_widget.hh index 113835d..d261ec6 100644 --- a/scribo/demo/viewer/key_widget.hh +++ b/scribo/demo/viewer/key_widget.hh @@ -45,6 +45,9 @@ public: signals: void updated(int key, bool checked); +public slots: + void setAll(bool b); + private slots: void change_mode(bool b); void update(QTreeWidgetItem* item); diff --git a/scribo/demo/viewer/viewer.cc b/scribo/demo/viewer/viewer.cc index 38ca8b1..41434ba 100644 --- a/scribo/demo/viewer/viewer.cc +++ b/scribo/demo/viewer/viewer.cc @@ -87,74 +87,94 @@ Viewer::Viewer(int &argc, char** argv) win_->statusBar(); QMenu* file_menu = win_->menuBar()->addMenu(tr("File")); - QAction* quit_action = new QAction(tr("Quit"), file_menu); + QMenu* option_menu = win_->menuBar()->addMenu(tr("Options")); + QMenu* help_menu = win_->menuBar()->addMenu(tr("Help")); + + QAction* quit_action = create_action("Quit", file_menu, + "Exit the program.", "Ctrl+q"); connect(quit_action, SIGNAL(triggered()), app_, SLOT(quit())); - quit_action->setStatusTip(tr("Exit the program.")); file_menu->addAction(quit_action); - QMenu* option_menu = win_->menuBar()->addMenu(tr("Options")); - outline_action_ = new QAction(tr("Draw outline"), option_menu); - outline_action_->setStatusTip(tr("Draw region outlines.")); + outline_action_ = create_action("Draw outline", option_menu, + "Draw region outlines.", "Ctrl+o"); outline_action_->setCheckable(true); outline_action_->setChecked(true); connect(outline_action_, SIGNAL(toggled(bool)), this, SIGNAL(setOutline(bool))); option_menu->addAction(outline_action_); - precise_action_ = new QAction(tr("Precise outline"), option_menu); - precise_action_->setStatusTip(tr("1px outline relative to the image " - "(1px relative to the view if off).")); + + precise_action_ = create_action("Precise outline", option_menu, + "1px outline relative to the image " + "(1px relative to the view if off).", + "Ctrl+p"); precise_action_->setCheckable(true); precise_action_->setChecked(false); connect(precise_action_, SIGNAL(toggled(bool)), this, SIGNAL(setPrecise(bool))); option_menu->addAction(precise_action_); - fill_action_ = new QAction(tr("Fill regions"), option_menu); - fill_action_->setStatusTip(tr("Color the inside of regions.")); + + fill_action_ = create_action("Fill regions", option_menu, + "Color the inside of regions.", "Ctrl+f"); fill_action_->setCheckable(true); fill_action_->setChecked(true); connect(fill_action_, SIGNAL(toggled(bool)), this, SIGNAL(setFill(bool))); option_menu->addAction(fill_action_); - QAction* cache_action = new QAction(tr("Disable cache"), file_menu); - cache_action->setStatusTip(tr("Disable the image cache (useful for" - " large images).")); + QAction* cache_action = create_action("Disable cache", option_menu, + "Disable the image cache (useful for" + " large images).", "Ctrl+c"); cache_action->setCheckable(true); cache_action->setChecked(false); connect(cache_action, SIGNAL(toggled(bool)), this, SLOT(useCache(bool))); option_menu->addAction(cache_action); - QAction* extended_action = new QAction(tr("Extended mode"), file_menu); - extended_action->setStatusTip(tr("If enabled, some features not supported by ICDAR" - " are added such as text regions or text lines")); + + QAction* extended_action = create_action("Extended mode", option_menu, + "If enabled, some features " + "not supported by ICDAR" + " are added such as text regions" + "or text lines", "Ctrl+e"); extended_action->setCheckable(true); extended_action->setChecked(false); connect(extended_action, SIGNAL(toggled(bool)), this, SLOT(useExtended(bool))); option_menu->addAction(extended_action); - QAction* show_image_action = new QAction(tr("Show pictures"), file_menu); - //show_image_action->setStatusTip(tr("")); - + QAction* show_image_action = create_action("Show pictures", option_menu, + "Display pictures on the scene or not", + "Ctrl+i"); show_image_action->setCheckable(true); show_image_action->setChecked(true); connect(show_image_action, SIGNAL(toggled(bool)), this, SLOT(useImage(bool))); option_menu->addAction(show_image_action); - QAction* show_text_action = new QAction(tr("Show text"), file_menu); - show_text_action->setStatusTip(tr("Show detected text inside boxes.")); + QAction* show_text_action = create_action("Show text", option_menu, + "Show detected text inside boxes.", + "Ctrl+t"); show_text_action->setCheckable(true); show_text_action->setChecked(true); connect(show_text_action, SIGNAL(toggled(bool)), this, SLOT(useText(bool))); option_menu->addAction(show_text_action); - QMenu* help_menu = win_->menuBar()->addMenu(tr("Help")); - QAction* about_action = new QAction(tr("About"), help_menu); - about_action->setStatusTip(tr("About this program.")); + key_wgt_ = new KeyWidget(key_map_); + QAction *show_region_action = create_action("Show regions", option_menu, + "Display regions that are present in" + " the XML file.", + "Ctrl+r"); + show_region_action->setCheckable(true); + show_region_action->setChecked(true); + connect(show_region_action, SIGNAL(toggled(bool)), + key_wgt_, SLOT(setAll(bool))); + option_menu->addAction(show_region_action); + + QAction* about_action = create_action("About", help_menu, + "About this program", + "Ctrl+h"); connect(about_action, SIGNAL(triggered()), this, SLOT(help())); help_menu->addAction(about_action); @@ -167,7 +187,6 @@ Viewer::Viewer(int &argc, char** argv) XmlWidget* xml_wgt = new XmlWidget(); BrowserWidget* browser_wgt = new BrowserWidget(files_, argc != 2 ? QString() : argv[1]); - key_wgt_ = new KeyWidget(key_map_); ImageWidget* image_wgt = new ImageWidget(scene_); scene_->setBackgroundBrush(scene_->palette().window()); @@ -276,6 +295,7 @@ Viewer::add_text(QDomNode line, QDomNode region) QGraphicsTextItem* text_item = scene_->addText(text, font); text_item->setPos(x_min, y_min); text_item->setTextInteractionFlags(Qt::TextSelectableByMouse); + text_item->setZValue(5); text_vector_ << text_item; if (!text_) scene_->removeItem(text_item); @@ -441,8 +461,8 @@ Viewer::load_xml(QString filename) } } - if ((extended_mode_ || text_) && - region.toElement().tagName().contains("text_region")) + // if ((extended_mode_ || text_) && + if (region.toElement().tagName().contains("text_region")) { QDomNode para = region.firstChild(); while (!para.isNull() && !para.toElement().tagName().contains("paragraph")) @@ -656,3 +676,14 @@ Viewer::change_base(bool b) { base64_ = b; } + + +QAction +*Viewer::create_action(QString name, QMenu *menu, QString status, QString shortcut) +{ + QAction* action = new QAction(name, menu); + action->setStatusTip(status); + action->setShortcut(QKeySequence(shortcut)); + + return (action); +} diff --git a/scribo/demo/viewer/viewer.hh b/scribo/demo/viewer/viewer.hh index b1f406d..30e01bb 100644 --- a/scribo/demo/viewer/viewer.hh +++ b/scribo/demo/viewer/viewer.hh @@ -77,6 +77,7 @@ private: QPixmap load_base64(QString xml); void add_region(QDomNode father, QString attr_id); void add_text(QDomNode line, QDomNode region); + QAction *create_action(QString name, QMenu* menu, QString status, QString shortcut); QApplication* app_; QMainWindow* win_; -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-686-gc127a16
by lazzara＠lrde.epita.fr 18 Nov '10

18 Nov '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next-build-test has been updated discards 211abc2e1821e7345265ed7ec6795c27700a54e6 (commit) discards d5495b68b9ad242824bd38670fc6e1fd96198ea7 (commit) discards ccbaf9ec3ce9dd056c23da445652b06e119f60d3 (commit) discards cf721d5f7cb5e77df5f8a65cc0d249ce1e4e5bb9 (commit) discards 5fc9c32351bd3eef4749095a1948eeb2735c379c (commit) discards 557ac2f43b73eb2fc3a49d1d34975559873fabee (commit) discards 236e8722e83acffc95360eba6b190b90519ef23d (commit) discards 0ce764d574dff94e89d7c5d1f1d0e9c010a84707 (commit) discards 8f3101526bd99273d1b71d467b044a07a8479d70 (commit) discards 63c3277770ffaa3b4e398d55abda8c5d20dc9457 (commit) discards b410ac89fa92e3e6d6c2cdcc75587a67fdb10263 (commit) discards 47b8275a4f3b1be6df5871c5c08d1cf6e68d5091 (commit) discards b36c24db0da84a8b3e0e87c4910cb0be0db822b6 (commit) discards 75906d495a3eca7b428867a3396be42c7efb5f48 (commit) discards 0731c7c8842df57d9c10cdb5cbe1e513a9caeaac (commit) discards 1ab4203ac8e4982f64558331f51393bffc10f3be (commit) discards d6086ba7e1531d4c877f750f693e790a3188d344 (commit) discards 33bbebf81a5b0ffc63d171b8b5c780b43b4cc9fe (commit) discards aa2b96f53b7311fa53fd5eca8199bad7dd23b7a1 (commit) discards 9056104a5c29eedbcf4dbb61edd85c01a6bdd6a2 (commit) discards 7ae09a27d933808721f325e3686ae2c40c80aff1 (commit) discards 77cb9729a132a85874e768fa331508fe5568546c (commit) discards 7b6381a4a19ec2b5789238f7da60b487dd0dde9c (commit) discards b7fe0b0c71d5a1a45d7fef7b2bd9785e85e6b14e (commit) discards b584d0d7a6807a8324c919ebe33095f0db7d1c97 (commit) discards 47dbda4b5be9c7bff0e0491cfe2b6fecbc70a4eb (commit) discards c30e01cfb3bbd3174bb4328449c6d88fd5c8547e (commit) discards a37cf92314d64617c4a27d59536c456f69137335 (commit) discards 4e3b22c81a3169cef27f1f8f224d462b450e736f (commit) discards c2ce47f4db882942f24e48016fd52eb8d0917709 (commit) discards 15f90779214f7e5b6915ee6e9e36eaadc8bd8a76 (commit) discards 929109d05d0b991eba30da1333344365412319d1 (commit) discards f6cd71cf65ee28fa78ef553bbd90cc63991e32e8 (commit) discards dc8a597c5afa6f79539de694e7e55ac8e6dfc9e8 (commit) discards a6d10b92e81b48239ae309c615b6c6647c7013ec (commit) discards bb1443023ff76a8904b4b9e10a52eda83b1479a1 (commit) discards 8de09d407ab3f6d979449b8e1b9927d2715667ae (commit) discards f3beb04e24ab07b4f4c866bf6a79f64db452d51d (commit) discards 05e90bbf726cd40d9fc95409a753347e3d4e8370 (commit) discards ae08c966fba3c72d37f46783fb48f8104a288aa9 (commit) discards 4b787b3fc120885fe8cb03932b5d5ab728b810f0 (commit) discards f046b9f5b9cd5c17d22c41202ad88469d323cc27 (commit) discards 986d2c9a133de075f3353f80cdb1266fd29d73fd (commit) discards f049b3b3af34104b1bd33f40600385df3dbf2858 (commit) discards e41a013fc3f8c3529028b1963a6cac210ddf2c93 (commit) discards 938b829b7419f657ba9b18cc5e575bd5524df3c2 (commit) discards 5a6d399a31eca1992e5977f9e39f2aaab6b15fef (commit) discards 5cc2327568f70594a6c04da24f0d7b7af7087f83 (commit) discards a10c9ac30448e8cf462b8b07681ba464e0839438 (commit) discards 30811306ba6977c37ab717c74f38122f1891e1a6 (commit) discards 68c4e75427f934853c4aaec279f0bd2527c57ff5 (commit) discards e707239de083f61986384bba64d6ba8c19eb12be (commit) discards 398af6cbcd6d487a1ecd705091d990ebab397e4a (commit) discards 6f0918c286aa96174c1334d5ed4684c69160e0e3 (commit) discards dc310b67a1f07c96543d58aacbe03e94430f59e5 (commit) discards 153406c4dcded413b6f3afa1f6e6dd719a71e3ac (commit) discards af079edcf2601e63611e43584cddc61bd135a376 (commit) discards f0997baa7a5dccd6881f2a0b26d867f02ed01a2a (commit) discards 811f9920b329f8f17f30faa32a92055193129468 (commit) discards 32f92e4ec7bc4b803c9cd07dadb0659f740ee52c (commit) via c127a164c2c633a92b28520826598874cc977703 (commit) via 7e3b4a70417c6764b8d6edc1a714474addcead6f (commit) via 04db12cde070ee0fca4e34d00b963b3b7b33a8dc (commit) via 738511d2e88dfc90f4800acede308c43866ed405 (commit) via 24d74ffb28a6caa19aedd832c0a7f954ddf4c8a9 (commit) via f09fec4f86ab4717fd61969b2c0a23b07584017d (commit) via 75486e11b5bbb2cea5199cefa619f98cd0cb8267 (commit) via 99f6f2ae7730170f002d10345a068005bf231e30 (commit) via 270711a0cdbf050d4532c736a478c77669ebe0fd (commit) via c03272f934234a8574232923c11f932ae9cd2e9d (commit) via 9bd5d46fd58c6ae2ea96375911e1672a8dd7660f (commit) via afdb77c5d38cd67f62457dcc619ae1b035f7507a (commit) via a2b46dc2207a578041af7758853ae17c901b268a (commit) via 9873b787912e73d48d6a7f7ad17903874c90d0d2 (commit) via 92e2d041eea0312cb441a805c73606207494fd74 (commit) via 4c97de45e12e180253707428ca407975b836f599 (commit) via 0b29bba800f78bd36453bfb0248be2fc6fcfe4a7 (commit) via bc7c47971d1ae90a2df99732a2139c1b685b8472 (commit) via 0da3ec219b6d3223a2871f1872d7e7120ba4db22 (commit) via 9aa2edee69af7d9da7139b0231abbe43c4f32aee (commit) via 0ad1284da77831e3361661042b01a5fc96502ef9 (commit) via 5d58ddce6e23c83cb22ad4ef6c11c4cc893b9b29 (commit) via ffb11d37b76293c473cfa7993ade0bfed18426db (commit) via 0fb69c9224e2803a6c919b332d3265fe15d6bd78 (commit) via 0a82e15ff731073934fdb3cc82a92b52fcb1da1b (commit) via 07d3bc0718629fcdb128167f83f2fe31609218cb (commit) via 52af6ecc19bfc3ef22af4f3be66d036059a49bf6 (commit) via 61b2c3733a150025a75b6d4d978de7a60d8ce767 (commit) via a04c2ef9e9630c40f7256f119a96f6c617255a48 (commit) via 187ea0363976c7c5a1302cdc4d1ea58ebdbbe60c (commit) via 667167f7843b90a29a785f9b63ece3623df5184d (commit) via f14899873413a945c40134c925388958072a781e (commit) via f50243275bcbd10b5803c6a58270562703333e5a (commit) via 222955acc954ecb48650036b7f1052bd47d215f4 (commit) via eec4ffe46dd3eafc91c4376011efb8fd51aaeb7d (commit) via 964a8b8a76715886c2843ec7ba976a579df7d819 (commit) via bd9472a7dca698e83cf0eaf348271113907195f8 (commit) via 33f563714a2786565e9a1e1bf96396923a88d27c (commit) via 33a1752af0558f4f57966386573deed86cc333d3 (commit) via 3ad6a4d6b4e31a806d8f3ddcb41871567d92af0a (commit) via aae4f34afcdb72921bda2492e42768db66874812 (commit) via 38f31bc053777696828f595905ceda775da86b87 (commit) via 85d4bb7233887b5387a7e10fad883a38f5b14b3a (commit) via d44aa817d631482b3906f68a53a8f1a1bcc491b2 (commit) via 64fb4bc92d81eaf61eba1c09d58e4fc7364a68fd (commit) via e35598a3d1fb3b028de14805a0669c0de5fca476 (commit) via e6ba8b92d3de0a9b6f433972d143c1fda9cc0f4d (commit) via 5f5569ab7b57bc71e465f6e57194030f30a25640 (commit) via 65981fdfded696c335e50d7a7d13a3d903e86b3d (commit) via d33f5803ccf53ef6232f76b42e40e327ba965f5a (commit) via 91a43aed292b0ea99eec6cf88ccf220c6f33aae6 (commit) via 87a2f38e04bb320cd200ed1efb70e1bfb61259e3 (commit) via 39901400dfce5d0a09083a15ed483a92a08a3f1d (commit) via fcf3c1596e55f776e3b30b4cea4f20120f2652b3 (commit) via d6c1dbb9aa147162ffa272c129f266d46c5e3c5d (commit) via accfaf184de2160fb73424fef0277d97223bd310 (commit) via cb91a95d6d7213db994b2ab590c6da2d2ee86a04 (commit) via cecfdd1b70ac9a2d38b11af6f16ccfc6f82ade4c (commit) via 9723ab688050807af0f5d7356d0030967b764456 (commit) via 432df10acf22236a3a6bcb1f7e991f596524f891 (commit) via 1f5268f36f0fd1ce6163a30aa6d700f92c47b655 (commit) via e91a1885ccb4f41c4ab23136a7c40fae8a1ff3fd (commit) via 0d8813e68ce7b27f4e0af6ee0a6004d0564b5945 (commit) via 7c25953a8c1e0d82f2c31696ae94c1bc616281e1 (commit) via bc407e203f38df5a984d5ba5463907394b335f7e (commit) via 83d0183b7c6e7850ff42b1143978de4a8498171b (commit) via 7924629f9a5ed75553a8fa6cee857bf59b634c0f (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (211abc2e1821e7345265ed7ec6795c27700a54e6) \ N -- N -- N (c127a164c2c633a92b28520826598874cc977703) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- c127a16 configure.ac: Use tar-ustar to allow filenames with more than 99 characters. 7e3b4a7 Distribute more files with Scribo. 04db12c Merge branch 'next' into next-build-test 738511d Improve image cropping in xml_transform. 24d74ff mln/io/pnm/save.hh: Add a fixme related to an ICE with GCC 4.1.1. f09fec4 Fix QImage conversions. 75486e1 mln/convert/from_to.hh: Use value::cast for default builtin conversions and use specific from_to_ overloads for float/double conversions 99f6f2a Fix disabled unit tests in Milena. 270711a tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe test. c03272f Add a new test for accu::stat:deviation. 9bd5d46 scribo/primitive/extract/separators_nonvisible.hh: Fix warnings. afdb77c Remove a useless from_to overload. a2b46dc Regen .mk files in Scribo. 9873b78 Compilation fixes. 92e2d04 scribo/core/document.hh: Add new methods. 4c97de4 scribo/io/xml/save.hh: Add conditions before saving elements and text. 0b29bba scribo/core/line_set.hh (is_valid()): New method. bc7c479 Regen mk files in Milena. 0da3ec2 Introduce world::rgb::invert. 9aa2ede Improve dispatch in arith::revert routine. 0ad1284 mln/data/paste_without_localization.hh: Remove duplicate declarations. 5d58ddc mln/accu/stat/histo3d_rgb.hh: Import histo3d RGB accu from ffb11d3 scribo/primitive/group/from_double_link_any.hh: New. 0fb69c9 scribo/primitive/link/with_single_right_link_dmax_ratio_aligned.hh: New. 0a82e15 Improve text_in_picture_neg. 07d3bc0 Do not negate Sauvola's output. 52af6ec scribo/core/component_set.hh: Combine separator images. 61b2c37 First draft of text_in_picture_neg a04c2ef Add merge::components routine. 187ea03 Introduce text_in_picture toolchain. 667167f src/content_in_doc.cc: New example extracting document content. f148998 scribo/toolchain/text_in_doc.hh: Make use of non visible separators information. f502432 scribo/io/xml/save.hh: Make use of document structure. 222955a scribo/primitive/extract/elements.hh: New routine. eec4ffe scribo/primitive/extract/separators_nonvisible.hh: New routine. 964a8b8 mln/clustering/kmean_rgb.hh: Import Kmean RGB from Yann's sandbox. bd9472a mln/fun/v2v/rgb8_to_rgbn.hh: Import rgb8 to rgbn conversion function from Yann's sandbox. 33f5637 scribo/core/macros.hh: Remove deprecated macro. 33a1752 scribo/core/document.hh: Introduce new document structure. 3ad6a4d Merge branch 'exp/green' into next-build-test aae4f34 Update default value in an example 38f31bc Add conversions from int_u to float and double. 85d4bb7 mln/convert/from_to.hh: Make use of value::cast for conversions between built-in types. d44aa81 mln/data/paste_without_localization.hh: Add a missing dispatch overload. 64fb4bc mln/io/plot/save.hh: Remove an inline keyword. e35598a Add missing MLN_WO_GLOBAL_VARS conditions. e6ba8b9 demo/viewer/Makefile.am: Remove deprecated dependencies. 5f5569a Include scribo.mk instead of tests.mk. 65981fd scribo/canvas/integral_browsing.hh: Cleanup comments. d33f580 src/binarization/sauvola_ms.cc: Add missing includes. 91a43ae Set default window size to 101 in Sauvola examples. 87a2f38 Improve debug management and outputs for Sauvola. 3990140 Improve debug management and outputs for Sauvola. fcf3c15 mln/accu/stat/deviation.hh: Set first template parameter of accu::stat:sum to mln_sum(T). d6c1dbb arthur/xml_transform/xml_transform.pro: Define NDEBUG at compile time. accfaf1 Add missing const references to function arguments. cb91a95 Changelog: Cleanup. cecfdd1 Open Document bug warning. 9723ab6 Fix man error. 432df10 Add arrows shortcuts. 1f5268f Add shortcuts in Qt interface. e91a188 Output change in xml_tranform. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 11 + configure.ac | 3 +- milena/ChangeLog | 29 +- milena/Makefile.am | 1 + milena/mln/accu/stat/deviation.hh | 8 +- milena/mln/io/magick/load.hh | 17 +- milena/mln/io/magick/save.hh | 30 +- milena/tests/accu/Makefile.am | 1 + milena/tests/unit_test/Makefile.am | 5 + scribo/ChangeLog | 15 +- scribo/sandbox/ChangeLog | 30 +- scribo/sandbox/arthur/xml_transform/README | 2 - scribo/sandbox/arthur/xml_transform/image_crop.cc | 84 ++-- scribo/sandbox/arthur/xml_transform/image_crop.hh | 12 +- scribo/sandbox/arthur/xml_transform/main.cc | 119 +++-- .../xml_transform/templates/html/html_generator.sh | 3 - .../templates/html/{xsl.xsl => main.xsl} | 46 ++- .../html/{xsl_base64.xsl => main_base64.xsl} | 111 +++-- .../arthur/xml_transform/templates/ooconvert | 517 ++++++++++++++++++++ .../templates/opendoc/opendoc_generator.sh | 24 - .../arthur/xml_transform/templates/opendoc/xsl.xsl | 33 ++- .../arthur/xml_transform/templates/pdf/main.xsl | 22 +- .../arthur/xml_transform/templates/pdf/main64.xsl | 62 --- .../xml_transform/templates/pdf/pdf_generator.sh | 3 - .../pdf/{regions_base64.xsl => regions.xsl} | 0 .../xml_transform/templates/pdf/regions_png.xsl | 59 --- .../xml_transform/templates/pdf/svg_generator.sh | 3 - .../xml_transform/templates/{pdf => svg}/line.xsl | 0 .../templates/{pdf/main_crop.xsl => svg/main.xsl} | 0 .../{pdf/regions_svg.xsl => svg/regions.xsl} | 0 .../xml_transform/templates/xml_transform.sh | 134 +++++ .../sandbox/arthur/xml_transform/xml_transform.cc | 76 +-- .../sandbox/arthur/xml_transform/xml_transform.hh | 2 + .../sandbox/arthur/xml_transform/xml_transform.pro | 6 +- scribo/sandbox/green/mln/accu/stat/histo2d.hh | 3 +- scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh | 1 - scribo/sandbox/green/mln/display/display_histo.hh | 5 +- scribo/sandbox/green/mln/display/project_histo.hh | 2 + .../green/mln/fun/v2v/rgb_to_achromatism_map.hh | 2 +- scribo/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh | 4 +- .../sandbox/green/use/accu/stat/histo1d/histo1d.cc | 1 - scribo/src/Makefile.am | 7 + scribo/src/debug/Makefile.am | 2 - scribo/src/debug/center_pixel_stats.cc | 52 -- scribo/tests/Makefile.am | 1 + swilena/ChangeLog | 7 + swilena/python/Makefile.am | 11 +- 47 files changed, 1091 insertions(+), 475 deletions(-) delete mode 100644 scribo/sandbox/arthur/xml_transform/templates/html/html_generator.sh rename scribo/sandbox/arthur/xml_transform/templates/html/{xsl.xsl => main.xsl} (89%) rename scribo/sandbox/arthur/xml_transform/templates/html/{xsl_base64.xsl => main_base64.xsl} (75%) create mode 100755 scribo/sandbox/arthur/xml_transform/templates/ooconvert delete mode 100755 scribo/sandbox/arthur/xml_transform/templates/opendoc/opendoc_generator.sh delete mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/main64.xsl delete mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/pdf_generator.sh rename scribo/sandbox/arthur/xml_transform/templates/pdf/{regions_base64.xsl => regions.xsl} (100%) delete mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/regions_png.xsl delete mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/svg_generator.sh copy scribo/sandbox/arthur/xml_transform/templates/{pdf => svg}/line.xsl (100%) rename scribo/sandbox/arthur/xml_transform/templates/{pdf/main_crop.xsl => svg/main.xsl} (100%) rename scribo/sandbox/arthur/xml_transform/templates/{pdf/regions_svg.xsl => svg/regions.xsl} (100%) create mode 100755 scribo/sandbox/arthur/xml_transform/templates/xml_transform.sh delete mode 100644 scribo/src/debug/center_pixel_stats.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-686-gc127a16 configure.ac: Use tar-ustar to allow filenames with more than 99 characters.
by Guillaume Lazzara 18 Nov '10

18 Nov '10

--- ChangeLog | 5 +++++ configure.ac | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f85e4c6..531a9aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Use tar-ustar to allow filenames with more than 99 + characters. + 2010-10-27 Roland Levillain <roland(a)lrde.epita.fr> Remove a superfluous invocation of AM_CONDITIONAL regarding Magick++. diff --git a/configure.ac b/configure.ac index 1f7f728..6d0ce20 100644 --- a/configure.ac +++ b/configure.ac @@ -34,7 +34,7 @@ AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_FILES([build-aux/Makefile]) # Automake. -AM_INIT_AUTOMAKE([1.10 subdir-objects check-news dist-bzip2 nostdinc -Wall]) +AM_INIT_AUTOMAKE([1.10 subdir-objects check-news tar-ustar dist-bzip2 nostdinc -Wall]) # Package metadata. AC_CONFIG_FILES([milena/mln/version.hh]) -- 1.5.6.5

1 0

last-svn-commit-685-g7e3b4a7 Distribute more files with Scribo.
by Guillaume Lazzara 18 Nov '10

18 Nov '10

* src/Makefile.am, * tests/Makefile.am (EXTRA_DIST): Add new files. --- scribo/ChangeLog | 7 +++++++ scribo/src/Makefile.am | 7 +++++++ scribo/tests/Makefile.am | 1 + 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d3b3a65..9f7bc9b 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Distribute more files with Scribo. + + * src/Makefile.am, + * tests/Makefile.am (EXTRA_DIST): Add new files. + 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/primitive/extract/separators_nonvisible.hh: Fix warnings. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 6cf233c..2c318a1 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -129,4 +129,11 @@ scribo-cli: $(srcdir)/scribo-cli.in Makefile CLEANFILES = $(dist_bin_SCRIPTS) + EXTRA_DIST = scribo-cli.in + + +EXTRA_DIST += \ + afp/components.hh \ + afp/link.hh \ + afp/regroup.hh \ No newline at end of file diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index c3ca209..1cb222b 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -18,6 +18,7 @@ include $(srcdir)/tests.mk EXTRA_DIST = \ + img/pixels.pbm \ img/table_to_be_repaired.pbm \ img/table_to_be_repaired2.pbm \ img/table_to_be_repaired3.pbm \ -- 1.5.6.5

1 0

last-svn-commit-684-g04db12c Merge branch 'next' into next-build-test
by Guillaume Lazzara 18 Nov '10

18 Nov '10

This is a merge commit message of the following branches: Merge: 738511d... 0d8813e... ChangeLog | 6 ++++++ configure.ac | 1 - milena/ChangeLog | 25 +++++++++++++++++++++++++ milena/Makefile.am | 1 + milena/mln/io/magick/load.hh | 17 +++++++++++------ milena/mln/io/magick/save.hh | 30 ++++++++++++++++++++++-------- milena/tests/accu/Makefile.am | 1 + milena/tests/unit_test/Makefile.am | 5 +++++ swilena/ChangeLog | 7 +++++++ swilena/python/Makefile.am | 11 ++++++----- 10 files changed, 84 insertions(+), 20 deletions(-) diff --cc ChangeLog index 6935872,3155d63..f85e4c6 --- a/ChangeLog +++ b/ChangeLog @@@ -1,28 -1,9 +1,34 @@@ + 2010-10-27 Roland Levillain <roland(a)lrde.epita.fr> + + Remove a superfluous invocation of AM_CONDITIONAL regarding Magick++. + + * configure.ac: Here. + +2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + + Distribute Scribo. + + * configure.ac: Remove tags `<<lrde' and `dnl>>' around + Scribo-related bits. + * Makefile.am: Likewise. + (LRDE_NODIST_FILES): Remove $(distdir)/scribo. + +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Handle Tesseract 2.x and 3.x in configuration. + + * configure.ac: Call OLN_WITH_TESSERACT macro. + + * m4/oln-with-lib.m4: Define a new macro OLN_WITH_TESSERACT. + +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Configure scribo/src/toolchain/nepomuk directory. + +2010-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Configure new test directories. + 2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> Do not trigger an error when Qt is missing, too old or not working. diff --cc milena/ChangeLog index 6d5de98,2b6ae78..10d8482 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@@ -1,149 -1,28 +1,174 @@@ + 2010-10-28 Roland Levillain <roland(a)lrde.epita.fr> + + Handle properly non 8-bit Magick::Quantum's. + + * mln/io/magick/load.hh + (mln::io::magick::load(Image<I>&, const std::string&)) + * mln/io/magick/save.hh + (mln::io::magick::impl::get_color(const value::int_u8&)) + (mln::io::magick::impl::get_color(const value::rgb8&)): + Properly convert values between Magick::Quantum and + mln::value::int_u8, and vice versa. + + 2010-10-27 Roland Levillain <roland(a)lrde.epita.fr> + + Fix Boost.Tuple handling. + + * tests/accu/Makefile.am (tuple_CPPFLAGS): New. + * tests/unit_test/Makefile.am (BOOST_TUPLE_CPPFLAGS): New. + + 2010-10-26 Roland Levillain <roland(a)lrde.epita.fr> + + Fix Milena's distribution. + + * Makefile.am (dist_img_DATA): Add img/picasso.ppm. + +2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/pnm/save.hh: Add a fixme related to an ICE with GCC + 4.1.1. + +2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix QImage conversions. + + * mln/convert/to_qimage.hh: Fix a duplicate declaration. + + * mln/convert/to_qimage_nocopy.hh: Fix the minimum version + required. + +2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/convert/from_to.hh: Use value::cast for default builtin + conversions and use specific from_to_ overloads for float/double + conversions + +2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix disabled unit tests in Milena. + + * tests/unit_test/disabled_tests: Add a missing new line at end of + file. + + * tests/unit_test/unit-tests.mk: Regen. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + * tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe + test. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a new test for accu::stat:deviation. + + * tests/accu/stat/Makefile.am: Add a new target. + + * tests/accu/stat/deviation.cc: New. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Remove a useless from_to overload. + + * mln/convert/from_to.hxx, + * mln/convert/impl/from_unsigned_to_value.hh: Remove overload + converting unsigned to float. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Regen mk files in Milena. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Introduce world::rgb::invert. + + * mln/world/rgb/invert.hh, + * mln/world/rgb/invert.spe.hh: New. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve dispatch in arith::revert routine. + + * mln/arith/revert.hh, + * mln/arith/revert.spe.hh: Add a standard dispatch. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/data/paste_without_localization.hh: Remove duplicate + declarations. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/accu/stat/histo3d_rgb.hh: Import histo3d RGB accu from + Yann's sandbox. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/clustering/kmean_rgb.hh: Import Kmean RGB from Yann's + sandbox. + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Fix the way to convert unsigned to float. + + * mln/convert/from_to.hxx: New conversion utilities. + * mln/convert/impl/from_unsigned_to_value.hh: New conversion utilities. + +2009-12-02 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Fix the outside template use case for the convolve macros. + + * mln/linear/ch_convolve.hh (mln_ch_convolve_, mln_ch_convolve_grad_): + Define new macros to work outside templates. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add conversions from int_u to float and double. + + * mln/convert/from_to.hxx, + * mln/value/int_u.hh: Here. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/convert/from_to.hh: Make use of value::cast for conversions + between built-in types. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/data/paste_without_localization.hh: Add a missing dispatch + overload. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/plot/save.hh: Remove an inline keyword. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add missing MLN_WO_GLOBAL_VARS conditions. + + * mln/canvas/browsing/backdiagonal2d.hh + * mln/canvas/browsing/diagonal2d.hh + * mln/canvas/browsing/directional.hh + * mln/canvas/browsing/snake_fwd.hh + * mln/canvas/browsing/snake_generic.hh + * mln/value/qt/rgb32.hh + +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/accu/stat/deviation.hh: Set first template parameter of + accu::stat:sum to mln_sum(T). + +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/labeling/compute.hh: Add a missing overload in dispatch. + +2010-09-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + * milena/mln/core/image/vmorph/fun_image.hh: Fix an invalid + function call. + 2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> * headers.mk, tests/unit_test/unit-tests.mk: Regen. hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-678-g738511d Improve image cropping in xml_transform.
by Guillaume Lazzara 18 Nov '10

18 Nov '10

* arthur/xml_transform/image_crop.cc, * arthur/xml_transform/image_crop.hh: Load the input image only once. * arthur/xml_transform/main.cc: Undef MLN_WO_GLOBAL_VARS macro. * arthur/xml_transform/xml_transform.pro: Enable MLN_WO_GLOBAL_VARS macro. --- scribo/sandbox/ChangeLog | 13 +++++++++ scribo/sandbox/arthur/xml_transform/image_crop.cc | 27 ++++++++----------- scribo/sandbox/arthur/xml_transform/image_crop.hh | 23 ++++++----------- scribo/sandbox/arthur/xml_transform/main.cc | 4 +++ .../sandbox/arthur/xml_transform/xml_transform.pro | 10 +++--- 5 files changed, 41 insertions(+), 36 deletions(-) diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index eb97ae9..2779292 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,3 +1,16 @@ +2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve image cropping in xml_transform. + + * arthur/xml_transform/image_crop.cc, + * arthur/xml_transform/image_crop.hh: Load the input image only + once. + + * arthur/xml_transform/main.cc: Undef MLN_WO_GLOBAL_VARS macro. + + * arthur/xml_transform/xml_transform.pro: Enable + MLN_WO_GLOBAL_VARS macro. + 2010-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> * arthur/xml_transform/xml_transform.pro: Define NDEBUG at compile diff --git a/scribo/sandbox/arthur/xml_transform/image_crop.cc b/scribo/sandbox/arthur/xml_transform/image_crop.cc index 702d49f..d2787f1 100644 --- a/scribo/sandbox/arthur/xml_transform/image_crop.cc +++ b/scribo/sandbox/arthur/xml_transform/image_crop.cc @@ -23,11 +23,7 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -# include "image_crop.hh" -# include "loader.hh" -# include "common.hh" - -# include <limits.h> +#include <limits.h> #include <scribo/preprocessing/crop.hh> #include <mln/value/rgb8.hh> @@ -37,12 +33,18 @@ #include <mln/io/magick/load.hh> #include <mln/io/ppm/all.hh> +#include "image_crop.hh" +#include "loader.hh" +#include "common.hh" + + ImageCrop::ImageCrop(const QString& xml, const QString& img, const QString& output) : xml_(xml), image_(img), output_dir_(output) { + mln::io::magick::load(ima_, image_.toStdString()); } ImageCrop::~ImageCrop() @@ -53,12 +55,7 @@ ImageCrop::~ImageCrop() /* Save image to PNG format in output_dir/img. */ void ImageCrop::save_image(const QString& out) { - using namespace mln; - - image2d<value::rgb8> ima; - io::magick::load(ima, image_.toStdString()); - - io::magick::save(ima, out.toStdString()); + mln::io::magick::save(ima_, out.toStdString()); } /* Return the image in base 64. */ @@ -315,9 +312,7 @@ bool ImageCrop::crop_regions(bool temp) using namespace mln; box2d box = make::box2d(y_min, x_min, y_max, x_max); - image2d<value::rgb8> ima; - io::magick::load(ima, image_.toStdString()); - ima = scribo::preprocessing::crop(ima, box); + image2d<value::rgb8> crop = scribo::preprocessing::crop(ima_, box); if (temp) { @@ -325,10 +320,10 @@ bool ImageCrop::crop_regions(bool temp) tmp.open(); region_map_[id] = tmp.fileName(); tmp.setAutoRemove(false); - io::magick::save(ima, tmp.fileName().toStdString()); + io::magick::save(crop, tmp.fileName().toStdString()); } else - io::magick::save(ima, QString(output_dir_ + id + ".png").toStdString()); + io::magick::save(crop, QString(output_dir_ + id + ".png").toStdString()); } region = region.nextSibling(); } diff --git a/scribo/sandbox/arthur/xml_transform/image_crop.hh b/scribo/sandbox/arthur/xml_transform/image_crop.hh index 598143b..ec2f9a2 100644 --- a/scribo/sandbox/arthur/xml_transform/image_crop.hh +++ b/scribo/sandbox/arthur/xml_transform/image_crop.hh @@ -23,12 +23,16 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef IMAGE_CROP_HH -# define IMAGE_CROP_HH +#ifndef IMAGE_CROP_HH +# define IMAGE_CROP_HH -#include <QDomDocument> +# include <QDomDocument> # include <QtCore> +# include <mln/value/rgb8.hh> +# include <mln/core/image/image2d.hh> + + class DomModel; class ImageCrop : public QObject @@ -36,17 +40,6 @@ class ImageCrop : public QObject Q_OBJECT public: -<<<<<<< HEAD - ImageCrop(QString, QString, QString); - ~ImageCrop(); - - void save_image(QString); - bool crop_regions(bool temp = false); - - QString img_to_base64(); - bool img_from_base64(QString, QString); - void to_base64(QString, bool); -======= ImageCrop(const QString&, const QString&, const QString&); ~ImageCrop(); @@ -56,7 +49,6 @@ class ImageCrop : public QObject QString img_to_base64(); bool img_from_base64(const QString&, const QString&); void to_base64(const QString&, bool); ->>>>>>> 6f0918c... Add missing const references to function arguments. void from_base64(); @@ -65,6 +57,7 @@ private: QString image_; QString output_dir_; QMap<QString, QString> region_map_; + mln::image2d<mln::value::rgb8> ima_; }; #endif /* !IMAGE_CROP_HH */ diff --git a/scribo/sandbox/arthur/xml_transform/main.cc b/scribo/sandbox/arthur/xml_transform/main.cc index 0dfb84e..a580585 100644 --- a/scribo/sandbox/arthur/xml_transform/main.cc +++ b/scribo/sandbox/arthur/xml_transform/main.cc @@ -3,6 +3,10 @@ #include <string> #include <cstdlib> #include <Magick++.h> + +#undef MLN_WO_GLOBAL_VARS +#include <mln/core/image/image2d.hh> + #include "xml_transform.hh" int main(int argc, char **argv) diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.pro b/scribo/sandbox/arthur/xml_transform/xml_transform.pro index 4a2ed2e..918f0d6 100644 --- a/scribo/sandbox/arthur/xml_transform/xml_transform.pro +++ b/scribo/sandbox/arthur/xml_transform/xml_transform.pro @@ -6,12 +6,12 @@ TEMPLATE = app TARGET = DEPENDPATH += . INCLUDEPATH += . -QMAKE_CXXFLAGS += -I/amd/beyrouth/home/lrde/stage/crepin/git/olena/milena -I/amd/beyrouth/home/lrde/stage/crepin/git/olena/ -DEFINES += NDEBUG +QMAKE_CXXFLAGS += -I../../../../milena -I../../../../scribo +DEFINES += NDEBUG MLN_WO_GLOBAL_VARS QT += xml LIBS += `Magick++-config --libs` + + +# Input HEADERS += common.hh image_crop.hh loader.hh xml_transform.hh SOURCES += common.cc image_crop.cc loader.cc main.cc xml_transform.cc -PWD += - -QMAKE_POST_LINK += cp -r $$PWD/templates $$OUT_PWD -- 1.5.6.5

1 0

last-svn-commit-642-g3ad6a4d Merge branch 'exp/green' into next-build-test
by Guillaume Lazzara 18 Nov '10

18 Nov '10

This is a merge commit message of the following branches: Merge: aae4f34... 6ada0c4... Conflicts: scribo/sandbox/green/README.green scribo/sandbox/green/mln/accu/stat/histo1d.hh scribo/sandbox/green/mln/accu/stat/histo2d.hh scribo/sandbox/green/mln/accu/stat/histo3d_hsl.hh scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh scribo/sandbox/green/mln/clustering/kmean2d.hh scribo/sandbox/green/mln/display/display_histo.hh scribo/sandbox/green/mln/display/project_histo.hh scribo/sandbox/green/mln/fun/p2b/achromatic.hh scribo/sandbox/green/mln/fun/v2v/hue_concentration.hh scribo/sandbox/green/mln/fun/v2v/rgb_to_achromatism_map.hh scribo/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh scribo/sandbox/green/use/accu/stat/histo1d/histo1d.cc milena/ChangeLog | 14 + milena/sandbox/ChangeLog | 354 +++++ scribo/sandbox/green/ChangeLog | 1402 +++++++++++++++++++ scribo/sandbox/green/README.green | 851 +++++++++++- .../sandbox/green/demo/annotating/bic/Makefile.am | 153 ++ scribo/sandbox/green/demo/annotating/bic/bic.cc | 122 ++ .../sandbox/green/demo/annotating/hsv/Makefile.am | 153 ++ scribo/sandbox/green/demo/annotating/hsv/hsv.cc | 721 ++++++++++ .../sandbox/green/demo/annotating/lep/Makefile.am | 153 ++ scribo/sandbox/green/demo/annotating/lep/lep.cc | 127 ++ .../green/demo/annotating/nb_color/Makefile.am | 153 ++ .../green/demo/annotating/nb_color/nb_color.cc | 143 ++ .../green/demo/annotating/project/Makefile.am | 153 ++ .../green/demo/annotating/project/project.cc | 275 ++++ .../green/demo/annotating/rgb_64/Makefile.am | 153 ++ .../sandbox/green/demo/annotating/rgb_64/rgb_64.cc | 80 ++ .../green/demo/annotating/rgb_64_9/Makefile.am | 153 ++ .../green/demo/annotating/rgb_64_9/rgb_64_9.cc | 132 ++ .../green/demo/annotating/stddev_color/Makefile.am | 153 ++ .../demo/annotating/stddev_color/stddev_color.cc | 191 +++ .../demo/annotating/stddev_color_16/Makefile.am | 153 ++ .../annotating/stddev_color_16/stddev_color_16.cc | 261 ++++ .../demo/labeling/regional_maxima/Makefile.am | 153 ++ .../labeling/regional_maxima/regional_maxima.cc | 198 +++ .../demo/labeling/regional_maxima/thresholds.txt | 42 + .../green/demo/labeling/watershed/Makefile.am | 153 ++ .../green/demo/labeling/watershed/gaussian.sh | 12 + .../green/demo/labeling/watershed/watershed.cc | 360 +++++ scribo/sandbox/green/doc/annotating/class.txt | 42 + .../green/doc/annotating/syntheseMillet2008.txt | 283 ++++ scribo/sandbox/green/doc/annotating/testMillet2008 | 69 + .../green/doc/examples/accu_color/accu_color.cc | 249 ++++ scribo/sandbox/green/doc/examples/frac/Makefile.am | 148 ++ scribo/sandbox/green/doc/examples/frac/frac.cc | 423 ++++++ scribo/sandbox/green/doc/examples/frac/frac.hh | 793 +++++++++++ scribo/sandbox/green/doc/examples/frac/gcd.hh | 91 ++ .../sandbox/green/doc/examples/frac/sign_prod.hh | 74 + .../green/doc/examples/hello_milena/Makefile.am | 49 + .../doc/examples/hello_milena/hello_milena.cc | 41 + .../green/doc/examples/hello_world/Makefile.am | 49 + .../green/doc/examples/hello_world/hello_world.cc | 9 + .../green/doc/examples/hello_world/print.cc | 6 + scribo/sandbox/green/doc/examples/io/Makefile.am | 150 ++ scribo/sandbox/green/doc/examples/io/io.cc | 71 + .../green/doc/examples/learn_milena/Makefile.am | 49 + .../doc/examples/learn_milena/learn_milena.cc | 151 ++ scribo/sandbox/green/doc/examples/otsu/Makefile.am | 49 + scribo/sandbox/green/doc/examples/otsu/otsu.cc | 193 +++ .../sandbox/green/doc/examples/stats/Makefile.am | 49 + scribo/sandbox/green/doc/examples/stats/stats.cc | 32 + scribo/sandbox/green/doc/formulae/formulae.tex | 1157 ++++++++++++++++ scribo/sandbox/green/doc/quick_tour/quick_tour.tex | 115 ++ .../green/exp/annotating/achromastism/Makefile.am | 153 ++ .../exp/annotating/achromastism/achromastism.cc | 179 +++ .../exp/annotating/achromastism/text-color.txt | 15 + .../green/exp/annotating/achromastism/text-img.txt | 40 + .../exp/annotating/achromastism/text-only.txt | 8 + .../sandbox/green/exp/annotating/bench/Makefile.am | 153 ++ scribo/sandbox/green/exp/annotating/bench/bench.cc | 1450 ++++++++++++++++++++ .../sandbox/green/exp/annotating/error/Makefile.am | 153 ++ scribo/sandbox/green/exp/annotating/error/error.cc | 833 +++++++++++ .../sandbox/green/exp/annotating/histo/Makefile.am | 153 ++ scribo/sandbox/green/exp/annotating/histo/histo.cc | 366 +++++ .../sandbox/green/exp/annotating/hsv/Makefile.am | 153 ++ scribo/sandbox/green/exp/annotating/hsv/hsv.cc | 912 ++++++++++++ .../sandbox/green/exp/annotating/hue/Makefile.am | 153 ++ scribo/sandbox/green/exp/annotating/hue/hue.cc | 402 ++++++ .../green/exp/annotating/hue/text-color.txt | 15 + .../sandbox/green/exp/annotating/hue/text-img.txt | 40 + .../sandbox/green/exp/annotating/hue/text-only.txt | 8 + .../green/exp/annotating/nb_color/Makefile.am | 153 ++ .../green/exp/annotating/nb_color/nb_color.cc | 171 +++ .../green/exp/annotating/saturation/Makefile.am | 153 ++ .../green/exp/annotating/saturation/saturation.cc | 175 +++ .../green/exp/annotating/saturation/text-color.txt | 15 + .../green/exp/annotating/saturation/text-img.txt | 40 + .../green/exp/annotating/saturation/text-only.txt | 8 + .../green/exp/annotating/stddev_color/Makefile.am | 153 ++ .../exp/annotating/stddev_color/stddev_color.cc | 216 +++ .../exp/annotating/stddev_color_16/Makefile.am | 153 ++ .../annotating/stddev_color_16/stddev_color_16.cc | 277 ++++ .../sandbox/green/exp/annotating/value/Makefile.am | 153 ++ .../green/exp/annotating/value/text-color.txt | 15 + .../green/exp/annotating/value/text-img.txt | 40 + .../green/exp/annotating/value/text-only.txt | 8 + scribo/sandbox/green/exp/annotating/value/value.cc | 468 +++++++ .../sandbox/green/exp/regional_maxima/Makefile.am | 153 ++ .../green/exp/regional_maxima/regional_maxima.cc | 196 +++ .../green/exp/regional_maxima/thresholds.txt | 42 + scribo/sandbox/green/mln/accu/stat/histo1d.hh | 3 +- scribo/sandbox/green/mln/accu/stat/histo2d.hh | 10 +- scribo/sandbox/green/mln/accu/stat/histo3d_hsl.hh | 4 +- scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh | 4 +- scribo/sandbox/green/mln/clustering/kmean2d.hh | 7 +- scribo/sandbox/green/mln/display/display_histo.hh | 153 ++- scribo/sandbox/green/mln/display/project_histo.hh | 183 +++- scribo/sandbox/green/mln/fun/p2b/achromatic.hh | 24 +- .../sandbox/green/mln/fun/v2v/hue_concentration.hh | 13 +- .../green/mln/fun/v2v/rgb_to_achromatism_map.hh | 12 +- scribo/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh | 15 +- .../sandbox/green/tools/labeling/histo/Makefile.am | 153 ++ scribo/sandbox/green/tools/labeling/histo/histo.cc | 204 +++ scribo/sandbox/green/tools/labeling/iz/Makefile.am | 153 ++ scribo/sandbox/green/tools/labeling/iz/iz.cc | 495 +++++++ .../green/tools/labeling/opening/Makefile.am | 153 ++ .../green/tools/labeling/opening/opening.cc | 174 +++ .../green/tools/labeling/regmax/Makefile.am | 153 ++ .../sandbox/green/tools/labeling/regmax/regmax.cc | 428 ++++++ .../sandbox/green/use/accu/stat/histo1d/histo1d.cc | 3 +- .../green/use/display/display_histo/Makefile.am | 153 ++ .../use/display/display_histo/display_histo.cc | 86 ++ 111 files changed, 21575 insertions(+), 93 deletions(-) diff --cc milena/ChangeLog index d33bcc4,3804c90..fee653d --- a/milena/ChangeLog +++ b/milena/ChangeLog @@@ -1,2554 -1,17 +1,2568 @@@ + 2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Fix the way to convert unsigned to float. + + * mln/convert/from_to.hxx: New conversion utilities. + * mln/convert/impl/from_unsigned_to_value.hh: New conversion utilities. + + 2009-12-02 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Fix the outside template use case for the convolve macros. + + * mln/linear/ch_convolve.hh (mln_ch_convolve_, mln_ch_convolve_grad_): + Define new macros to work outside templates. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add conversions from int_u to float and double. + + * mln/convert/from_to.hxx, + * mln/value/int_u.hh: Here. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/convert/from_to.hh: Make use of value::cast for conversions + between built-in types. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/data/paste_without_localization.hh: Add a missing dispatch + overload. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/plot/save.hh: Remove an inline keyword. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add missing MLN_WO_GLOBAL_VARS conditions. + + * mln/canvas/browsing/backdiagonal2d.hh + * mln/canvas/browsing/diagonal2d.hh + * mln/canvas/browsing/directional.hh + * mln/canvas/browsing/snake_fwd.hh + * mln/canvas/browsing/snake_generic.hh + * mln/value/qt/rgb32.hh + +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/accu/stat/deviation.hh: Set first template parameter of + accu::stat:sum to mln_sum(T). + +2010-08-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/labeling/compute.hh: Add a missing overload in dispatch. + +2010-09-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + * milena/mln/core/image/vmorph/fun_image.hh: Fix an invalid + function call. + +2010-10-22 Roland Levillain <roland(a)lrde.epita.fr> + + * headers.mk, tests/unit_test/unit-tests.mk: Regen. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Disable the non deterministic test on mln::labeling::colorize. + + * tests/labeling/Makefile.am (check_PROGRAMS): Remove colorize. + (colorize_SOURCES): Disable. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Add a test on built-in floating point value's traits. + + * tests/value/builtin/floatings.cc: New. + * tests/value/builtin/Makefile.am (check_PROGRAMS): Add floatings. + (floatings_SOURCES): New. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Add macros for non-template contexts in mln/value/ops.hh. + + * mln/value/ops.hh (mln_trait_value_sum_product_) + (mln_sum_product_): New macros. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Improve the genericity of vector normalization. + + * mln/algebra/vec.hh (mln::algebra::vec<n,T>::normalize): Use + mln_sum_product(T,T) instead of the hard-coded type `float' as + return value of mln::norm::l2. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + * mln/fun/x2x/rotation.hh: Aesthetic changes. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Ensure non implemented rotation code stops the execution. + + * mln/fun/x2x/rotation.hh + (fun::x2x::internal::get_rot_h_mat(const C, const algebra::vec<n,C>&)): + Use std::abort instead of a precondition to stop the execution, + since preconditions can be skipped by defining NDEBUG. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Fix test fun/x2x/composed. + + * tests/fun/x2x/composed.cc: Fix the initialization of the axis + vector. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Fix 3D rotations. + + * mln/fun/x2x/rotation.hh + (fun::x2x::internal::get_rot_h_mat(const C, const algebra::vec<3,C>&)): + Fix the definition of the (2,1) coefficient. + +2010-10-21 Roland Levillain <roland(a)lrde.epita.fr> + + Catch up with Boost-related changes in configure.ac. + + * tests/accu/Makefile.am: Remove uses of the old + HAVE_BOOST_PREPROCESSOR conditional. + * tests/unit_test/cond_tests_boost-preprocessor_boost-tuple: + Rename as... + * milena/tests/unit_test/cond_tests_boost-tuple: ...this. + * tests/unit_test/Makefile.am (COND_TESTS): + s/cond_tests_boost-preprocessor_boost-tuple/cond_tests_boost-tuple/. + * tests/unit_test/unit-tests.mk: Regen. + +2010-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> + + Make use of value::next in Milena. + + * mln/accu/label_used.hh, + * mln/core/internal/labeled_image_base.hh, + * mln/labeling/colorize.hh, + * mln/labeling/compute.hh, + * mln/labeling/superpose.hh, + * mln/make/relabelfun.hh, + * mln/set/compute_with_weights.hh: Make use of value::next. + +2010-10-21 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add value::next routine. + + * mln/value/label.hh: Include next routine. + + * mln/value/next.hh: New. + +2010-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Temporarily disable static tests on Magick::Quantum type size. + + * mln/io/magick/load.hh, + * mln/io/magick/save.hh: Here. + +2010-08-24 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/value/int_s.hh: Fix warnings. + +2010-08-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix compilation with g++-3.3. + + * mln/value/qt/rgb32.hh: Here. + (name()): Change the returned string value. + +2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + * tests/unit_test/Makefile.am (DIST_FILES): Add missing files. + +2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Make Boost dependent tests conditional. + + * tests/accu/Makefile.am (tuple): Add conditions. + + * tests/unit_test/cond_tests_boost-preprocessor_boost-tuple: New. + + * tests/unit_test/unit-tests.mk: Regen. + +2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Small fixes in Milena. + + * mln/fun/v2v/saturate.hh: Add mln:: namespace prefix. + + * mln/value/rgb.hh: Add a missing include. + + * mln/accu/tuple.hh: Update include directive syntax. + +2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix more warnings in Milena. + + * mln/convert/impl/from_float_to_value.hh: Add an overload for + short int. + + * mln/io/fld/load.hh: Use convert::from_to. + + * mln/io/fld/max_components.hh: Explicitly cast values to unsigned. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix more tests in Milena. + + * mln/fun/v2v/saturate.hh: Add a missing include. + + * mln/subsampling/antialiased.hh: Increment pointer after the call + to convert::from_to. + + * tests/subsampling/antialiased.cc: Fix references according to + last changes on 'round factor'. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix warnings with g++-4.1 in Milena. + + * mln/fun/v2v/saturate.hh, + * mln/subsampling/antialiased.hh, + * mln/value/rgb.hh: Use convert::from_to for type conversions. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/core/point.hh: Fix a warning. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix tests in Milena. + + * mln/draw/dashed_line.hh, + * mln/fun/n2v/white_gaussian.hh, + * mln/fun/v2v/rgb_to_int_u.hh, + * mln/io/dump/get_header.hh, + * mln/io/raw/get_header.hh: Add missing includes. + + * tests/topo/skeleton/crest.cc: Fix reference results since a bug + have been fixed. + + * tests/unit_test/cond_tests_qt: Add conditional tests. + + * tests/unit_test/unit-tests.mk: Regen. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add missing traces. + + * mln/convert/to_qimage.hh, + * mln/convert/to_qimage_nocopy.hh: Here. + +2010-08-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + * headers.mk: Regen. + +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix tests in Milena. + + * tests/geom/rotate.cc: Fix test. + + * mln/labeling/blobs_and_compute.hh: Add comments. + + * mln/labeling/flat_zones.hh: Add missing members to functors. + + * tests/labeling/blobs_and_compute.cc: Fix return type. + + * tests/labeling/flat_zones.cc, + * tests/labeling/foreground.cc: Fix functor template parameters. + + * tests/labeling/relabel.cc: The number of components is not + updated anymore. + + * tests/labeling/colorize.cc: Fix reference according to last + changes in labeling::colorize routine. + + * mln/core/point.hh: Add mln:: namespace prefix. + +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/dicom/get_header.hh: Add missing headers. + +2010-08-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + Setup conditional unit-tests in Milena. + + * tests/unit_test/Makefile.am + (regen-am): Update the use of build_unit_test.sh. + (EXTRA_DIST): Add cond_tests_* files. + + * tests/unit_test/cond_tests_cfitsio, + * tests/unit_test/cond_tests_gdcm, + * tests/unit_test/cond_tests_magickxx, + * tests/unit_test/cond_tests_tiff: New. + + * tests/unit_test/disabled_tests: Remove some conditional tests. + + * tests/unit_test/unit-tests.mk: Regen. + +2010-08-09 Guillaume Lazzara <z(a)lrde.epita.fr> + + Small changes in Milena. + + * mln/accu/internal/base.hh, + * mln/accu/math/sum.hh: Aesthetic changes. + + * mln/data/paste_without_localization.hh: Add a missing include. + + * mln/geom/rotate.hh: Add a new overload taking a box as argument. + +2010-08-04 Guillaume Lazzara <z(a)lrde.epita.fr> + + Replace deduced type 'point' by 'site'. + + * mln/geom/max_col.hh, + * mln/geom/max_row.hh, + * mln/geom/min_col.hh, + * mln/geom/min_row.hh: Replace deduced type 'point' by 'site'. + +2010-07-06 Guillaume Lazzara <z(a)lrde.epita.fr> + + Small fixes in milena. + + * doc/figures/ima2d-rot-2.ppm: Update generated output. + + * mln/core/alias/window2d.hh: Aesthetic changes in the header. + + * mln/core/point.hh: Add mln:: prefix. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Fix the way to convert unsigned to float. + + * mln/convert/from_to.hxx: New conversion utilities. + * mln/convert/impl/from_unsigned_to_value.hh: New conversion utilities. + +2009-12-02 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Fix the outside template use case for the convolve macros. + + * mln/linear/ch_convolve.hh (mln_ch_convolve_, mln_ch_convolve_grad_): + Define new macros to work outside templates. + +2010-06-28 Guillaume Lazzara <z(a)lrde.epita.fr> + + Revamp and fix a bug in io::magick::*. + + * mln/io/magick/load.hh: Revamp. + + * mln/io/magick/save.hh: Fix a bug while saving. RGB values must + be between 0 and 1. + + * tests/io/magick/save.cc: Remove useless output. + +2010-06-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add new tests. + + * tests/convert/Makefile.am, + * tests/subsampling/Makefile.am: Add targets for these new tests. + + * tests/convert/to_qimage.cc, + * tests/convert/to_qimage_nocopy.cc, + * tests/subsampling/antialiased.cc: New. + +2010-06-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix conversion routines towards qimage. + + * mln/convert/to_qimage.hh: Fix invalid conversions. + + * mln/convert/to_qimage_nocopy.hh: Avoid a warning. + +2010-06-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/accu/count_value.hh: Add properties. + +2010-06-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix a bug in conversions from vec to point. + + * milena/mln/core/concept/gpoint.hh: Fix comment. + + * milena/mln/core/image/image1d.hh: Share a dpoint value. + + * milena/mln/core/point.hh: Handle point1d. + +2010-06-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Introduce labeling::value_and_compute. + + * mln/canvas/labeling/video.hh: Call more functor members. + + * mln/labeling/value.hh: Provide new members to the functor. + + * mln/labeling/value_and_compute.hh: New functor computing + attributes while labeling. + +2010-05-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/magick/load.hh: set minimum resolution for PDF files to + 300DPI. + +2010-07-01 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix a few tests. + + * tests/core/other/box_runstart_piter.cc, + * tests/geom/translate.cc: Fix test. + +2010-07-01 Guillaume Lazzara <z(a)lrde.epita.fr> + + Update generated images included in the doc. + + * doc/figures/fill-subdomain-3.ppm, + * doc/figures/ima2d-rot-2.ppm, + * doc/figures/labeling-compute-2.ppm, + * doc/figures/tuto3_colorize-2.ppm, + * doc/figures/tuto4_genericity_and_algorithms-5.ppm: Update + generated images. + +2010-07-01 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add from_to overloads for conversions from algebra::vec to point. + + * mln/convert/from_to.hxx: Add new prototypes. + + * mln/core/point.hh: Add new from_to overloads. Remove specialized + constructors causing ambiguities. + +2010-06-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a function to convert qt::rgb32 values to int_u8. + + * mln/fun/v2v/qt_rgb_to_int_u.hh: New. + + * tests/fun/v2v/Makefile.am, + * tests/fun/v2v/qt_rgb_to_int_u.cc: New test. + +2010-06-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Use sites instead of pixels in canvas::labeling::blobs functors. + + * mln/canvas/labeling/blobs.hh, + * mln/labeling/blobs.hh: Update members prototypes. + + * mln/labeling/blobs_and_compute.hh: Do not construct on-the-fly + pixels anymore. + +2010-05-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Small fixes. + + * mln/labeling/compute.hh: Add a missing include. + + * mln/literal/colors.hh: Revamp header. + + * mln/value/internal/make_generic_name.hh: Add a missing inline. + + * mln/value/qt/rgb32.hh: Add a missing inline and a useless + literal. + + * mln/value/rgb.hh: Add a fixme. + +2010-05-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/subsampling/antialiased.hh: Fix an invalid output buffer + size which may lead to a segfault. + +2010-05-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a new meta tool to deduce an extension type. + + mln/core/routine/extend.hh: Introduce a new macro + mln_extension_type. + + mln/geom/rotate.hh: Make use of this new macro. + +2010-05-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Reduce precision issues in transformations. + + * mln/core/image/imorph/interpolated.hh: Make the vector type more + generic. + + * mln/core/point.hh: Provide specific conversion operators for + float and double. + + * mln/fun/internal/x2x_linear_impl.hh: Allow to set the matrix + value type. + + * mln/fun/x2x/composed.hh, + * mln/fun/x2x/rotation.hh, + * mln/fun/x2x/translation.hh: Introduce data_t typedef passed to + x2x_linear_impl. + +2010-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add some code in my sandbox. + + * sandbox/lazzara/scribo/binarization_naive/main.cc, + * sandbox/lazzara/scribo/binarization_naive/toto.cc, + * sandbox/lazzara/scribo/fill_holes/main.cc, + * sandbox/lazzara/scribo/separateurs_materialises/lines_pattern.cc, + * sandbox/lazzara/scribo/skeleton_crest/main.cc, + * sandbox/lazzara/skeleton_crest/main.cc: New. + +2010-05-21 edwin carlinet <carlinet(a)lrde.epita.fr> + + Add MLN_WO_GLOBAL_VARS directive that prevents globals vars to be + included. + + * mln/border/thickness.hh, + * mln/core/alias/dpoint1d.hh, + * mln/core/alias/dpoint2d.hh, + * mln/core/alias/dpoint3d.hh, + * mln/fun/v2v/hsl_to_rgb.hh, + * mln/literal/black.hh, + * mln/literal/colors.hh, + * mln/literal/identity.hh, + * mln/literal/one.hh, + * mln/literal/origin.hh, + * mln/literal/white.hh, + * mln/literal/zero.hh, + * mln/tag/init.hh, + * mln/trace/entering.hh, + * mln/trace/quiet.hh, + * mln/value/sign.hh: Add MLN_WO_GLOBAL_VARS define. + +2010-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add some code in my sandbox. + + * milena/sandbox/lazzara/scribo/binarization_naive/main.cc, + * milena/sandbox/lazzara/scribo/binarization_naive/toto.cc, + * milena/sandbox/lazzara/scribo/fill_holes/main.cc, + * milena/sandbox/lazzara/scribo/separateurs_materialises/lines_pattern.cc, + * milena/sandbox/lazzara/scribo/skeleton_crest/main.cc, + * milena/sandbox/lazzara/skeleton_crest/main.cc: New. + +2010-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add fastest implementations in labeling::compute. + + * mln/labeling/compute.hh: New fastest implementations. + +2010-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> + + Small fixes in Milena. + + * mln/canvas/labeling/blobs.hh: Fill extension. + + * mln/data/paste_without_localization.hh: Check whether the + two images have the same domain. + + * mln/labeling/blobs_and_compute.hh: Rename members. + + * mln/labeling/colorize.hh: Add missing includes. + + * mln/world/binary_2d/enlarge.hh: use def::coord. + +2010-04-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/labeling/blobs_and_compute.hh: Fix an invalid size of + reserved memory. + +2010-04-13 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/subsampling/antialiased.hh: Fix the use of 'factor round'. + +2010-04-09 Guillaume Lazzara <z(a)lrde.epita.fr> + + Rename nslis to nslices. + + * mln/geom/nslis.hh, + * tests/geom/nslis.cc: Rename as... + + * mln/geom/nslices.hh, + * tests/geom/nslices.cc: ... this. + + * mln/core/image/image3d.hh, + * mln/core/internal/box_impl.hh, + * mln/core/site_set/box.hh, + * mln/debug/slices_2d.hh, + * mln/geom/all.hh, + * mln/geom/size3d.hh, + * mln/linear/gaussian.hh, + * mln/linear/gaussian/impl.hh, + * mln/make/box3d.hh, + * mln/make/image.hh, + * mln/registration/icp.hh, + * tests/core/alias/box3d.cc, + * tests/core/image/image3d.cc, + * tests/geom/Makefile.am, + * tests/io/pbms/load.cc, + * tests/io/pgms/load.cc, + * tests/io/ppms/load.cc, + * tests/transform/bench_closest_point_geodesic.cc: Rename nslis to + nslices. + +2010-04-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + * img/picasso.ppm: Add a ppm version. + +2010-04-07 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/value/qt/rgb32.hh: Explicitly cast float values to unsigned. + +2010-04-06 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/debug/mosaic.hh: New. Construct a single image from a set of + images. + +2010-04-06 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/histo/equalize.hh: New. Add histogram equalization. + +2010-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add vertical/horizontal symmetry. + + * mln/labeling/relabel.hh: Fix an invalid 'const'. + + * mln/geom/horizontal_symmetry.hh, + * mln/geom/vertical_symmetry.hh: New routines. + + * tests/geom/Makefile.am, + * tests/geom/horizontal_symmetry.cc, + * tests/geom/vertical_symmetry.cc: New tests. + +2010-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/debug/z_order.hh: New image data initializer. + +2010-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve antialiased subsampling. + + * mln/subsampling/antialiased.hh: Add support for any factors and + for RGB images. + +2010-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a new routine to split a color image into three grayscale + images. + + * mln/data/split.hh: New. + + * tests/data/split.cc: New test. + +2010-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add new implementations of paste_without_localization. + + * mln/data/paste_without_localization.hh: Add new implementations. + + * tests/data/Makefile.am, + * tests/data/paste_without_localization.cc: New tests. + +2010-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve to_qimage routines. + + * mln/convert/to_qimage.hh: rename namespace. + + * mln/convert/to_qimage_nocopy.hh: Add a new implementation and + improve existing ones. + +2010-03-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/subsampling/antialiased.hh: Add support for reduction factor + different from 2 or 3. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/labeling/colorize.hh: Add support for value::qt::rgb32. + +2010-02-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Small fixes in Milena. + + * mln/accu/center.hh: Add nsites() member. + + * mln/accu/pair.hh: Provide access to the underlying accus. + + * mln/accu/stat/variance.hh: Use literal::zero. + + * mln/core/internal/labeled_image_base.hh: Indent. + + * mln/core/site_set/box.hh: Rename center() as pcenter(). + + * mln/labeling/blobs_and_compute.hh: Return the array of + accumulators. + + * mln/labeling/colorize.hh: Make sure a color is not used + twice in the same image. + + * mln/labeling/compute.hh: Add a new overload. + + * mln/transform/influence_zone_geodesic.hh: Fix a + segmentation fault when an image had a border. + +2009-12-14 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add rbg_to_int_u function. + + * mln/fun/v2v/all.hh: Include the new header. + + * mln/fun/v2v/rgb_to_int_u.hh: New. + +2009-12-14 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add an antialiased subsampling. + + * mln/subsampling/antialiased.hh: New. + +2009-12-14 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add hooks for subclasses in labeled_image_base. + + * mln/core/internal/labeled_image_base.hh: New methods which can + be overridden in subclasses. + + * mln/core/image/imorph/labeled_image.hh: Add a missing header. + +2010-03-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + Small fixes. + + * mln/accu/count_value.hh: Fix doc. + + * mln/convert/from_to.hxx, + * mln/value/int_u.hh, + * mln/value/qt/rgb32.hhL: Add new from_to overloads. + + * mln/convert/to_qimage.hh: Add a missing include. + + * mln/convert/to_qimage_nocopy.hh: Rename an overload. + + * mln/core/concept/function.hh: Add new concept n2v. + + * mln/geom/rotate.hh: rename center() to pcenter(). + + * mln/histo/compute.hh: Fix a namespace ambiguity. + + * mln/io/magick/save.hh: Handle qt::rgb32. + + * mln/io/plot/save.hh: Add an overload for histograms. + + * mln/labeling/relabel.hh: Make 'nlabels' const. + + * mln/topo/skeleton/crest.hh: Fix a bug. + + * tests/core/other/box_runstart_piter.cc: Write a valid test. + +2010-03-11 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/draw/dashed_line.hh: New draw line routine. + +2010-02-24 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add white gaussian noise function. + + * mln/fun/all.hh: Include a new file. + + * mln/fun/n2v/all.hh, + * mln/fun/n2v/white_gaussian.hh: New. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Cleanup to_qimage convertion routines. + + * mln/convert/to_qimage.hh: Remove useless comments and move a + specific implementation... + + * mln/convert/to_qimage_nocopy.hh: ... in this new file. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a routine to convert to a QImage. + + * mln/convert/to_qimage.hh: New. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add box<>::merge. + + * mln/core/site_set/box.hh: New member 'merge()'. + + * tests/core/site_set/Makefile.am, + * tests/core/site_set/box.cc: New test. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Rename image3d<>::nslices to image3d<>::nslis. + + * mln/core/image/image3d.hh, + * mln/debug/slices_2d.hh, + * tests/io/pbms/load.cc, + * tests/io/pgms/load.cc, + * tests/io/ppms/load.cc: Rename nslices to nslis. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Various small fixes. + + * doc/tutorial/tutorial.tex: Add more contacts. + + * mln/accu/label_used.hh: Do not use label<>::next(). + + * mln/draw/line.hh: Add a fixme. + + * mln/io/dump/save.hh: Close the file. + + * mln/io/plot/save.hh: Fix an invalid prototype. + + * mln/io/pnm/load.hh: Fix an invalid static check. + + * mln/io/raw/get_header.hh: Fix comment. + + * mln/labeling/pack.hh: Disable a static check on symbolic values. + + * mln/math/diff_abs.hh: Add a fixme. + + * mln/world/inter_pixel/full2image.hh: Use mln_concrete(). + + * mln/data/fill_with_value.hh, + * mln/io/raw/load.hh, + * mln/io/raw/save.hh, + * mln/labeling/compute.hh, + * mln/registration/icp.hh: Aesthetic changes. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/topo/skeleton/crest.hh: Fix invalid PSI values for component + edge sites. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a routine to read dump files header. + + * mln/io/dump/all.hh: Include a new file. + + * mln/io/dump/get_header.hh: New. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a routine to read DICOM files header. + + * mln/io/dicom/all.hh: Include a new file. + + * mln/io/dicom/get_header.hh: New. + + * mln/io/dicom/load.hh: Add more doc. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add A new routine to draw plain boxes. + + * mln/draw/all.hh: Include new file. + + * mln/draw/box.hh: Add a fixme. + + * mln/draw/box_plain.hh: New. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add more implementations for box specializations. + + * mln/core/internal/box_impl.hh: Add width, height and depth. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + First draft of raw format support. + + * mln/io/raw/all.hh, + * mln/io/raw/get_header.hh, + * mln/io/raw/load.hh, + * mln/io/raw/save.hh: New. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add new 3D neighborhoods and windows. + + * mln/core/alias/neighb3d.hh, + * mln/win/sline3d.hh: New. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a new rgb32 type for Qt compatibility. + + * mln/convert/from_to.hxx: Declare conversion routines. + + * mln/value/qt/rgb32.hh: New. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix invalid value type names in dump format. + + * mln/value/internal/make_generic_name.hh: New. + + * mln/value/int_u.hh, + * mln/value/label.hh, + * mln/value/rgb.hh: Make use of the new routine to print a + correct type names in dump format. + +2010-07-19 Roland Levillain <roland(a)lrde.epita.fr> + + Fix and improve the Magick++ I/O API wrapper. + + * mln/io/magick/load.hh + (io::magick::do_it): Enclose these helpers... + (io::magick::impl::do_it): ...in a sub-namespace. + (io::magick::load): Ensure a Magick++'s Quantum is an 8-bit value. + Use a pixel view (Magick::Pixels) to access to pixel values. + No longer pass the input filename to the `do_it' helper. + Simplify the code. + Improve the documentation. + Aesthetic changes. + * mln/io/magick/save.hh + (io::magick::get_color): Enclose these helpers... + (io::magick::impl::get_color): ...in a sub-namespace. + Properly use Magick::Color. + Properly pass the width and the height of the image. + Use a pixel view (Magick::Pixels) to access to pixel values. + Simplify the code. + Aesthetic changes. + * tests/io/magick/load.cc, + * tests/io/magick/save.cc: + Properly initialize Magick++. + Exercice more cases. + * tests/io/magick/Makefile.am (MOSTLYCLEANFILES): + Update the list of files created by tests. + +2010-04-26 Roland Levillain <roland(a)lrde.epita.fr> + + Clean Milena's tests' outputs during `make mostlyclean'. + + * apps/mesh-segm-skel/Makefile.am, + * apps/papers/levillain.09.ismm/Makefile.am + (CLEANFILES): Rename as... + (MOSTLYCLEANFILES): ...this. + +2010-04-26 Roland Levillain <roland(a)lrde.epita.fr> + + Canonize Milena's tests' output file names. + + * tests/binarization/threshold.cc, + * tests/data/approx/median.cc, + * tests/data/median.cc, + * tests/data/median_fast.cc, + * tests/data/naive/median.cc, + * tests/io/dump/dump.cc, + * tests/io/fits/fits.cc, + * tests/io/magick/save.cc, + * tests/io/off/load_save_bin.cc, + * tests/io/pbm/pbm.cc, + * tests/io/pbm/pbm_ascii.cc, + * tests/io/pbms/load.cc, + * tests/io/pgm/pgm.cc, + * tests/io/pgm/pgm16.cc, + * tests/io/pgm/pgm19.cc, + * tests/io/pgm/pgm27.cc, + * tests/io/pgm/pgm_ascii.cc, + * tests/io/pgms/load.cc, + * tests/io/ppm/ppm.cc, + * tests/io/ppm/ppm16.cc, + * tests/io/ppm/ppm23.cc, + * tests/io/ppms/load.cc, + * tests/linear/convolve.cc, + * tests/linear/convolve_2x1d.cc, + * tests/linear/convolve_directional.cc, + * tests/linear/gaussian.cc, + * tests/linear/gaussian/filter.cc, + * tests/linear/lap.cc, + * tests/linear/log.cc, + * tests/linear/sobel_2d.cc, + * tests/morpho/approx/dilation.cc, + * tests/morpho/approx/erosion.cc, + * tests/morpho/artificial_line_graph_image_wst.cc, + * tests/morpho/closing/algebraic.cc, + * tests/morpho/closing/approx/structural.cc, + * tests/morpho/closing/height.cc, + * tests/morpho/closing/leveling.cc, + * tests/morpho/closing/structural.cc, + * tests/morpho/closing/sum.cc, + * tests/morpho/closing/volume.cc, + * tests/morpho/complex_image_wst.cc, + * tests/morpho/contrast.cc, + * tests/morpho/dilation.cc, + * tests/morpho/general.cc, + * tests/morpho/gradient.cc, + * tests/morpho/hit_or_miss.cc, + * tests/morpho/laplacian.cc, + * tests/morpho/lena_line_graph_image_wst1.cc, + * tests/morpho/lena_line_graph_image_wst2.cc, + * tests/morpho/meyer_wst.cc, + * tests/morpho/meyer_wst_long.cc, + * tests/morpho/opening/algebraic.cc, + * tests/morpho/opening/approx/structural.cc, + * tests/morpho/opening/area.cc, + * tests/morpho/opening/height.cc, + * tests/morpho/opening/leveling.cc, + * tests/morpho/opening/structural.cc, + * tests/morpho/opening/sum.cc, + * tests/morpho/opening/volume.cc, + * tests/morpho/thinning.cc, + * tests/morpho/watershed/flooding.cc, + * tests/morpho/watershed/topological.cc: + Add the name of the test as prefix of its output file names. + * tests/binarization/Makefile.am, + * tests/data/Makefile.am, + * tests/data/approx/Makefile.am, + * tests/data/naive/Makefile.am, + * tests/io/dump/Makefile.am, + * tests/io/fits/Makefile.am, + * tests/io/magick/Makefile.am, + * tests/io/off/Makefile.am, + * tests/io/pbm/Makefile.am, + * tests/io/pbms/Makefile.am, + * tests/io/pgm/Makefile.am, + * tests/io/pgms/Makefile.am, + * tests/io/ppm/Makefile.am, + * tests/io/ppms/Makefile.am, + * tests/linear/Makefile.am, + * tests/linear/gaussian/Makefile.am, + * tests/morpho/Makefile.am, + * tests/morpho/approx/Makefile.am, + * tests/morpho/closing/Makefile.am, + * tests/morpho/closing/approx/Makefile.am, + * tests/morpho/opening/Makefile.am, + * tests/morpho/opening/approx/Makefile.am, + * tests/morpho/watershed/Makefile.am + (CLEANFILES): Adjust. + Rename as... + (MOSTLYCLEANFILES): ...this. + +2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + + Add missing const qualifiers in iterators on complexes. + + * mln/topo/internal/complex_set_iterator_base.hh + (complex_set_iterator_base<F, E>::complex_set_iterator_base) + (complex_set_iterator_base<F, E>::set_cplx): + Add const qualifier to argument. + +2010-06-03 Roland Levillain <roland(a)lrde.epita.fr> + + Clean up some tests in tests/morpho/. + + * tests/morpho/rank_filter.cc: Do not include mln/io/pgm/save.hh. + * tests/morpho/skeleton_constrained.cc: Likewise. + (mln::show_connectivity_numbers): Move this function into the + global namespace to avoid the pollution of the `mln' namespace. + Aesthetic changes. + +2010-06-03 Roland Levillain <roland(a)lrde.epita.fr> + + Clean up a bit Milena's Makefiles. + + * Makefile.am, + * apps/mesh-segm-skel/Makefile.am, + * mesh/Makefile.am, + * tests/Makefile.am, + * tests/accu/Makefile.am, + * tests/accu/image/Makefile.am, + * tests/accu/math/Makefile.am, + * tests/accu/shape/Makefile.am, + * tests/accu/site_set/Makefile.am, + * tests/accu/stat/Makefile.am, + * tests/algebra/Makefile.am, + * tests/arith/Makefile.am, + * tests/binarization/Makefile.am, + * tests/border/Makefile.am, + * tests/canvas/Makefile.am, + * tests/canvas/browsing/Makefile.am, + * tests/canvas/morpho/Makefile.am, + * tests/convert/Makefile.am, + * tests/convert/impl/Makefile.am, + * tests/core/Makefile.am, + * tests/core/alias/Makefile.am, + * tests/core/image/Makefile.am, + * tests/core/image/dmorph/Makefile.am, + * tests/core/image/imorph/Makefile.am, + * tests/core/image/vmorph/Makefile.am, + * tests/core/other/Makefile.am, + * tests/core/routine/Makefile.am, + * tests/core/site_set/Makefile.am, + * tests/data/Makefile.am, + * tests/data/approx/Makefile.am, + * tests/data/naive/Makefile.am, + * tests/debug/Makefile.am, + * tests/display/Makefile.am, + * tests/draw/Makefile.am, + * tests/estim/Makefile.am, + * tests/extension/Makefile.am, + * tests/extract/Makefile.am, + * tests/fun/Makefile.am, + * tests/fun/i2v/Makefile.am, + * tests/fun/p2b/Makefile.am, + * tests/fun/p2p/Makefile.am, + * tests/fun/p2v/Makefile.am, + * tests/fun/stat/Makefile.am, + * tests/fun/v2i/Makefile.am, + * tests/fun/v2v/Makefile.am, + * tests/fun/vv2v/Makefile.am, + * tests/fun/x2x/Makefile.am, + * tests/geom/Makefile.am, + * tests/graph/Makefile.am, + * tests/graph/attribute/Makefile.am, + * tests/histo/Makefile.am, + * tests/io/Makefile.am, + * tests/io/dicom/Makefile.am, + * tests/io/dump/Makefile.am, + * tests/io/fits/Makefile.am, + * tests/io/fld/Makefile.am, + * tests/io/magick/Makefile.am, + * tests/io/off/Makefile.am, + * tests/io/pbm/Makefile.am, + * tests/io/pbms/Makefile.am, + * tests/io/pfm/Makefile.am, + * tests/io/pgm/Makefile.am, + * tests/io/pgms/Makefile.am, + * tests/io/pnm/Makefile.am, + * tests/io/ppm/Makefile.am, + * tests/io/ppms/Makefile.am, + * tests/io/tiff/Makefile.am, + * tests/labeling/Makefile.am, + * tests/linear/Makefile.am, + * tests/linear/gaussian/Makefile.am, + * tests/linear/local/Makefile.am, + * tests/literal/Makefile.am, + * tests/logical/Makefile.am, + * tests/make/Makefile.am, + * tests/math/Makefile.am, + * tests/metal/Makefile.am, + * tests/metal/make/Makefile.am, + * tests/metal/math/Makefile.am, + * tests/morpho/Makefile.am, + * tests/morpho/approx/Makefile.am, + * tests/morpho/attribute/Makefile.am, + * tests/morpho/closing/Makefile.am, + * tests/morpho/closing/approx/Makefile.am, + * tests/morpho/elementary/Makefile.am, + * tests/morpho/opening/Makefile.am, + * tests/morpho/opening/approx/Makefile.am, + * tests/morpho/reconstruction/Makefile.am, + * tests/morpho/reconstruction/by_dilation/Makefile.am, + * tests/morpho/reconstruction/by_erosion/Makefile.am, + * tests/morpho/tree/Makefile.am, + * tests/morpho/tree/filter/Makefile.am, + * tests/morpho/watershed/Makefile.am, + * tests/norm/Makefile.am, + * tests/opt/Makefile.am, + * tests/pw/Makefile.am, + * tests/registration/Makefile.am, + * tests/set/Makefile.am, + * tests/subsampling/Makefile.am, + * tests/tag/Makefile.am, + * tests/test/Makefile.am, + * tests/topo/Makefile.am, + * tests/topo/skeleton/Makefile.am, + * tests/trace/Makefile.am, + * tests/trait/Makefile.am, + * tests/trait/image/Makefile.am, + * tests/trait/op/Makefile.am, + * tests/trait/value/Makefile.am, + * tests/transform/Makefile.am, + * tests/unit_test/Makefile.am, + * tests/upscaling/Makefile.am, + * tests/upscaling/art/Makefile.am, + * tests/util/Makefile.am, + * tests/value/Makefile.am, + * tests/value/builtin/Makefile.am, + * tests/value/concept/Makefile.am, + * tests/win/Makefile.am, + * tests/world/Makefile.am, + * tests/world/binary_2d/Makefile.am, + * tests/world/inter_pixel/Makefile.am, + * tests/world/inter_pixel/dim2/Makefile.am, + * tools/Makefile.am: + Here. + +2010-05-12 Roland Levillain <roland(a)lrde.epita.fr> + + Add missing copyright headers in Milena. + + * apps/constrained-connectivity/test-constrained-connectivity.in, + * apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in, + * apps/mesh-segm-skel/test-mesh-complex-max-curv.in, + * apps/mesh-segm-skel/test-mesh-complex-segm.in, + * apps/mesh-segm-skel/test-mesh-complex-skel.in, + * apps/mesh-segm-skel/test-mesh-max-curv.in, + * apps/mesh-segm-skel/test-mesh-segm.in, + * doc/graphicx.hva, + * doc/tools/clearbanner.sh, + * doc/tools/split_sample.sh: + Here. + +2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + + Miscellaneous changes in graphs and graph-based images. + + * mln/util/graph.hh, + * mln/util/line_graph.hh, + * mln/core/image/vertex_image.hh, + * mln/core/image/edge_image.hh: + Fix the Doxygen documentation. + * mln/util/vertex.hh: Aesthetic changes. + * mln/util/edge.hh: Aesthetic changes. + (util::edge<G>::invalidate): Remove dead code. + * tests/morpho/line_graph_image_morpho.cc: + Fix (non) Doxygen comments. + +2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + + Fix make::edge_image. + + * mln/make/edge_image.hh: Fix Doxygen comments. + (make::edge_image(const Graph<G>&, const fun::i2v::array<V>&)) + (make::edge_image(const Graph<G>&, const Function_v2v<FP>&, + const Function_v2v<FV>&))): + Properly build the required p_edges site sets. + (make::edge_image(const vertex_image<P,V,G>&, const Function_v2b<F>&)): + Actually use the predicate passed as second argument. + Remove debug code. + +2010-04-27 Roland Levillain <roland(a)lrde.epita.fr> + + Help g++ 3.3 compile Milena code. + + * apps/graph-morpho/convert.hh + (convert::to_image2d(const mln::bin_1complex_image2d&)): + Break up an object's construction to help g++ 3.3 understand it. + +2010-04-23 Roland Levillain <roland(a)lrde.epita.fr> + + Prevent g++ 4.2 from issuing bad code for graph-morpho/samples_image2d. + + * apps/graph-morpho/Makefile.am (STRICT_ALIASING_CXXFLAGS): New. + (samples_image2d_CXXFLAGS): New. + Set to $(AM_CXXFLAGS) $(STRICT_ALIASING_CXXFLAGS). + +2010-04-22 Roland Levillain <roland(a)lrde.epita.fr> + + Fix distcleancheck. + + * apps/papers/levillain.09.ismm/Makefile.am (CLEANFILES): New. + Add $(noinst_DATA) and graph-s.neato. + * tests/morpho/watershed/Makefile.am (CLEANFILES): + Add topo_wst.pgm. + +2010-04-22 Roland Levillain <roland(a)lrde.epita.fr> + + Do not install images from papers (yet). + + * apps/papers/levillain.09.ismm/Makefile.am + (dist_data_DATA): Move seeds.pgm and m283-c.off... + (dist_noinst_DATA): ...here. + (data_DATA): Move lena-s.ppm, graph-s.png and m283-s.off... + (noinst_DATA): ...here. + +2010-04-22 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the Milena installation. + + * Makefile.am (nobase_include_HEADERS): Move mln/version.hh... + (nobase_nodist_include_HEADERS): ...here. + +2010-04-21 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the Milena distribution. + + * apps/papers/levillain.09.ismm/Makefile.am + (data_DATA): Move seeds.pgm and m283-c.off... + (dist_data_DATA): ...here. + * tests/unit_test/Makefile.am (EXTRA_DIST): Add disabled_tests. + +2010-04-21 Roland Levillain <roland(a)lrde.epita.fr> + + Fix Milena's unit tests generator's dependencies. + + * tests/unit_test/Makefile.am ($(srcdir)/unit-tests.mk): + Depend on disabled_tests. + +2010-04-13 Roland Levillain <roland(a)lrde.epita.fr> + + Fix accu::compute(const Meta_Accumulator<A>, const Image<I>&). + + * mln/accu/compute.hh + (accu::compute(const Meta_Accumulator<A>, const Image<I>&)): Here. + +2010-04-20 Roland Levillain <roland(a)lrde.epita.fr> + + Exercise mln::util::ord. + + * tests/util/Makefile.am (check_PROGRAMS): Add ord. + (ord_SOURCES): New. + +2010-04-20 Roland Levillain <roland(a)lrde.epita.fr> + + Fix more tests. + + * mln/core/image/imorph/labeled_image.hh: Include + mln/data/compute.hh. + * mln/io/fld/save.hh: Fix headers' inclusions. + * mln/io/fld/write_header.hh: Likewise. + Add missing namespace qualifiers. + +2010-04-20 Roland Levillain <roland(a)lrde.epita.fr> + + Install meshes in $(pkgdatadir)/meshes. + + * mesh/Makefile.am (meshdir): Here. + +2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> + + Fix test core/other/box_runend_piter. + + * tests/core/other/box_runend_piter.cc: Fix assertion. + +2010-03-30 Roland Levillain <roland(a)lrde.epita.fr> + + Do not install low-quality HTML documentation. + + * doc/Makefile.am (DATA_html_dirs_inst): New. + Use it... + (install-data-local, uninstall-local): Here. + +2010-03-30 Roland Levillain <roland(a)lrde.epita.fr> + + Adjust the installation of the HTML documentation. + + * doc/Makefile.am (all-local): Do not depend on + $(srcdir)/$(USER_REFMAN_PDF). + (dist_pdf_DATA): Add $(srcdir)/$(USER_REFMAN_PDF) instead of + $(USER_REFMAN_PDF). + (AM_CPPFLAGS): Remove -I$(top_srcdir)/milena/doc/tutorial/tools. + (regen-doc, $(srcdir)/user-refman.stamp) + (regen-devel-doc, $(srcdir)/devel-refman.stamp): + Remove `-' before `rm' actions. + (EXTRA_DIST): Add $(USER_REFMAN). + (maintainer-clean-local) + (install-data-local) + (uninstall-local): + Handle the new HTML subdirectories. + (MAINTAINERCLEANFILES): Remove $(dist_html_DATA). + +2010-03-30 Roland Levillain <roland(a)lrde.epita.fr> + + Move LaTeX sources at the root of doc/; generate HTML in subdirs. + + * doc/tutorial/tutorial.tex, + * doc/technical/technical.tex, + * doc/ref_guide/ref_guide.tex, + * doc/white_paper/white_paper.tex: + Move... + * doc/tutorial.tex, + * doc/technical.tex, + * doc/ref-guide.tex, + * doc/white-paper.tex: + ...here. + * doc/graphicx.hva: New. + * doc/technical/figures/file_layout.pdf, + * doc/technical/figures/file_layout.png, + * doc/white_paper/figures/house.png, + * doc/white_paper/figures/house_rag.png, + * doc/white_paper/figures/house_wshed.png, + * doc/white_paper/figures/house_wshed_mean_colors.png: + Move... + * doc/figures/technical/file_layout.pdf, + * doc/figures/technical/file_layout.png, + * doc/figures/house.png, + * doc/figures/house_rag.png, + * doc/figures/house_wshed.png, + * doc/figures/house_wshed_mean_colors.png: + ...here. + * doc/technical.tex: Adjust paths. + * doc/technical/designs/, + * doc/tutorial/designs/, + * doc/tutorial/doxyfile_tuto.local, + * doc/tutorial/image_types.txt, + * doc/tutorial/image_values.txt, + * doc/tutorial/images_tour.txt, + * doc/tutorial/slides.tex: + Rename as... + * doc/technical.old/designs/, + * doc/tutorial.old/design/, + * doc/tutorial.old/doxyfile_tuto.local, + * doc/tutorial.old/image_types.txt, + * doc/tutorial.old/image_values.txt, + * doc/tutorial.old/images_tour.txt, + * doc/tutorial.old/slides.tex: + ...this. + * tutorial/headers.stamp: Remove. + * doc/Makefile.am (REFMAN_deps): Rename as... + (refman_dependencies): ...this. + Adjust paths. + ($(srcdir)/user-refman.stamp, $(srcdir)/devel-refman.stamp): + Adjust. + (PNGS, EPSS): Remove. + (.png.eps): Remove rule. + (TECHNICAL_FIGURES, WHITE_PAPER_FIGURES): New. + (MORE_FIGURES): Add $(TECHNICAL_FIGURES) and + $(WHITE_PAPER_FIGURES). + (technical_dir, tutorial_dir, white_paper_dir, ref_guide_dir): + Remove. + (TECHNICAL, TUTORIAL, WHITE_PAPER, REF_GUIDE): New. + (TECHNICAL_PDF, TUTORIAL_PDF, WHITE_PAPER_PDF, REF_GUIDE_PDF) + (TUTORIAL_HH, REF_GUIDE_HH) + (EXTRA_DIST, MAINTAINERCLEANFILES): Adjust. + Remove (EPSS). + (EXTRA_DIST): Remove $(PNGS). + Add graphicx.hva. + (technical_dependencies) + (tutorial_dependencies) + (ref_guide_dependencies): + Rename as... + (TECHNICAL_deps) + (TUTORIAL_deps) + (REF_GUIDE_deps): + ...this. + (TECHNICAL_deps): Add $(TECHNICAL_FIGURES). + (WHITE_PAPER_deps): New. + ($(TECHNICAL_PDF)) + ($(TUTORIAL_PDF)) + ($(WHITE_PAPER_PDF)) + ($(REF_GUIDE_PDF)): + Adjust. + (TECHNICAL_HTML, TECHNICAL_HTML_OUTPUTS) + (TUTORIAL_HTML, TUTORIAL_HTML_OUTPUTS) + (WHITE_PAPER_HTML, WHITE_PAPER_HTML_OUTPUTS) + (REF_GUIDE_HTML, REF_GUIDE_HTML_OUTPUTS): + Remove. + (all-local): Depend on + $(srcdir)/$(TECHNICAL).stamp, + $(srcdir)/$(TUTORIAL).stamp, + $(srcdir)/$(WHITE_PAPER).stamp and + $(srcdir)/$(REF_GUIDE).stamp. + ($(TECHNICAL_HTML).stamp) + ($(TUTORIAL_HTML).stamp) + ($(WHITE_PAPER_HTML).stamp) + ($(REF_GUIDE_HTML).stamp): + Turn targets into... + ($(srcdir)/$(TECHNICAL).stamp) + ($(srcdir)/$(TUTORIAL).stamp) + ($(srcdir)/$(WHITE_PAPER).stamp) + ($(srcdir)/$(REF_GUIDE).stamp): + ...this. + Adjust rules to generate outputs in a subdirectory. + ($(TECHNICAL_HTML_OUTPUTS)) + ($(TUTORIAL_HTML_OUTPUTS)) + ($(WHITE_PAPER_HTML_OUTPUTS)) + ($(REF_GUIDE_HTML_OUTPUTS)): + Turn targets into... + ($(srcdir)/$(TECHNICAL)) + ($(srcdir)/$(TUTORIAL)) + ($(srcdir)/$(WHITE_PAPER)) + ($(srcdir)/$(REF_GUIDE)): + ...this. + Adjust. + ($(TUTORIAL_HH)): Depend on $(srcdir)/$(TUTORIAL).stamp. + Adjust rule. + ($(REF_GUIDE_HH)): Depend on (srcdir)/$(REF_GUIDE).stamp. + Adjust rule. + (dist_html_DATA): Remove. + (DATA_html_dirs): New. + (EXTRA_DIST): Add $(DATA_html_dirs). + +2010-03-26 Roland Levillain <roland(a)lrde.epita.fr> + + No longer generate doc/technical/technical.hh. + + * doc/Makefile.am (TECHNICAL_HH): Remove variable. + ($(TECHNICAL_HH)): Remove rule. + (MAINTAINERCLEANFILES): Remove $(TECHNICAL_HH). + +2010-03-26 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the regeneration of files in doc/. + + * doc/Makefile.am (regen-am): No longer invoke + regen-pbm-figures-mk, regen-pgm-figures-mk nor + regen-ppm-figures-mk. + +2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the Milena distribution. + + * doc/Makefile.am (EXTRA_DIST): Remove $(TECHNICAL_HH). + * tests/transform/Makefile.am (check_PROGRAMS): Remove kht. + (kht_SOURCES): Remove. + +2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> + + Do not distribute the developer (Doxygen) reference manual. + + * doc/Makefile.am (EXTRA_DIST): Remove + $(srcdir)/devel-refman.stamp. + +2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the name of the developer (Doxygen) PDF reference manual. + + * doc/Makefile.am (DEVEL_REFMAN_PDF): + s/devel-refman-pdf/devel-refman.pdf/. + +2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> + + Use finer installation variables. + + * doc/Makefile.am (dist_doc_DATA): Remove variable. + (dist_html_DATA, dist_pdf_DATA): New variables. + (MAINTAINERCLEANFILES): + Remove $(TECHNICAL_HTML_OUTPUTS), $(TECHNICAL_PDF), + $(TUTORIAL_HTML_OUTPUTS), $(TUTORIAL_PDF), + $(WHITE_PAPER_HTML_OUTPUTS), $(WHITE_PAPER_PDF), + $(REF_GUIDE_HTML_OUTPUTS), $(REF_GUIDE_PDF) and + $(USER_REFMAN_PDF). + Add $(dist_html_DATA) and $(dist_pdf_DATA). + +2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> + + Simplify doc/Makefile.am. + + * doc/Makefile.am: + (DOC_SRCDIR, OUTPUTS_SRCDIR, SPLIT_OUTPUTS_SRCDIR, FIGURES_SRCDIR) + (EXAMPLES_SRCDIR, SPLIT_EXAMPLES_SRCDIR, IMG_SRCDIR, doc_dir): + Remove variables. + Adjust. + +2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> + + * doc/Makefile.am: Update FIXMEs. + +2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> + + Remove Make aliases in the documentation. + + * doc/Makefile.am (doc, doc-user, doc-devel) + (doc-pdf, doc-html, doc-devel-pdf, doc-devel-html) + (ref-doc, ref-doc-pdf, ref-doc-devel, ref-doc-devel-pdf) + (tutorial-pdf, white-paper-pdf, ref-guide-pdf) + (tutorial-html, white-paper-html, ref-guide-html): + Remove (phony) targets. + * Makefile.am (doc, tutorial): Likewise. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + + Regen documentation products. + + * doc/examples/split/ima2d-rot-1.cc.raw, + * doc/figures/fill-subdomain-2.ppm, + * doc/figures/fill-subdomain-3.ppm, + * doc/figures/labeling-compute-2.ppm, + * doc/figures/tuto3_colorize-2.ppm, + * doc/figures/tuto4_genericity_and_algorithms-1.ppm, + * doc/figures/tuto4_genericity_and_algorithms-5.ppm: + Regen + * doc/figures/tuto4_genericity_and_algorithms-7.pgm, + * doc/figures/tuto4_genericity_and_algorithms-7.ppm, + * doc/figures/tuto4_genericity_and_algorithms-8.pgm, + * doc/figures/tuto4_genericity_and_algorithms-8.ppm, + * doc/figures/tuto4_genericity_and_algorithms-9.pgm, + * doc/figures/tuto4_genericity_and_algorithms-9.ppm: + Delete. + * doc/outputs/ima-load.txt, + * doc/outputs/tuto3_first_routine.txt, + * doc/outputs/tuto4_image.txt: + New. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + + Have doc/gen-figures-mk generate more Makefile bits. + + * doc/gen-figures-mk: Generate Make variables PBM_FIGURES, + PGM_FIGURES and PPM_FIGURES in output. + * doc/figures.mk: Regen. + * doc/Makefile.am: No longer include $(srcdir)/pbm-figures.mk, + $(srcdir)/pgm-figures.mk nor $(srcdir)/ppm-figures.mk. + ($(srcdir)/pbm-figures.mk, regen-pbm-figures-mk) + ($(srcdir)/pgm-figures.mk, regen-pgm-figures-mk) + ($(srcdir)/ppm-figures.mk, regen-ppm-figures-mk): + Remove rules. + (EXTRA_DIST): Add $(FIGURES). + Remove $(PBM_FIGURES), $(PGM_FIGURES) and $(PPM_FIGURES). + * doc/pbm-figures.mk, + * doc/pgm-figures.mk, + * doc/ppm-figures.mk: + Remove. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + + Rework doc/gen-figures-mk a bit. + + * doc/gen-figures-mk (gen_var): New function. + Use to factor the emission of the Make variable at the end of the + output. + Aesthetic changes. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + + Distribute doc/gen-split-outputs-mk. + + * doc/Makefile.am (EXTRA_DIST): Add gen-split-outputs-mk. + Aesthetic changes. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + + Make a more portable use of mktemp. + + * doc/gen-split-examples-mk, + * doc/gen-split-outputs-mk: + Here. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + + Sort inputs of generators to make them deterministic w.r.t. outputs. + + * doc/gen-split-examples-mk, + * doc/gen-split-outputs-mk: + Here. + * doc/split-examples.mk: Regen. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + + Generate the list of figures in the documentation. + + * doc/Makefile.am ($(srcdir)/figures.mk): New rule. + (regen-figures-mk): New phony target. + (regen-am): Invoke regen-figures-mk. + * doc/figures.mk: Regen. + +2010-03-20 Roland Levillain <roland(a)lrde.epita.fr> + + Add a script to generate doc/figures.mk. + + * doc/gen-figures-mk: New script. + * doc/Makefile.am (EXTRA_DIST): Add gen-figures-mk. + +2010-03-20 Roland Levillain <roland(a)lrde.epita.fr> + + Use a more uniform style in doc/figures.mk. + + * doc/figures.mk: Here. + Reorder items. + +2010-03-20 Roland Levillain <roland(a)lrde.epita.fr> + + Prepare doc examples for the automated generation of figures.mk. + + * doc/examples/ima2d-rot.cc (main): Pass a literal string as + second argument to doc::ppmsave to help gen-figures-mk. + * doc/examples/labeling-compute.cc (main): Have calls to + doc::ppmsave fit on a single line to help gen-figures-mk. + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + + Typo in doc/. + + * doc/examples/accu-right-instanciation.cc: Rename as... + * doc/examples/accu-right-instantiation.cc: ...this. + * doc/examples/accu-wrong-instanciation.cc.raw, + * doc/examples/split/accu-right-instanciation-1.cc.raw, + * doc/outputs/accu-right-instanciation.txt: + Likewise, rename as... + * doc/examples/accu-wrong-instantiation.cc.raw, + * doc/examples/split/accu-right-instantiation-1.cc.raw, + * doc/outputs/accu-right-instantiation.txt: + ...these. + * doc/ref_guide/ref_guide.tex, + * doc/programs-examples.mk, + * doc/Makefile.am (MORE_EXAMPLES): + s/instanciation/instantiation/. + * doc/examples-outputs.mk, + * doc/examples.mk, + * doc/outputs.mk, + * doc/split-examples.mk: + Regen. + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + + Fix dependencies in doc/. + + * doc/Makefile.am (refman_dependencies): + Remove $(SPLIT_EXAMPLES) and $(SPLIT_OUTPUTS). + (technical_dependencies): Add $(TECHNICAL_EXAMPLES). + (tutorial_dependencies, ref_guide_dependencies): + Add $(EXAMPLES) and $(OUTPUTS). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + + Distribute non generated figures in the documentation. + + * doc/Makefile.am (MORE_FIGURES): New variable. + Add figures/accu_image_morpher_big_picture.pdf. + (EXTRA_DIST): Add $(MORE_FIGURES). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + + Distribute non generated examples in the documentation. + + * doc/Makefile.am (TECHNICAL_EXAMPLES, MORE_EXAMPLES): + New variables. + (EXTRA_DIST): Add $(TECHNICAL_EXAMPLES) and $(MORE_EXAMPLES). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + + Have ``make maintainer-clean'' remove generated figures in doc/. + + * doc/figures.mk + (EXTEND_FIGURES) + (FILL_FIGURES) + (FILL_SUBDOMAIN_FIGURES) + (FILL_IMAGEIF_CFUN_FIGURES) + (IMA2D_ROT_FIGURES) + (IMA_SAVE_FIGURES) + (LABELING_COMPUTE_FIGURES) + (LOGICAL_NOT_FIGURES) + (TUTO2_FIRST_IMAGE_FIGURES) + (TUTO3_COLORIZE_FIGURES) + (TUTO3_RW_IMAGE_FIGURES) + (TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES): + New variables. + Use them to simplify rules. + (FIGURES): New variable. + * doc/Makefile.am (MAINTAINERCLEANFILES): Add $(FIGURES). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + + Generate the list of split outputs in the documentation. + + * doc/Makefile.am ($(srcdir)/split-outputs.mk): New rule. + (regen-split-outputs-mk): New (phony) target. + ($(srcdir)/split-outputs.stamp): Remove rule. + (refman_dependencies) + (tutorial_dependencies) + (ref_guide_dependencies) + (EXTRA_DIST, MAINTAINERCLEANFILES): + Remove $(srcdir)/split-outputs.stamp + Add $(SPLIT_OUTPUTS). + (regen-am): Remake regen-split-outputs-mk. + * doc/gen-split-outputs-mk: New script. + Use it to generate... + * doc/split-outputs.mk: ...this (new) Make helper. + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + + Prepare doc source files for the automation of output splitting. + + * doc/examples/tuto3/println.cc, + * doc/examples/tuto4/site_set_create.cc: + Use doc::begin_output and doc::end_output instead of hand-made + delimiters. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Have split_sample.sh announce the right number of output files. + + * doc/tools/split_sample.sh: Here. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Fix programs in doc/examples/. + + * doc/examples/ima-save.cc: Add a FIXME. + * doc/examples/ima-load.cc: Likewise. + Avoid hard-coded paths. + * doc/examples/tuto4/image.cc: Make it compile. + * doc/img/small.pbm: New symbolic link to img/small.pbm. + * doc/examples/split/ima-load-1.cc.raw: Regen. + * doc/examples/fill-imageif-cfun.cc, + * figures.mk, + * ppm-figures.mk: + s/fill-subimage-cfun/fill-imageif-cfun/. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Update PNG-to-EPS conversion rule. + + * doc/Makefile.am (.png.eps): No longer try to build figures/ in + the build directory. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Remove useless paths in texi2dvi invocations. + + * doc/Makefile.am (TEXI2DVI_FLAGS): + Remove -I $(DOC_SRCDIR)/white_paper. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Update cleaning rules in doc/. + + * doc/Makefile.am (maintainer-clean-local): + Remove outdated actions. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Add missing dependencies. + + * doc/Makefile.am (DOC_PACKAGES): Strip useless $(srcdir) prefixes. + (technical_dependencies) + (tutorial_dependencies) + (ref_guide_dependencies): + Add $(DOC_PACKAGES). + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Ship non generated outputs. + + * doc/Makefile.am (EXTRA_DIST): Add $(MORE_OUTPUTS). + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Generate the list of outputs in the documentation. + + * doc/Makefile.am (OUTPUTS): Remove this variable that used to be + populated by hand. + Include $(srcdir)/outputs.mk. + No longer include $(srcdir)/outputs/outputs.mk. + $(srcdir)/outputs.mk: New target. + (EXTRA_DIST): Add $(OUTPUTS). + (regen-outputs-mk): New (phony) target. + (regen-am): Remake regen-outputs-mk. + Do not recreate $(srcdir)/headers.stamp.tmp. + (EXTRA_DIST): Remove headers.stamp. + ($(srcdir)/outputs/outputs.mk) + ($(srcdir)/headers.stamp): + Remove rules. + (outputs/outputs.mk): Remove this Make helper. + Supersed by... + (outputs.mk): ...this (new) Make helper. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Handle dependencies of generated figures. + + * doc/figures.mk: New Make helper. + Include it... + * doc/Makefile.am: ...here. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + * doc/examples-outputs.mk: Regen. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Prepare for the generation of multiple outputs from doc/ programs. + + * doc/gen-examples-outputs-mk: Split generated rules in two so + that they produce a timestamp that outputs (and soon generated + figures) depend on. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Generate doc/examples-outputs.mk using sources in lieu of programs. + + * doc/gen-examples-outputs-mk: Take sources as input instead of + programs. + * doc/examples-outputs.mk: Regen. + * doc/Makefile.am ($(DOC_SRCDIR)/examples-outputs.mk): + Adjust caller. + Use `find' to get inputs instead of relying on + $(PROGRAMS_examples). + Rename target as... + ($(srcdir)/examples-outputs.mk): ...this. + Depend only on $(srcdir)/gen-examples-outputs-mk, and no longer on + $(srcdir)/Makefile.am. + (regen-examples-outputs-mk): Adjust as well. + * doc/programs-examples.mk: Adjust comments. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Move bits about programs out of doc/Makefile.am to improve readability. + + * doc/Makefile.am (PROGRAMS_examples) + (accu_right_instanciation_SOURCES) + (borderthickness_SOURCES) + (box2d_bbox_SOURCES) + (domain_display_SOURCES) + (dpoint_1_SOURCES) + (estim_sites_SOURCES) + (extend_SOURCES) + (extension_ignore_SOURCES) + (fill_SOURCES) + (fill_call_1_SOURCES) + (fill_imageif_cfun_SOURCES) + (fill_part_image_SOURCES) + (fill_subdomain_SOURCES) + (fill_subdomain_shorter_SOURCES) + (first_routine_SOURCES) + (forall_piter_SOURCES) + (fun_p2v_1_SOURCES) + (graph_data_SOURCES) + (graph_iter_SOURCES) + (ima2d_1_SOURCES) + (ima2d_2_SOURCES) + (ima2d_3_SOURCES) + (ima2d_4_SOURCES) + (ima2d_5_SOURCES) + (ima2d_6_clone_SOURCES) + (ima2d_7_SOURCES) + (ima2d_rot_SOURCES) + (ima_has_SOURCES) + (ima_save_SOURCES) + (ima_size_SOURCES) + (labeling_compute_SOURCES) + (logical_not_SOURCES) + (mln_var_SOURCES) + (parray_append_SOURCES) + (parray_bbox_SOURCES) + (paste_SOURCES) + (paste_call_1_SOURCES) + (point_1_SOURCES) + (predicate_1_SOURCES) + (tuto2_first_image_SOURCES) + (tuto3_colorize_SOURCES) + (tuto3_println_SOURCES) + (tuto3_rw_image_SOURCES) + (tuto3_trace_SOURCES) + (tuto4_genericity_and_algorithms_SOURCES) + (tuto4_point2d_SOURCES) + (tuto4_site_set_create_SOURCES) + (win_create_1_SOURCES) + (win_create_2_SOURCES): + Move variables... + * doc/programs-examples.mk: ...here (new file). + (PROGRAMS_examples): Rename first_routine as tuto3_first_routine. + Add ima-load and tuto4_image. + (first_routine_SOURCES): Remove this variable. + Superseded by... + (tuto3_first_routine_SOURCES): ...this (new) variable. + (ima_load_SOURCES, tuto4_image_SOURCES): New variables. + * doc/Makefile.am: Include $(srcdir)/programs-examples.mk. + +2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> + + Generate the list of split examples in the documentation. + + * doc/gen-split-examples-mk: New script. + * doc/Makefile.am: Include ($(srcdir)/split-examples.mk). + ($(srcdir)/split-examples.mk): New target. + (EXTRA_DIST, MAINTAINERCLEANFILES): Add $(SPLIT_EXAMPLES). + (refman_dependencies) + (tutorial_dependencies) + (ref_guide_dependencies): + Remove $(doc_dir)/split-examples.stamp. + Add $(SPLIT_EXAMPLES). + (regen-split-examples-mk): New (phony) target. + (regen-am): Remake regen-split-examples-mk instead of using + generate_dist_files.sh. + ($(srcdir)/headers.stamp): No longer call generate_dist_files.sh + to regen doc/examples/examples.mk. + No longer include $(srcdir)/examples/examples.mk. + ($(srcdir)/examples/examples.mk, $(srcdir)/split-examples.stamp): + Remove rules. + (EXTRA_DIST, MAINTAINERCLEANFILES): + Remove $(srcdir)/split-examples.stamp. + (EXTRA_DIST): Add gen-split-examples-mk. + * doc/split-examples.mk: New (generated) Make helper. + * doc/examples/examples.mk: Remove. + +2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> + + Generate the list of examples in the documentation. + + * doc/Makefile.am (EXAMPLES): Remove this variable that used to be + populated by hand. + Include ($(srcdir)/examples.mk). + ($(srcdir)/examples.mk): New target. + (EXTRA_DIST): Add $(EXAMPLES). + (regen-examples-mk): New (phony) target. + (regen-am): Remake regen-examples-mk. + * doc/examples.mk: New (generated) Make helper. + +2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> + + Revamp the conversion of images in the documentation. + + * gen-make-variable: New script. + * doc/Makefile.am: Include $(srcdir)/pbm-figures.mk, + ($(srcdir)/pgm-figures.mk and $(srcdir)/ppm-figures.mk. + ($(srcdir)/pbm-figures.mk) + ($(srcdir)/pgm-figures.mk) + ($(srcdir)/ppm-figures.mk): + New targets. + (EXTRA_DIST): Add $(PBM_FIGURES), $(PGM_FIGURES), $(PPM_FIGURES). + (regen-pbm-figures-mk) + (regen-pgm-figures-mk) + (regen-ppm-figures-mk): + New (phony target). + (regen-am): Remake regen-pbm-figures-mk, regen-pgm-figures-mk and + regen-ppm-figures-mk instead of calling generate_dist_files.sh to + convert figures. + ($(srcdir)/headers.stamp): No longer call generate_dist_files.sh to + convert figures. + (convert_to_png): New variable. + (SUFFIXES): Add .pbm, .pgm, .ppm and .png. + (.pbm.png, .pgm.png, .ppm.png): New suffix rules. + (PNG_FIGURES): New variable. + (EXTRA_DIST, MAINTAINERCLEANFILES): Add $(PNG_FIGURES). + (refman_dependencies): + Remove $(srcdir)/figures.stamp. + Add $(PNG_FIGURES). + (technical_dependencies) + (tutorial_dependencies) + (ref_guide_dependencies): + Likewise. + No longer include $(srcdir)/figures/figures.mk. + ($(srcdir)/figures/figures.mk, $(srcdir)/figures.stamp): + Remove rules. + (EXTRA_DIST, MAINTAINERCLEANFILES): + Remove $(srcdir)/figures.stamp. + (EXTRA_DIST): Add gen-make-variable. + * pbm-figures.mk, pgm-figures.mk, ppm-figures.mk: + New (generated) Make helpers. + * figures/figures.mk: Remove. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Add a rule to forcefully regen doc/examples-outputs.mk. + + * doc/Makefile.am (regen-examples-outputs-mk): New (phony) target. + (regen-am): Invoke regen-examples-outputs-mk. + +2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> + + Ship doc/gen-examples-outputs-mk. + + * doc/Makefile.am (EXTRA_DIST): Add gen-examples-outputs-mk. + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the regeneration of HTML outputs. + + * doc/Makefile.am + ($(TECHNICAL_HTML_OUTPUTS)) + ($(TUTORIAL_HTML_OUTPUTS)) + ($(WHITE_PAPER_HTML_OUTPUTS)) + ($(REF_GUIDE_HTML_OUTPUTS)): + Fix tests on targets. + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + + Distribute and clean documentation timestamps. + + * doc/Makefile.am (EXTRA_DIST, MAINTAINERCLEANFILES): + Add $(srcdir)/user-refman.stamp, $(srcdir)/devel-refman.stamp, + $(srcdir)/figures.stamp, $(srcdir)/split-examples.stamp and + $(srcdir)/split-outputs.stamp. + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + + Improve doc/'s cleaning rules. + + * doc/Makefile.am (CLEANFILES): Remove + $(technical_dir)/technical.haux, + $(tutorial_dir)/tutorial.haux, + $(ref_guide_dir)/ref_guide.haux and + $(ref_guide_dir)/ref_guide.htoc. + (clean-local): Remove (phony) target. + ($(EPSS)): Move... + (MAINTAINERCLEANFILES): ...here. + Add $(TECHNICAL_PDF), $(TECHNICAL_HH), + $(TUTORIAL_PDF), $(TUTORIAL_HH), + $(WHITE_PAPER_PDF) + $(REF_GUIDE_PDF) and $(REF_GUIDE_HH). + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + + Prevent todoxygen.sh from generating incomplete outputs. + + * doc/tools/todoxygen.sh: Take an output file as second argument + instead of an output directory. + * doc/Makefile.am + ($(TECHNICAL_HH), $(TUTORIAL_HH), $(REF_GUIDE_HH)): Adjust. + Use a temporary file to prevent todoxygen.sh from generating + incomplete outputs. + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + + Adjust todoxygen.sh to TeX4ht outputs. + + * doc/tools/todoxygen.sh: Here. + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + + Adapt HTML generation to TeX4ht. + + * doc/Makefile.am + (TECHNICAL_HTML_OUTPUTS, TUTORIAL_HTML_OUTPUTS) + (WHITE_PAPER_HTML_OUTPUTS, REF_GUIDE_HTML_OUTPUTS): + New variables. + ($(TECHNICAL_HTML), $(TUTORIAL_HTML)) + ($(WHITE_PAPER_HTML), $(REF_GUIDE_HTML)): + Remove these targets. + Superseded by... + ($(TECHNICAL_HTML).stamp, $(TECHNICAL_HTML_OUTPUTS)) + ($(TUTORIAL_HTML).stamp, $(TUTORIAL_HTML_OUTPUTS)) + ($(WHITE_PAPER_HTML).stamp, $(WHITE_PAPER_HTML_OUTPUTS)) + ($(REF_GUIDE_HTML).stamp, $(REF_GUIDE_HTML_OUTPUTS)): + ...these (new) targets. + (EXTRA_DIST, MAINTAINERCLEANFILES): Add $(TECHNICAL_HTML).stamp, + ($(TUTORIAL_HTML).stamp, $(WHITE_PAPER_HTML).stamp and + $(REF_GUIDE_HTML).stamp. + (dist_doc_DATA, MAINTAINERCLEANFILES): Remove $(TECHNICAL_HTML), + $(TUTORIAL_HTML), $(WHITE_PAPER_HTML) and $(REF_GUIDE_HTML). + Add $(TECHNICAL_HTML_OUTPUTS), $(TUTORIAL_HTML_OUTPUTS), + $(WHITE_PAPER_HTML_OUTPUTS) and $(REF_GUIDE_HTML_OUTPUTS). + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + + Use texi2dvi to produce HTML from LaTeX. + + * doc/Makefile.am + (TEXI2DVI_FLAGS): Add -I $(DOC_SRCDIR)/white_paper. + ($(TECHNICAL_PDF), $(TUTORIAL_PDF)) + ($(WHITE_PAPER_PDF), $(REF_GUIDE_PDF)): + Reduce these rules to a list of extra dependencies and let the + generic tex-to-html rule do the job. + +2010-03-12 Roland Levillain <roland(a)lrde.epita.fr> + + Split LaTeX-to-HTML rules to clear things up. + + * doc/tools/todoxygen.sh: Take a HTML file as input instead of a + LaTeX one. + * doc/Makefile.am (DOC_PACKAGES): New variable. + (TECHNICAL_HTML, TUTORIAL_HTML, REF_GUIDE_HTML): + New variables. + ($(TECHNICAL_HTML), $(TUTORIAL_HTML), $(REF_GUIDE_HTML)): + New targets. + (dist_doc_DATA): Add $(TECHNICAL_HTML), $(TUTORIAL_HTML) and + $(REF_GUIDE_HTML). + ($(TECHNICAL_HH)): Depend on and process $(TECHNICAL_HTML) instead + of $(technical_dir)/technical.tex. + ($(TUTORIAL_HH)): Depend on and process $(TUTORIAL_HTML) instead + of $(tutorial_dir)/tutorial.tex. + ($(REF_GUIDE_HH)): Depend on and process $(REF_GUIDE_HTML) instead + of $(ref_guide_dir)/ref_guide.tex. + (CLEANFILES): Remove now useless patterns. + (clean-local): Likewise. + Adjust paths. + +2010-03-12 Roland Levillain <roland(a)lrde.epita.fr> + + List non generated documentation outputs separately. + + * doc/Makefile.am (OUTPUTS, EXAMPLES): + Sort in lexicographical order. + Remove $(srcdir)/outputs/ima2d-decl-2.txt + Move $(srcdir)/outputs/graph-output-1.txt, + $(srcdir)/outputs/ima2d-display-1.txt, + $(srcdir)/outputs/ima2d-display-2.txt, + $(srcdir)/outputs/ima2d-display-output-1.txt, + $(srcdir)/outputs/ima2d-display-output-2.txt, + $(srcdir)/outputs/parray-display-1.txt and + $(srcdir)/outputs/win-create-1-display.txt... + (MORE_OUTPUTS): ...here (new variable). + * doc/outputs/ima2d-decl-2.txt: Remove. + +2010-03-12 Roland Levillain <roland(a)lrde.epita.fr> + + Use texi2dvi to produce PDF from LaTeX. + + * doc/Makefile.am: Include $(top_srcdir)/build-aux/tex.mk. + (TEXI2DVI_FLAGS): Append -I $(DOC_SRCDIR), -I $(OUTPUTS_SRCDIR), + -I $(SPLIT_OUTPUTS_SRCDIR), -I $(IMG_SRCDIR) and -I + $(SPLIT_EXAMPLES_SRCDIR). + (technical_TEXINPUTS, tutorial_TEXINPUTS) + (white_paper_TEXINPUTS, ref_guide_TEXINPUTS): + Remove variables. + ($(TECHNICAL_PDF), $(TUTORIAL_PDF)) + ($(WHITE_PAPER_PDF), $(REF_GUIDE_PDF)): + Reduce these rules to a list of extra dependencies and let the + generic tex-to-pdf rule do the job. + ($(WHITE_PAPER_HTML)): Adjust rule. + +2010-03-12 Roland Levillain <roland(a)lrde.epita.fr> + + Merge doc/ Makefile helpers into doc/Makefile.am. + + * milena/doc/doc.mk, + * milena/doc/examples/make.mk, + * milena/doc/ref_guide/ref_guide.mk, + * milena/doc/technical/technical.mk, + * milena/doc/tutorial/tutorial.mk, + * milena/doc/white_paper/white_paper.mk: + Remove and inline these files... + * doc/Makefile.am: ...here. + Do not include $(top_srcdir)/milena/tests/tests.mk. + (AM_CPPFLAGS): Add -I$(top_srcdir)/milena and + -I$(top_builddir)/milena. + ($(DOC_SRCDIR)/examples-outputs.mk): Depend on + $(srcdir)/Makefile.am instead of $(srcdir)/examples/make.mk. + +2010-03-12 Roland Levillain <roland(a)lrde.epita.fr> + + Improve dependencies of some documentation products. + + * doc/ref_guide/ref_guide.mk (ref_guide_dependencies): + New variable. + Use it to define dependencies of... + ($(REF_GUIDE_HH), $(REF_GUIDE_PDF)): + ...these targets. + * doc/technical/technical.mk (technical_dependencies): + New variable. + Use it to define dependencies of... + ($(TECHNICAL_HH), $(TECHNICAL_PDF)): + ...these targets. + * doc/tutorial/tutorial.mk (tutorial_dependencies): + New variable. + Use it to define dependencies of... + ($(TUTORIAL_HH), $(TUTORIAL_PDF)): + ...these targets. + +2010-03-12 Roland Levillain <roland(a)lrde.epita.fr> + + Revamp the Makefile machinery in milena/doc/examples/. + + * doc/gen-examples-outputs-mk: New script. + * doc/examples/make.mk (PROGRAMS_examples): + Sort and remove duplicates. + (examples_dir): Remove variable. + (accu_right_instanciation_SOURCES) + (borderthickness_SOURCES) + (box2d_bbox_SOURCES) + (domain_display_SOURCES) + (dpoint_1_SOURCES) + (estim_sites_SOURCES) + (extend_SOURCES) + (extension_ignore_SOURCES) + (fill_SOURCES) + (fill_call_1_SOURCES) + (fill_imageif_cfun_SOURCES) + (fill_part_image_SOURCES) + (fill_subdomain_SOURCES) + (fill_subdomain_shorter_SOURCES) + (first_routine_SOURCES) + (forall_piter_SOURCES) + (fun_p2v_1_SOURCES) + (graph_data_SOURCES) + (graph_iter_SOURCES) + (ima2d_1_SOURCES) + (ima2d_2_SOURCES) + (ima2d_3_SOURCES) + (ima2d_4_SOURCES) + (ima2d_5_SOURCES) + (ima2d_6_clone_SOURCES) + (ima2d_7_SOURCES) + (ima2d_rot_SOURCES) + (ima_has_SOURCES) + (ima_save_SOURCES) + (ima_size_SOURCES) + (labeling_compute_SOURCES) + (logical_not_SOURCES) + (mln_var_SOURCES) + (parray_append_SOURCES) + (parray_bbox_SOURCES) + (paste_SOURCES) + (paste_call_1_SOURCES) + (point_1_SOURCES) + (predicate_1_SOURCES) + (win_create_1_SOURCES) + (win_create_2_SOURCES) + (tuto2_first_image_SOURCES) + (tuto3_rw_image_SOURCES) + (tuto4_genericity_and_algorithms_SOURCES) + (tuto3_colorize_SOURCES) + (tuto3_println_SOURCES) + (tuto3_trace_SOURCES) + (tuto4_point2d_SOURCES) + (tuto4_site_set_create_SOURCES): + Adjust. + (data-regen, examples, run-examples) + Remove (phony) targets. + (split-examples, split-outputs): + Likewise. + Superseded by... + ($(srcdir)/split-examples.stamp, $(srcdir)/split-outputs.stamp): + ...these (new) targets. + (OUTPUTS, EXAMPLES): New variable. + ($(DOC_SRCDIR)/examples-outputs.mk): New target. + Include $(DOC_SRCDIR)/examples-outputs.mk. + (MAINTAINERCLEANFILES): Ad $(OUTPUTS). + (diff-data, fix-refdata): Remove these (phony) targets, as they + duplicate services provided by the SCM (Git). + (clean-local, clean-figures): Remove these targets and add their + actions... + * doc/Makefile.am (maintainer-clean-local): ...to this rule. + (EXTRA_DEPS): Remove variable. + Superseded by... + (refman_dependencies): ...this (new) variable. + ($(srcdir)/user-refman.stamp) + ($(srcdir)/devel-refman.stamp): + Adjust targets' dependencies. + (fig-convert): Remove (phony) target. + Clean up. + * milena/doc/examples-outputs.mk: New (generated file). + +2010-03-12 Roland Levillain <roland(a)lrde.epita.fr> + + Have documentation's examples not depend on hard-coded paths. + + * doc/tools/data.hh.in: New file. + Use it... + * doc/examples/ima-save.cc: + ...here, to avoid hard-coded paths. + * doc/tools/sample_utils.hh: Likewise. + Adjust header guards. + * doc/examples/split/ima-save-1.cc.raw: Regen. + +2010-03-08 Roland Levillain <roland(a)lrde.epita.fr> + + Update the documentation's copyright header. + + * mln/core/concept/object.hh: Here. + +2010-03-08 Roland Levillain <roland(a)lrde.epita.fr> + + Have Doxygen generate its outputs in the build directory. + + * doc/Doxyfile.in (OUTPUT_DIRECTORY): + s,@srcdir@/user/,@builddir@/user-refman.tmp,. + (EXCLUDE): Adjust. + * doc/Makefile.am (edit_devel): Adjust. + ($(srcdir)/user-refman.stamp) + ($(srcdir)/devel-refman.stamp) + (maintainer-clean-local): + Adjust targets. + +2010-03-08 Roland Levillain <roland(a)lrde.epita.fr> + + Reorganize doc/Makefile.am. + + * doc/Makefile.am (edit, $(DOXYFILE_USER)): + Move these definitions closer to their use site. + (edit_devel, $(DOXYFILE_DEVEL)): Likewise. + +2010-03-08 Roland Levillain <roland(a)lrde.epita.fr> + + Have Doxyfile.in generate the user documentation. + + * doc/Doxyfile.in: Switch settings to generate the user + documentation. + * doc/Makefile.am (edit_user): Remove variable. + (edit_devel): New variable. + ($(DOXYFILE_USER)): Generate it directly from + $(srcdir)/$(DOXYFILE).in. + ($(DOXYFILE_DEVEL)): Adjust to use edit_devel. + +2010-03-08 Roland Levillain <roland(a)lrde.epita.fr> + + Generate the HTML and LaTeX Doxygen documentation in a single pass. + + * doc/Doxyfile.in (GENERATE_LATEX): Enable. + (EXCLUDE): Adjust. + * doc/Makefile.am (ref-doc-html, ref-doc-devel-html): + Remove (phony) targets. + (ref-doc, ref-doc-devel): + New (phony) targets. + (doc-html, doc-devel-html): + Adjust targets. + (DOXYFILE_USER_PDF, DOXYFILE_USER_HTML) + (DOXYFILE_DEVEL_PDF, DOXYFILE_DEVEL_HTML): + Remove variables. + (DOXYFILE_USER_PDF, DOXYFILE_DEVEL): + New variables. + (USER_REFMAN_LATEX, USER_REFMAN_HTML) + (DEVEL_REFMAN_LATEX, DEVEL_REFMAN_HTML): + Remove variables. + (USER_REFMAN): New variable. + (all-local): Adjust. + ($(srcdir)/user-refman-latex.stamp) + ($(srcdir)/$(USER_REFMAN_LATEX)) + ($(srcdir)/user-refman-html.stamp) + ($(srcdir)/$(USER_REFMAN_HTML)) + ($(srcdir)/devel-refman-latex.stamp) + ($(srcdir)/$(DEVEL_REFMAN_LATEX)) + ($(srcdir)/devel-refman-html.stamp) + ($(srcdir)/$(DEVEL_REFMAN_HTML)): + Remove targets. + ($(srcdir)/user-refman.stamp) + ($(srcdir)/$(USER_REFMAN)) + ($(srcdir)/devel-refman.stamp) + ($(srcdir)/$(DEVEL_REFMAN)): + New targets. + ($(srcdir)/$(USER_REFMAN_PDF), $(srcdir)/$(DEVEL_REFMAN_PDF)): + Adjust targets. + (regen-doc, regen-devel-doc): New (phony) targets. + (clean-user-refman-latex, clean-user-refman-html) + (clean-devel-refman-latex, clean-devel-refman-html): + Remove (phony) targets. + (maintainer-clean-local): Adjust. + (edit_pdf): Remove variable. + (EXTRA_DIST): Remove $(USER_REFMAN_HTML). + Add $(USER_REFMAN)/html. + (install-data-local, uninstall-local): Adjust. + (CLEANFILES): Remove Doxyfile_user, Doxyfile_user_pdf, + Doxyfile_devel, Doxyfile_devel_pdf, devel and user. + (MAINTAINERCLEANFILES): Add Doxyfile_user and Doxyfile_devel. + ($(DOXYFILE_USER_PDF), $(DOXYFILE_USER_HTML)) + ($(DOXYFILE_DEVEL_PDF), $(DOXYFILE_DEVEL_HTML)): + Remove targets. + ($(DOXYFILE_USER), $(DOXYFILE_DEVEL)): + New targets. + +2010-03-08 Roland Levillain <roland(a)lrde.epita.fr> + + Shorten the list of files visited by Doxygen. + + * doc/Doxyfile.in (STRIP_FROM_PATH, INPUT, IMAGE_PATH): + Remove all paths from the build directory. + (EXCLUDE): Add paths to generated documentation and generated unit + tests. + +2010-03-08 Roland Levillain <roland(a)lrde.epita.fr> + + * apps/graph-morpho/morpho.hh: Help Doxygen compile LaTeX formulas. + +2010-03-04 Roland Levillain <roland(a)lrde.epita.fr> + + Clean up Doxygen-related Make rules in milena/doc/. + + * doc/Makefile.am (DOXYFILE) + (DOXYFILE_USER_PDF, DOXYFILE_USER_HTML) + (DOXYFILE_DEVEL_PDF, DOXYFILE_DEVEL_HTML): + New variables. + (USER_REFMAN_LATEX) + (DEVEL_REFMAN_PDF, DEVEL_REFMAN_LATEX, DEVEL_REFMAN_HTML): + New variables. + (all-local): Depend on $(srcdir)/$(USER_REFMAN_PDF), + $(srcdir)/user-refman-html.stamp. + ($(srcdir)/$(USER_REFMAN_PDF)): Split these targets and move the + generation of the LaTeX sources... + ($(srcdir)/user-refman-latex.stamp) + ($(srcdir)/$(USER_REFMAN_LATEX)) + ($(srcdir)/devel-refman-latex.stamp) + ($(srcdir)/$(DEVEL_REFMAN_LATEX)): + ...here (new targets). + ($(srcdir)/$(USER_REFMAN_HTML)) + ($(srcdir)/$(DEVEL_REFMAN_HTML)): + Delegate the actions to... + ($(srcdir)/user-refman-html.stamp) + ($(srcdir)/devel-refman-html.stamp): + ...these (new) targets. + (clean-user-refman-latex, clean-user-refman-html) + (clean-devel-refman-latex, clean-devel-refman-html): + New (phony) targets. + (maintainer-clean-local): Depend on clean-user-refman-latex, + clean-user-refman-html, clean-devel-refman-latex and + clean-devel-refman-html. + (EXTRA_DIST): Disable Doxyfile_devel_html, Doxyfile_devel_pdf, + Doxyfile_user_html and Doxyfile_user_pdf. + Add $(DOXYFILE).in. + ($(srcdir)/Doxyfile_user, $(srcdir)/Doxyfile_user_pdf) + ($(srcdir)/Doxyfile_devel, $(srcdir)/Doxyfile_devel_pdf): + Rename targets as... + ($(DOXYFILE_USER_HTML), $(DOXYFILE_USER_PDF)) + ($(DOXYFILE_DEVEL_HTML), $(DOXYFILE_DEVEL_PDF)): + ...these. + +2010-03-03 Roland Levillain <roland(a)lrde.epita.fr> + + Stop make from recurring in doc/examples. + + * doc/Makefile.am: Include + $(top_srcdir)/milena/doc/examples/make.mk. + (SUBDIRS): Remove variable. + (examples, data-regen, fig-convert): Remove (phony) targets. + * doc/examples/Makefile.am: Rename as... + * doc/examples/make.mk: ...this. + Adjust. + * doc/examples/ima-save.cc, + * doc/tools/sample_utils.hh: + Adjust as well. + * milena/doc/examples/split/ima-save-1.cc.raw: Regen. + +2010-03-03 Roland Levillain <roland(a)lrde.epita.fr> + + Stop make from recurring in doc/white_paper. + + * doc/white_paper/Makefile.am: Rename as... + * doc/white_paper/white_paper.mk: ...this. + Adjust. + * doc/Makefile.am: Include $(srcdir)/white_paper/white_paper.mk. + (SUBDIRS): Remove white_paper. + (white-paper-pdf, white-paper-html): Remove (phony) targets. + +2010-03-03 Roland Levillain <roland(a)lrde.epita.fr> + + Stop make from recurring in doc/technical. + + * doc/technical/Makefile.am: Rename as... + * doc/technical/technical.mk: ...this. + Adjust. + * doc/Makefile.am: Include $(srcdir)/technical/technical.mk. + (SUBDIRS): Remove technical. + +2010-03-03 Roland Levillain <roland(a)lrde.epita.fr> + + Stop make from recurring in doc/tutorial. + + * doc/tutorial/Makefile.am: Rename as... + * doc/tutorial/tutorial.mk: ...this. + Adjust. + * doc/Makefile.am: Include $(srcdir)/tutorial/tutorial.mk. + (SUBDIRS): Remove tutorial. + ($(srcdir)/tutorial/tutorial.hh): Remove target. + (tutorial-pdf, tutorial-html): Remove (phony) targets. + +2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> + + Fix apps/mesh-segm-skel/io.hh. + + * apps/mesh-segm-skel/io.hh: Include cstdio. + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + + Aesthetic changes. + + * tests/tests.mk, + * tests/tests-recursive.mk: + Here. + Help Emacs find out the nature of these files. + +2010-03-02 Roland Levillain <roland(a)lrde.epita.fr> + + Stop make from recurring in doc/ref_guide. + + * doc/ref_guide/Makefile.am: Rename as... + * doc/ref_guide/ref_guide.mk: ...this. + Adjust. + * doc/doc.mk (doc_dir): New variable. + * doc/Makefile.am: Include doc/ref_guide/ref_guide.mk. + (SUBDIRS): Remove ref_guide. + ($(srcdir)/ref_guide/ref_guide.hh): Remove target. + (ref-guide-pdf, ref-guide-html): Remove (phony) targets. + +2010-03-02 Roland Levillain <roland(a)lrde.epita.fr> + + Get rid of Make targets `fake-doc' and `void-doc'. + + * doc/Makefile.am, + * doc/ref_guide/Makefile.am, + * doc/technical/Makefile.am, + * doc/tutorial/Makefile.am, + * doc/white_paper/Makefile.am + (fake-doc, void-doc): Remove targets. + +2010-03-02 Roland Levillain <roland(a)lrde.epita.fr> + + Regen Milena's Makefile helpers. + + * headers.mk, tests/unit_test/unit-tests.mk: Here. + 2009-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/white_paper/white_paper.tex: Fix an invalid URL. diff --cc milena/sandbox/ChangeLog index 6aebfb9,62c6e21..34e60e0 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@@ -1,604 -1,357 +1,958 @@@ + 2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Add milena library components. + + * green/mln/accu/stat/histo1d.hh: New header component. + * green/mln/fun/p2b/achromatic.hh: New header component. + * green/mln/fun/p2b/component_equals.hh: New header component. + * green/mln/fun/v2v/achromatism.hh: New header component. + * green/mln/fun/v2v/hue_concentration.hh: New header component. + * green/mln/fun/v2v/rgb_to_achromatism_map.hh: New header component. + * green/mln/fun/v2v/rgb_to_hsv.hh: New header component. + * green/mln/fun/v2v/rgb_to_hue_map.hh: New header component. + * green/mln/fun/v2v/rgb_to_saturation_map.hh: New header component. + * green/mln/fun/v2v/rgb_to_value_map.hh: New header component. + * green/mln/img_path.hh: New header component. + * green/mln/math/ceil.hh: New header component. + * green/mln/math/floor.hh: New header component. + * green/mln/math/hsv.hh: New header component. + + 2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Work on Millet value descriptor. + + * green/exp/annotating/value: New directory. + * green/exp/annotating/value/Makefile.am: New Makefile. + * green/exp/annotating/value/value.cc: New source file. + * green/exp/annotating/value/text-color.txt: New image class. + * green/exp/annotating/value/text-img.txt: New image class. + * green/exp/annotating/value/text-only.txt: New image class. + + 2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Work on Millet hue descriptor. + + * green/exp/annotating/hue: New directory. + * green/exp/annotating/hue/Makefile.am: New Makefile. + * green/exp/annotating/hue/hue.cc: New source file. + * green/exp/annotating/hue/text-color.txt: New image class. + * green/exp/annotating/hue/text-img.txt: New image class. + * green/exp/annotating/hue/text-only.txt: New image class. + + 2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Work on Millet saturation descriptor. + + * green/exp/annotating/saturation: New directory. + * green/exp/annotating/saturation/Makefile.am: New Makefile. + * green/exp/annotating/saturation/saturation.cc: New source file. + * green/exp/annotating/saturation/text-color.txt: New image class. + * green/exp/annotating/saturation/text-img.txt: New image class. + * green/exp/annotating/saturation/text-only.txt: New image class. + + + 2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Work on Millet hsv descriptors. + + * green/exp/annotating/hsv: New directory. + * green/exp/annotating/hsv/hsv.cc: New source file. + + 2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Work on histograms view as density. + + * green/exp/annotating/histo: New directory. + * green/exp/annotating/histo/histo.cc: New Makefile.am. + * green/exp/annotating/histo/histo.cc: New source. + + 2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Test error quantification as a color descriptor in our database. + + * green/exp/annotating/error: New directory. + * green/exp/annotating/error/Makefile.am: New Makefile. + * green/exp/annotating/error/error.cc: New source. + + 2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Benchmark few descriptors. + + * green/exp/annotating/bench: New directory. + * green/exp/annotating/bench/Makefile.am: New Makefile. + * green/exp/annotating/bench/bench.cc: New source. + + 2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Test on image database the achromatism descriptor. + + * green/exp/annotating/achromatism: New directory. + * green/exp/annotating/achromatism/Makefile.am: New Makefile. + * green/exp/annotating/achromatism/achromatism.am: New source. + * green/exp/annotating/achromatism/text-color.txt: New image class. + * green/exp/annotating/achromatism/text-img.txt: New image class. + * green/exp/annotating/achromatism/text-only.txt: New image class. + + 2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Turn around Millet 2008 hsv descriptors. + + * green/demo/annotating/hsv: New directory. + * green/demo/annotating/hsv/Makefile.am: New Makefile. + + + 2010-02-10 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Fix bugs in the histogram visualization tools. + + * green/mln/display/display_histo.cc: Add new vizualisations. + * green/mln/display/project_histo.cc: Add new color projections. + + 2010-02-10 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Fix last details in the image processing chain. + + * green/tools/annotating/histo/histo.cc: Manage new inputs/outputs. + * green/tools/annotating/opening/opening.cc: Manage new inputs/outputs. + * green/tools/annotating/iz/Makefile.am: New Makefile. + * green/tools/annotating/iz/iz.cc: New file. + * green/tools/annotating/regmax/regmax.cc: Manage new inputs/outputs. + + 2010-01-05 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Extend the histogram visualization tools for new projection concept. + + * green/mln/display/project_histo.hh (project2_histo): New functions + that keep the max of the histogram or the class associate to it while + projecting along a direction. + * green/mln/display/project_histo.hh (project3_histo): New functions + that keep the color of the class associate to the histogram maximum + while projecting along a direction. + * green/mln/display/display_histo.hh: New interface functions for + project2_histo and project3_histo. + + 2010-01-05 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Build translation table between number of pixels and percentage of + pixels in image for the scribo database. + + * green/demo/labeling/regional_maxima/threshold.txt: New translation + table. + + 2010-01-05 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Split the regional maxima binary in small atomic binaries. + + * green/tools/annotating/histo: New directory. + * green/tools/annotating/histo/Makefile.am: New Makefile. + * green/tools/annotating/histo/histo.cc: New source file. + * green/tools/annotating/opening: New directory. + * green/tools/annotating/opening/Makefile.am: New Makefile. + * green/tools/annotating/opening/opening.cc: New source file. + * green/tools/annotating/regmax: New directory. + * green/tools/annotating/regmax/Makefile.am: New Makefile. + * green/tools/annotating/regmax/regmax.cc: New source file. + + 2009-12-23 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Write the opening volume thresholds for the scribo image mp00082c.ppm. + + * green/demo/labeling/regional_maxima/thresholds.txt: New documentation. + + 2009-12-23 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Experiment variation on regional maxima labeling. + + * green/demo/labeling/regional_maxima/regional_maxima.cc + (demo_17_12_2009): New function that describes the experimentation. + + 2009-12-18 Yann Jacquelet<jacquelet(a)lrde.epita.fr> + + Fix the right behaviour of the regmax software. + + * green/demo/labeling/regional_maxima/regional_maxima.cc: Add + many modifications to reach the current software state. There is some + nomenclatura, some refactoring and debugging. + + 2009-12-17 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Fix bug in the direction of projection. + + * green/mln/display/display_histo.hh: Fix bug in the direction. + * green/mln/display/project_histo.hh: Add spaces to follow the LRDE + norm. + + 2009-12-16 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Fix bugs in regional_maxima routine, work with rgb8 for stats. + + * green/demo/labeling/regional_maxima/regional_maxima.cc + (compute_stats): New function. + + * green/demo/labeling/regional_maxima/regional_maxima.cc + (demo,main): Update functions to map Theo's view. + + 2009-12-16 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Test the local deviation operator (Millet2008) on the annotating base. + + * green/exp/annotating/stddev_color_16: New directory. + * green/exp/annotating/stddev_color_16/Makefile.am: New Makefile. + * green/exp/annotating/stddev_color_16/stddev_color_16.cc: New demo. + + 2009-12-16 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Introduce the local deviation operator (Millet2008) which + subdivise the image in 16 parts. + + * green/demo/annotating/stddev_color_16: New directory. + * green/demo/annotating/stddev_color_16/Makefile.am: New Makefile. + * green/demo/annotating/stddev_color_16/stddev_color_16.cc: New demo. + + 2009-12-16 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Group Millet2008 documentation files. + + * green/doc/annotating: New directory. + * green/doc/annotating/class.txt: New hierarchy description. + * green/doc/annotating/testMillet2008.txt: New result interpretations. + * green/doc/annotating/syntheseMillet2008.txt: New feature extractions. + * green/demo/annotating/class.txt: Remove this obsolete file. + + 2009-12-16 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Correct typo into directories. + + * green/demo/annoting: Rename as ... + * green/demo/annotating: ... these. + + * green/exp/annoting: Rename as ... + * green/exp/annotating: ... these. + + * green/mln/img_path.hh: Propagate mistake corrections. + + * green/exp/labeling/regional_maxima/regional_maxima.cc (main): + Rename ANNOTING macro references as ANNOTATING ones. + + * green/exp/annotating/stddev_color/stddev_color (main): + Rename ANNOTING macro references as ANNOTATING ones. + + * green/exp/annotating/nb_color/nb_color.cc (main): + Rename ANNOTING macro references as ANNOTATING ones. + + 2009-12-15 green <jacquelet(a)lrde.epita.fr> + + Introduce new image converter from color to greyscale. + + * green/mln/fun/v2v/rgb8_to_int_u8.hh: New image converter. + + 2009-12-15 green <jacquelet(a)lrde.epita.fr> + + Add new image paths to use the annoting database. + + * green/mln/img_path.hh: Update to LRDE norm and add annoting database. + + 2009-12-15 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Work around the regional labeling chain and experiment it on the + annoting database. + + * green/exp/labeling/regional_maxima/Makefile.am: Add boost library. + * green/exp/labeling/regional_maxima/regional_maxima.cc: Count colors. + + 2009-12-15 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Test clipart operators described by Millet on annoting database. + + * green/exp/annoting/nb_color: New experimentation directory. + * green/exp/annoting/nb_color/Makefile.am: New Makefile. + * green/exp/annoting/nb_color/nb_color.cc: New experementation. + + * green/exp/annoting/stddev_color: New experimentation directory. + * green/exp/annoting/stddev_color/Makefile.am: New Makefile. + * green/exp/annoting/stddev_color/stddev_color.cc: New experimentation. + + 2009-12-15 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Introduce clipart operators described by Millet. + + * green/demo/annoting/nb_color: New demonstration directory. + * green/demo/annoting/nb_color/Makefile.am: New Makefile. + * green/demo/annoting/nb_color/nb_color.cc: New source file. + + * green/demo/annoting/stddev_color: New demonstration directory. + * green/demo/annoting/stddev_color/Makefile.am: New Makefile. + * green/demo/annoting/stddev_color/stddev_color.cc: New source file. + + 2009-12-02 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Optimize regional maxima processing for statistical counts and outputs. + + * green/demo/labeling/regional_maxima/Makefile.am: Add some compilation + directives. + * green/demo/labeling/regional_maxima/regional_maxima.cc + (t_channel,t_labeling_rgbn,label_image,unquant,print_count2): New. + * green/demo/labeling/regional_maxima/regional_maxima.cc + (print_count, merge, do_demo) : Update. + + + 2009-12-02 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Test experimentation with regmax code on annoting database. + + * green/exp/labeling/regional_maxima/Makefile.am: New Makefile. + * green/exp/labeling/regional_maxima/regional_maxima.cc: New directory + oriented demonstration code. + + 2009-12-02 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Transform kmean object in a big function and then a canvas. + + * green/mln/clustering/kmean_rgb.hh: New library source code. + * green/demo/clustering/kmean_rgb/Makefile.am: New Makefile. + * green/demo/clustering/kmean_rgb/kmean_rgb.cc: New demo. code. + + 2009-12-02 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Benchmark on distance, preliminary work before optimizing kmean. + + * green/bench/transform/distance/Makefile.am: New Makefile. + * green/bench/transform/distance/distance.cc: New processing chain. + + 2009-12-02 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Works on Millet2008 descriptors. + + * green/mln/demo/annoting/bic/Makefile.am: New Makefile. + * green/mln/demo/annoting/bic/bic.cc: New impl. of the bic descriptor. + + * green/mln/demo/annoting/lep/Makefile.am: New Makefile. + * green/mln/demo/annoting/lep/lep.cc: New impl. of the lep descriptor. + + * green/mln/demo/annoting/project/Makefile.am: New Makefile. + * green/mln/demo/annoting/project/project.cc: New impl. of the project + descriptor. + + * green/mln/demo/annoting/rgb_64/Makefile.am: New Makefile. + * green/mln/demo/annoting/rgb_64/rgb_64.cc: New impl. of the rgb_64 + descriptor. + + * green/mln/demo/annoting/rgb_64_9/Makefile.am: New Makefile. + * green/mln/demo/annoting/rgb_64_9/rgb_64_9.cc: New impl. of the + rgb_64_9 descriptor. + + * green/mln/demo/annoting/class.txt: New notes on fax class. + + + 2009-12-02 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Extend the test image database. + + * green/mln/img_path.hh: Add annoting directories to experiment + algorithms on fax, handwritten, typed, logo, bill, map, screenshot, + slide image. + +2010-06-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * bench/fastest.cc: New. Add a bench for the best fastest + iteration. + +2010-03-30 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve the usability of AFP's GUI. + + * lazzara/afp/photos/gui/src/main_window.cc, + * lazzara/afp/photos/gui/src/main_window.hh: Add shortcuts to + navigate quickly. + +2010-03-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add support for more image types. + + * lazzara/afp/photos/gui/src/main_window.cc, + * lazzara/afp/photos/gui/src/main_window.hh: Add support for more + image format and handle directories with no image. + +2010-03-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve options menu and progress dialog. + + * lazzara/afp/photos/gui/src/launch_dialog.cc, + * lazzara/afp/photos/gui/src/launch_dialog.hh, + * lazzara/afp/photos/gui/src/main_window.cc, + * lazzara/afp/photos/gui/src/main_window.hh, + * lazzara/afp/photos/gui/ui/launch_dialog.ui: Improve options menu + and progress dialog. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a GUI for AFP's use case. + + * lazzara/afp/photos/gui/gui.pro, + * lazzara/afp/photos/gui/gui.qrc, + * lazzara/afp/photos/gui/icons/next.png, + * lazzara/afp/photos/gui/icons/ok.png, + * lazzara/afp/photos/gui/icons/photos.png, + * lazzara/afp/photos/gui/icons/prev.png, + * lazzara/afp/photos/gui/icons/remove.png, + * lazzara/afp/photos/gui/src/custom_delegate.cc, + * lazzara/afp/photos/gui/src/custom_delegate.hh, + * lazzara/afp/photos/gui/src/launch_dialog.cc, + * lazzara/afp/photos/gui/src/launch_dialog.hh, + * lazzara/afp/photos/gui/src/main.cc, + * lazzara/afp/photos/gui/src/main_window.cc, + * lazzara/afp/photos/gui/src/main_window.hh, + * lazzara/afp/photos/gui/ui/launch_dialog.ui, + * lazzara/afp/photos/gui/ui/main_window.ui: New files. GUI meant + to display the results of text finding in pictures. + +2010-03-22 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add new benchs. + + * bench/README_CFLAGS: New. Compilation flags guide. + + * bench/extract_vertical_lines.cc, + * bench/fast_components_and_attributes.cc, + * bench/fast_rows.cc, + * bench/fast_tiles.cc: New. + +2010-02-17 Guillaume Lazzara <z(a)lrde.epita.fr> + + * lazzara/skeleton_crest/main.cc: New tool. + +2010-02-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add new tools in bin sandbox. + + * bin/labeling/colorize.cc, + * bin/pgm_to_pbm.cc, + * bin/ppm_negate.cc: New. + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Add milena library components. + + * green/mln/accu/stat/histo1d.hh: New header component. + * green/mln/fun/p2b/achromatic.hh: New header component. + * green/mln/fun/p2b/component_equals.hh: New header component. + * green/mln/fun/v2v/achromatism.hh: New header component. + * green/mln/fun/v2v/hue_concentration.hh: New header component. + * green/mln/fun/v2v/rgb_to_achromatism_map.hh: New header component. + * green/mln/fun/v2v/rgb_to_hsv.hh: New header component. + * green/mln/fun/v2v/rgb_to_hue_map.hh: New header component. + * green/mln/fun/v2v/rgb_to_saturation_map.hh: New header component. + * green/mln/fun/v2v/rgb_to_value_map.hh: New header component. + * green/mln/img_path.hh: New header component. + * green/mln/math/ceil.hh: New header component. + * green/mln/math/floor.hh: New header component. + * green/mln/math/hsv.hh: New header component. + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Work on Millet value descriptor. + + * green/exp/annotating/value: New directory. + * green/exp/annotating/value/Makefile.am: New Makefile. + * green/exp/annotating/value/value.cc: New source file. + * green/exp/annotating/value/text-color.txt: New image class. + * green/exp/annotating/value/text-img.txt: New image class. + * green/exp/annotating/value/text-only.txt: New image class. + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Work on Millet hue descriptor. + + * green/exp/annotating/hue: New directory. + * green/exp/annotating/hue/Makefile.am: New Makefile. + * green/exp/annotating/hue/hue.cc: New source file. + * green/exp/annotating/hue/text-color.txt: New image class. + * green/exp/annotating/hue/text-img.txt: New image class. + * green/exp/annotating/hue/text-only.txt: New image class. + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Work on Millet saturation descriptor. + + * green/exp/annotating/saturation: New directory. + * green/exp/annotating/saturation/Makefile.am: New Makefile. + * green/exp/annotating/saturation/saturation.cc: New source file. + * green/exp/annotating/saturation/text-color.txt: New image class. + * green/exp/annotating/saturation/text-img.txt: New image class. + * green/exp/annotating/saturation/text-only.txt: New image class. + + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Work on Millet hsv descriptors. + + * green/exp/annotating/hsv: New directory. + * green/exp/annotating/hsv/hsv.cc: New source file. + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Work on histograms view as density. + + * green/exp/annotating/histo: New directory. + * green/exp/annotating/histo/histo.cc: New Makefile.am. + * green/exp/annotating/histo/histo.cc: New source. + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Test error quantification as a color descriptor in our database. + + * green/exp/annotating/error: New directory. + * green/exp/annotating/error/Makefile.am: New Makefile. + * green/exp/annotating/error/error.cc: New source. + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Benchmark few descriptors. + + * green/exp/annotating/bench: New directory. + * green/exp/annotating/bench/Makefile.am: New Makefile. + * green/exp/annotating/bench/bench.cc: New source. + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Test on image database the achromatism descriptor. + + * green/exp/annotating/achromatism: New directory. + * green/exp/annotating/achromatism/Makefile.am: New Makefile. + * green/exp/annotating/achromatism/achromatism.am: New source. + * green/exp/annotating/achromatism/text-color.txt: New image class. + * green/exp/annotating/achromatism/text-img.txt: New image class. + * green/exp/annotating/achromatism/text-only.txt: New image class. + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Turn around Millet 2008 hsv descriptors. + + * green/demo/annotating/hsv: New directory. + * green/demo/annotating/hsv/Makefile.am: New Makefile. + +2010-02-10 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Save Theo's exhaustive demonstration results. + + * green/doc/regional_maxima/mp00411c/colormap_all_q4.txt.gz: New cmap. + * green/doc/regional_maxima/mp00411c/colormap_all_q5.txt.gz: New cmap. + * green/doc/regional_maxima/mp00411c/colormap_thick_q4.txt.gz: New cmap. + * green/doc/regional_maxima/mp00411c/colormap_thick_q5.pgm.gz: New cmap. + * green/doc/regional_maxima/mp00411c/colormap_thin_q4.pgm.gz: New cmap. + * green/doc/regional_maxima/mp00411c/colormap_thin_q5.pgm.gz: New cmap. + * green/doc/regional_maxima/mp00411c/histo_all_q4.dump.gz: New histo. + * green/doc/regional_maxima/mp00411c/histo_all_q5.dump.gz: New histo. + * green/doc/regional_maxima/mp00411c/histo_thick_q4.dump.gz: New histo. + * green/doc/regional_maxima/mp00411c/histo_thick_q5.dump.gz: New histo. + * green/doc/regional_maxima/mp00411c/histo_thin_q4.dump.gz: New histo. + * green/doc/regional_maxima/mp00411c/histo_thin_q5.dump.gz: New histo. + * green/doc/regional_maxima/mp00411c/iz_all_q4.dump.gz: New labeled img. + * green/doc/regional_maxima/mp00411c/iz_all_q5.pgm.gz: New labeled img. + * green/doc/regional_maxima/mp00411c/iz_thick_q4.dump.gz: New lbl img. + * green/doc/regional_maxima/mp00411c/iz_thick_q5.dump.gz: New lbl img. + * green/doc/regional_maxima/mp00411c/iz_thin_q4.dump.gz: New lbl img. + * green/doc/regional_maxima/mp00411c/iz_thin_q5.dump.gz: New lbl img. + * green/doc/regional_maxima/mp00411c/labeled_all_q4.dump.gz: New img. + * green/doc/regional_maxima/mp00411c/labeled_all_q5.dump.gz: New img. + * green/doc/regional_maxima/mp00411c/labeled_thick_q4.dump.gz: New img. + * green/doc/regional_maxima/mp00411c/labeled_thick_q5.dump.gz: New img. + * green/doc/regional_maxima/mp00411c/labeled_thin_q4.dump.gz: New img. + * green/doc/regional_maxima/mp00411c/labeled_thin_q5.dump.gz: New img. + * green/doc/regional_maxima/mp00411c/mean3_all_q4.ppm.gz: New mean img. + * green/doc/regional_maxima/mp00411c/mean3_all_q5.ppm.gz: New mean img. + * green/doc/regional_maxima/mp00411c/mean3_thick_q4.ppm.gz:New mean img. + * green/doc/regional_maxima/mp00411c/mean3_thick_q5.ppm.gz:New mean img. + * green/doc/regional_maxima/mp00411c/mean3_thin_q4.ppm.gz:New mean img. + * green/doc/regional_maxima/mp00411c/mean3_thin_q5.ppm.gz:New mean img. + * green/doc/regional_maxima/mp00411c/mean4_all_q4.ppm.gz:New mean img. + * green/doc/regional_maxima/mp00411c/mean4_all_q5.ppm.gz:New mean img. + * green/doc/regional_maxima/mp00411c/mean4_thick_q4.ppm.gz:New mean img. + * green/doc/regional_maxima/mp00411c/mean4_thick_q5.ppm.gz:New mean img. + * green/doc/regional_maxima/mp00411c/mean4_thin_q4.ppm.gz:New mean img. + * green/doc/regional_maxima/mp00411c/mean4_thin_q5.ppm.gz:New mean img. + * green/doc/regional_maxima/mp00411c/mp00411c.ppm.gz: New input img. + * green/doc/regional_maxima/mp00411c/mp00411c.sh.gz: New script file. + * green/doc/regional_maxima/mp00411c/mp00411c_thick.pbm.gz: New mask. + * green/doc/regional_maxima/mp00411c/mp00411c_thin.pbm.gz: New mask. + * green/doc/regional_maxima/mp00411c/opened_all_q4.dump.gz: New histo. + * green/doc/regional_maxima/mp00411c/opened_all_q5.dump.gz: New histo. + * green/doc/regional_maxima/mp00411c/opened_thick_q4.dump.gz: New histo. + * green/doc/regional_maxima/mp00411c/opened_thick_q5.dump.gz: New histo. + * green/doc/regional_maxima/mp00411c/opened_thin_q4.dump.gz: New histo. + * green/doc/regional_maxima/mp00411c/opened_thin_q5.dump.gz: New histo. + * green/doc/regional_maxima/mp00411c/proj1_all_q4.pgm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj1_all_q5.pgm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj1_thick_q4.pgm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj1_thick_q5.pgm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj1_thin_q4.pgm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj1_thin_q5.pgm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj2_all_q4.pgm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj2_all_q5.pgm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj2_thick_q4.pgm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj2_thick_q5.pgm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj2_thin_q4.pgm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj2_thin_q5.pgm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj3_all_q4.ppm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj3_all_q5.ppm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj3_thick_q4.ppm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj3_thick_q5.ppm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj3_thin_q4.ppm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj3_thin_q5.ppm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj4_all_q4.ppm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj4_all_q5.ppm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj4_thick_q4.ppm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj4_thick_q5.ppm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj4_thin_q4.ppm.gz: New proj. + * green/doc/regional_maxima/mp00411c/proj4_thin_q5.ppm.gz: New proj. + * green/doc/regional_maxima/mp00411c/quant_q4.ppm.gz: New quant img. + * green/doc/regional_maxima/mp00411c/quant_q5.ppm.gz: New quant img. + * green/doc/regional_maxima/mp00411c/stats3_all_q4.txt.gz: New stats. + * green/doc/regional_maxima/mp00411c/stats3_all_q5.txt.gz: New stats. + * green/doc/regional_maxima/mp00411c/stats3_thick_q4.txt.gz: New stats. + * green/doc/regional_maxima/mp00411c/stats3_thick_q5.txt.gz: New stats. + * green/doc/regional_maxima/mp00411c/stats3_thin_q4.txt.gz: New stats. + * green/doc/regional_maxima/mp00411c/stats3_thin_q5.txt.gz: New stats. + * green/doc/regional_maxima/mp00411c/stats4_all_q4.txt.gz: New stats. + * green/doc/regional_maxima/mp00411c/stats4_all_q5.txt.gz: New stats. + * green/doc/regional_maxima/mp00411c/stats4_thick_q4.txt.gz: New stats. + * green/doc/regional_maxima/mp00411c/stats4_thick_q5.txt.gz: New stats. + * green/doc/regional_maxima/mp00411c/stats4_thin_q4.txt.gz: New stats. + * green/doc/regional_maxima/mp00411c/synthese.txt.gz: New synthese. + +2010-02-10 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Fix bugs in the histogram visualization tools. + + * green/mln/display/display_histo.cc: Add new vizualisations. + * green/mln/display/project_histo.cc: Add new color projections. + +2010-02-10 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Fix last details in the image processing chain. + + * green/tools/annotating/histo/histo.cc: Manage new inputs/outputs. + * green/tools/annotating/opening/opening.cc: Manage new inputs/outputs. + * green/tools/annotating/iz/Makefile.am: New Makefile. + * green/tools/annotating/iz/iz.cc: New file. + * green/tools/annotating/regmax/regmax.cc: Manage new inputs/outputs. + +2010-01-05 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Extend the histogram visualization tools for new projection concept. + + * green/mln/display/project_histo.hh (project2_histo): New functions + that keep the max of the histogram or the class associate to it while + projecting along a direction. + * green/mln/display/project_histo.hh (project3_histo): New functions + that keep the color of the class associate to the histogram maximum + while projecting along a direction. + * green/mln/display/display_histo.hh: New interface functions for + project2_histo and project3_histo. + +2010-01-05 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Build translation table between number of pixels and percentage of + pixels in image for the scribo database. + + * green/demo/labeling/regional_maxima/threshold.txt: New translation + table. + +2010-01-05 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Split the regional maxima binary in small atomic binaries. + + * green/tools/annotating/histo: New directory. + * green/tools/annotating/histo/Makefile.am: New Makefile. + * green/tools/annotating/histo/histo.cc: New source file. + * green/tools/annotating/opening: New directory. + * green/tools/annotating/opening/Makefile.am: New Makefile. + * green/tools/annotating/opening/opening.cc: New source file. + * green/tools/annotating/regmax: New directory. + * green/tools/annotating/regmax/Makefile.am: New Makefile. + * green/tools/annotating/regmax/regmax.cc: New source file. + + +2009-12-23 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Write the opening volume thresholds for the scribo image mp00082c.ppm. + + * green/demo/labeling/regional_maxima/thresholds.txt: New documentation. + +2009-12-23 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Experiment various quantifications on regional maxima labeling. + + * green/doc/regional_maxima/cmp_quant/h0_input.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_quant/h5_mean_q2.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_quant/h5_mean_q3.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_quant/h5_mean_q4.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_quant/h5_mean_q5.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_quant/h5_mean_q6.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_quant/h5_mean_q7.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_quant/h5_mean_q8.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_quant/h5_merge_q2.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_quant/h5_merge_q3.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_quant/h5_merge_q4.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_quant/h5_merge_q5.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_quant/h5_merge_q6.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_quant/h5_merge_q7.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_quant/h5_merge_q8.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_quant/i5_mean_q2.pgm.gz: New image. + * green/doc/regional_maxima/cmp_quant/i5_mean_q3.pgm.gz: New image. + * green/doc/regional_maxima/cmp_quant/i5_mean_q4.pgm.gz: New image. + * green/doc/regional_maxima/cmp_quant/i5_mean_q5.pgm.gz: New image. + * green/doc/regional_maxima/cmp_quant/i5_mean_q6.pgm.gz: New image. + * green/doc/regional_maxima/cmp_quant/i5_mean_q7.pgm.gz: New image. + * green/doc/regional_maxima/cmp_quant/i5_mean_q8.pgm.gz: New image. + * green/doc/regional_maxima/cmp_quant/i5_merge_q2.pgm.gz: New image. + * green/doc/regional_maxima/cmp_quant/i5_merge_q3.pgm.gz: New image. + * green/doc/regional_maxima/cmp_quant/i5_merge_q4.pgm.gz: New image. + * green/doc/regional_maxima/cmp_quant/i5_merge_q5.pgm.gz: New image. + * green/doc/regional_maxima/cmp_quant/i5_merge_q6.pgm.gz: New image. + * green/doc/regional_maxima/cmp_quant/i5_merge_q7.pgm.gz: New image. + * green/doc/regional_maxima/cmp_quant/i5_merge_q8.pgm.gz: New image. + * green/doc/regional_maxima/cmp_quant/l5_input_q2.pgm.gz: New label img. + * green/doc/regional_maxima/cmp_quant/l5_input_q3.pgm.gz: New label img. + * green/doc/regional_maxima/cmp_quant/l5_input_q4.pgm.gz: New label img. + * green/doc/regional_maxima/cmp_quant/l5_input_q5.pgm.gz: New label img. + * green/doc/regional_maxima/cmp_quant/l5_input_q6.pgm.gz: New label img. + * green/doc/regional_maxima/cmp_quant/l5_input_q7.pgm.gz: New label img. + * green/doc/regional_maxima/cmp_quant/l5_input_q8.pgm.gz: New label img. + * green/doc/regional_maxima/cmp_quant/s5_histo_q2.txt: New statistics. + * green/doc/regional_maxima/cmp_quant/s5_histo_q3.txt: New statistics. + * green/doc/regional_maxima/cmp_quant/s5_histo_q4.txt: New statistics. + * green/doc/regional_maxima/cmp_quant/s5_histo_q5.txt: New statistics. + * green/doc/regional_maxima/cmp_quant/s5_histo_q6.txt: New statistics. + * green/doc/regional_maxima/cmp_quant/s5_histo_q7.txt: New statistics. + * green/doc/regional_maxima/cmp_quant/s5_histo_q8.txt: New statistics. + * green/doc/regional_maxima/cmp_quant/synthese.txt: New documentation. + * green/demo/labeling/regional_maxima/regional_maxima + (demo_22_12_2009): New function that describes the experimentation. + +2009-12-23 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Experiment various methods on regional maxima labeling. + + * green/doc/regional_maxima/cmp_method/h0_input.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_method/h2_mean.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_method/h2_merge.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_method/h3_mean.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_method/h3_merge.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_method/h4_mean.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_method/h4_merge.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_method/h5_mean.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_method/h5_merge.pgm.gz: New histogram. + * green/doc/regional_maxima/cmp_method/i2_mean.pgm.gz: New mean image. + * green/doc/regional_maxima/cmp_method/i2_merge.pgm.gz: New merge img. + * green/doc/regional_maxima/cmp_method/i3_mean.pgm.gz: New mean image. + * green/doc/regional_maxima/cmp_method/i3_merge.pgm.gz: New merge img. + * green/doc/regional_maxima/cmp_method/i4_mean.pgm.gz: New mean image. + * green/doc/regional_maxima/cmp_method/i4_merge.pgm.gz: New merge img. + * green/doc/regional_maxima/cmp_method/i5_mean.pgm.gz: New mean image. + * green/doc/regional_maxima/cmp_method/i5_merge.pgm.gz: New merge img. + * green/doc/regional_maxima/cmp_method/l2_input.pgm.gz: New label image. + * green/doc/regional_maxima/cmp_method/l3_input.pgm.gz: New label image. + * green/doc/regional_maxima/cmp_method/l4_input.pgm.gz: New label image + * green/doc/regional_maxima/cmp_method/l5_input.pgm.gz: New label image. + * green/doc/regional_maxima/cmp_method/s2_histo.txt: New statistics. + * green/doc/regional_maxima/cmp_method/s3_histo.txt: New statistics. + * green/doc/regional_maxima/cmp_method/s4_histo.txt: New statistics. + * green/doc/regional_maxima/cmp_method/s5_histo.txt: New statistics. + * green/doc/regional_maxima/cmp_method/synthese.txt: New documentation. + * green/doc/regional_maxima/cmp_method/reponse_theo.eml: New email. + * green/demo/labeling/regional_maxima/regional_maxima + (demo_17_12_2009): New function that describes the experimentation. + + +2009-12-18 Yann Jacquelet<jacquelet(a)lrde.epita.fr> + + Fix the right behaviour of the regmax software. + + * green/demo/labeling/regional_maxima/regional_maxima.cc: Add + many modifications to reach the current software state. There is some + nomenclatura, some refactoring and debugging. + +2009-12-17 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Fix bug in the direction of projection. + + * green/mln/display/display_histo.hh: Fix bug in the direction. + * green/mln/display/project_histo.hh: Add spaces to follow the LRDE + norm. + +2009-12-16 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Fix bugs in regional_maxima routine, work with rgb8 for stats. + + * green/demo/labeling/regional_maxima/regional_maxima.cc + (compute_stats): New function. + + * green/demo/labeling/regional_maxima/regional_maxima.cc + (demo,main): Update functions to map Theo's view. + + +2009-12-16 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Test the local deviation operator (Millet2008) on the annotating base. + + * green/exp/annotating/stddev_color_16: New directory. + * green/exp/annotating/stddev_color_16/Makefile.am: New Makefile. + * green/exp/annotating/stddev_color_16/stddev_color_16.cc: New demo. + +2009-12-16 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Introduce the local deviation operator (Millet2008) which + subdivise the image in 16 parts. + + * green/demo/annotating/stddev_color_16: New directory. + * green/demo/annotating/stddev_color_16/Makefile.am: New Makefile. + * green/demo/annotating/stddev_color_16/stddev_color_16.cc: New demo. + +2009-12-16 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Group Millet2008 documentation files. + + * green/doc/annotating: New directory. + * green/doc/annotating/class.txt: New hierarchy description. + * green/doc/annotating/testMillet2008.txt: New result interpretations. + * green/doc/annotating/syntheseMillet2008.txt: New feature extractions. + * green/demo/annotating/class.txt: Remove this obsolete file. + +2009-12-16 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Correct typo into directories. + + * green/demo/annoting: Rename as ... + * green/demo/annotating: ... these. + + * green/exp/annoting: Rename as ... + * green/exp/annotating: ... these. + + * green/mln/img_path.hh: Propagate mistake corrections. + + * green/exp/labeling/regional_maxima/regional_maxima.cc (main): + Rename ANNOTING macro references as ANNOTATING ones. + + * green/exp/annotating/stddev_color/stddev_color (main): + Rename ANNOTING macro references as ANNOTATING ones. + + * green/exp/annotating/nb_color/nb_color.cc (main): + Rename ANNOTING macro references as ANNOTATING ones. + +2009-12-15 green <jacquelet(a)lrde.epita.fr> + + Introduce new image converter from color to greyscale. + + * green/mln/fun/v2v/rgb8_to_int_u8.hh: New image converter. + +2009-12-15 green <jacquelet(a)lrde.epita.fr> + + Add new image paths to use the annoting database. + + * green/mln/img_path.hh: Update to LRDE norm and add annoting database. + +2009-12-15 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Work around the regional labeling chain and experiment it on the + annoting database. + + * green/exp/labeling/regional_maxima/Makefile.am: Add boost library. + * green/exp/labeling/regional_maxima/regional_maxima.cc: Count colors. + +2009-12-15 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Test clipart operators described by Millet on annoting database. + + * green/exp/annoting/nb_color: New experimentation directory. + * green/exp/annoting/nb_color/Makefile.am: New Makefile. + * green/exp/annoting/nb_color/nb_color.cc: New experementation. + + * green/exp/annoting/stddev_color: New experimentation directory. + * green/exp/annoting/stddev_color/Makefile.am: New Makefile. + * green/exp/annoting/stddev_color/stddev_color.cc: New experimentation. + +2009-12-15 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Introduce clipart operators described by Millet. + + * green/demo/annoting/nb_color: New demonstration directory. + * green/demo/annoting/nb_color/Makefile.am: New Makefile. + * green/demo/annoting/nb_color/nb_color.cc: New source file. + + * green/demo/annoting/stddev_color: New demonstration directory. + * green/demo/annoting/stddev_color/Makefile.am: New Makefile. + * green/demo/annoting/stddev_color/stddev_color.cc: New source file. + + +2009-12-02 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Optimize regional maxima processing for statistical counts and outputs. + + * green/demo/labeling/regional_maxima/Makefile.am: Add some compilation + directives. + * green/demo/labeling/regional_maxima/regional_maxima.cc + (t_channel,t_labeling_rgbn,label_image,unquant,print_count2): New. + * green/demo/labeling/regional_maxima/regional_maxima.cc + (print_count, merge, do_demo) : Update. + + +2009-12-02 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Test experimentation with regmax code on annoting database. + + * green/exp/labeling/regional_maxima/Makefile.am: New Makefile. + * green/exp/labeling/regional_maxima/regional_maxima.cc: New directory + oriented demonstration code. + +2009-12-02 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Transform kmean object in a big function and then a canvas. + + * green/mln/clustering/kmean_rgb.hh: New library source code. + * green/demo/clustering/kmean_rgb/Makefile.am: New Makefile. + * green/demo/clustering/kmean_rgb/kmean_rgb.cc: New demo. code. + +2009-12-02 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Benchmark on distance, preliminary work before optimizing kmean. + + * green/bench/transform/distance/Makefile.am: New Makefile. + * green/bench/transform/distance/distance.cc: New processing chain. + +2009-12-02 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Works on Millet2008 descriptors. + + * green/mln/demo/annoting/bic/Makefile.am: New Makefile. + * green/mln/demo/annoting/bic/bic.cc: New impl. of the bic descriptor. + + * green/mln/demo/annoting/lep/Makefile.am: New Makefile. + * green/mln/demo/annoting/lep/lep.cc: New impl. of the lep descriptor. + + * green/mln/demo/annoting/project/Makefile.am: New Makefile. + * green/mln/demo/annoting/project/project.cc: New impl. of the project + descriptor. + + * green/mln/demo/annoting/rgb_64/Makefile.am: New Makefile. + * green/mln/demo/annoting/rgb_64/rgb_64.cc: New impl. of the rgb_64 + descriptor. + + * green/mln/demo/annoting/rgb_64_9/Makefile.am: New Makefile. + * green/mln/demo/annoting/rgb_64_9/rgb_64_9.cc: New impl. of the + rgb_64_9 descriptor. + + * green/mln/demo/annoting/class.txt: New notes on fax class. + + +2009-12-02 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Extend the test image database. + + * green/mln/img_path.hh: Add annoting directories to experiment + algorithms on fax, handwritten, typed, logo, bill, map, screenshot, + slide image. + 2009-11-17 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add some bench + canvas + subsampling + browsing code. diff --cc scribo/sandbox/green/ChangeLog index 81749fe,6210a79..a1603a7 --- a/scribo/sandbox/green/ChangeLog +++ b/scribo/sandbox/green/ChangeLog @@@ -1,264 -1,1402 +1,1666 @@@ + 2010-09-08 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Import annotating sources from milena green's sandbox. + + * README.green: New. + * demo/annotating/bic/Makefile.am: New. + * demo/annotating/bic/bic.cc: New. + * demo/annotating/hsv/Makefile.am: New. + * demo/annotating/hsv/hsv.cc: New. + * demo/annotating/lep/Makefile.am: New. + * demo/annotating/lep/lep.cc: New. + * demo/annotating/nb_color/Makefile.am: New. + * demo/annotating/nb_color/nb_color.cc: New. + * demo/annotating/project/Makefile.am: New. + * demo/annotating/project/project.cc: New. + * demo/annotating/rgb_64/Makefile.am: New. + * demo/annotating/rgb_64/rgb_64.cc: New. + * demo/annotating/rgb_64_9/Makefile.am: New. + * demo/annotating/rgb_64_9/rgb_64_9.cc: New. + * demo/annotating/stddev_color/Makefile.am: New. + * demo/annotating/stddev_color/stddev_color.cc: New. + * demo/annotating/stddev_color_16/Makefile.am: New. + * demo/annotating/stddev_color_16/stddev_color_16.cc: New. + * exp/annotating/achromastism/Makefile.am: New. + * exp/annotating/achromastism/achromastism.cc: New. + * exp/annotating/achromastism/text-color.txt: New. + * exp/annotating/achromastism/text-img.txt: New. + * exp/annotating/achromastism/text-only.txt: New. + * exp/annotating/bench/Makefile.am: New. + * exp/annotating/bench/bench.cc: New. + * exp/annotating/error/Makefile.am: New. + * exp/annotating/error/error.cc: New. + * exp/annotating/histo/Makefile.am: New. + * exp/annotating/histo/histo.cc: New. + * exp/annotating/hsv/Makefile.am: New. + * exp/annotating/hsv/hsv.cc: New. + * exp/annotating/hue/Makefile.am: New. + * exp/annotating/hue/hue.cc: New. + * exp/annotating/hue/text-color.txt: New. + * exp/annotating/hue/text-img.txt: New. + * exp/annotating/hue/text-only.txt: New. + * exp/annotating/nb_color/Makefile.am: New. + * exp/annotating/nb_color/nb_color.cc: New. + * exp/annotating/saturation/Makefile.am: New. + * exp/annotating/saturation/saturation.cc: New. + * exp/annotating/saturation/text-color.txt: New. + * exp/annotating/saturation/text-img.txt: New. + * exp/annotating/saturation/text-only.txt: New. + * exp/annotating/stddev_color/Makefile.am: New. + * exp/annotating/stddev_color/stddev_color.cc: New. + * exp/annotating/stddev_color_16/Makefile.am: New. + * exp/annotating/stddev_color_16/stddev_color_16.cc: New. + * exp/annotating/value/Makefile.am: New. + * exp/annotating/value/text-color.txt: New. + * exp/annotating/value/text-img.txt: New. + * exp/annotating/value/text-only.txt: New. + * exp/annotating/value/value.cc: New. + * mln/clustering/kmean2d.hh: New. + * mln/fun/p2b/achromatic.hh: New. + * mln/fun/v2v/hue_concentration.hh: New. + * mln/fun/v2v/rgb_to_achromatism_map.hh: New. + * mln/fun/v2v/rgb_to_hsv.hh: New. + + + 2010-07-07 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Import regional maxima sources from milena green's sandbox. + + * README.green: Update documentation. + + Implement a primary demonstrator with watershed labeling. + + * demo/labeling/watershed: New directory. + * demo/labeling/watershed/Makefile.am: New makefile. + * demo/labeling/watershed/watershed.cc: New demo source. + * demo/labeling/watershed/gaussian.sh: New calibrate tools. + + Implement a secondary demonstrator with regional maxima labeling. + + * demo/labeling/regional_maxima: New directory. + * demo/labeling/regional_maxima/Makefile.am: New makefile. + * demo/labeling/regional_maxima/regional_maxima.cc: New demo source. + * demo/labeling/regional_maxima/threshold.txt: New threshold map file. + + Implement the same demonstrator with directory scanning. + + * exp/labeling/regional_maxima: New directory. + * exp/labeling/regional_maxima/Makefile.am: New makefile. + * exp/labeling/regional_maxima/regional_maxima.cc: New demo source. + * exp/labeling/regional_maxima/threshold.txt: New threshold map file. + + Implement r/g projection. + + * mln/display: New directory. + * mln/display/display_histo.hh: New library file. + * mln/display/project_histo.hh: New library file. + + Give minimal code for using r/w projection. + + * use/display/display_histo: New directory. + * use/display/display_histo/Makefile.am: New Makefile. + * use/display/display_histo/display_histo.cc: New source. + + Divide the secondary demonstrator in four binaries in order to test it. + + Implement the quantified RGB histogram. + + * tools/labeling/histo: New directory. + * tools/labeling/histo/Makefile.am: new makefile. + * tools/labeling/histo/histo.cc: New source. + + Filter the quantified RGB histogram by morphological volume attribute. + + * tools/labeling/opening: New directory. + * tools/labeling/opening/Makefile.am: New makfile. + * tools/labeling/opening/opening.cc: New source. + + Labeling the resulting histogram. + + * tools/labeling/regmax: New directory. + * tools/labeling/regmax/Makefile: New directory. + * tools/labeling/regmax/regmax.cc: New source. + + Propagate labels in the labeling histogram. + + * tools/labeling/iz: New directory. + * tools/labeling/iz/Makefile: New directory. + * tools/labeling/iz/iz.cc: New source. + + Import documentation directory. + + * doc: New directory. + + Import experimentation backups. + + * doc/labeling: New directory. + + * doc/labeling/cmp_methode: New directory. + * doc/labeling/cmp_method/h0_input.pgm.gz: New img file. + * doc/labeling/cmp_method/h2_mean.pgm.gz: New img file. + * doc/labeling/cmp_method/h2_merge.pgm.gz: New img file. + * doc/labeling/cmp_method/h3_mean.pgm.gz: New img file. + * doc/labeling/cmp_method/h3_merge.pgm.gz: New img file. + * doc/labeling/cmp_method/h4_mean.pgm.gz: New img file. + * doc/labeling/cmp_method/h4_merge.pgm.gz: New img file + * doc/labeling/cmp_method/h5_mean.pgm.gz: New img file. + * doc/labeling/cmp_method/h5_merge.pgm.gz: New img file. + * doc/labeling/cmp_method/i2_mean.ppm.gz: New img file. + * doc/labeling/cmp_method/i2_merge.ppm.gz: New img file. + * doc/labeling/cmp_method/i3_mean.ppm.gz: New img file. + * doc/labeling/cmp_method/i3_merge.ppm.gz: New img file. + * doc/labeling/cmp_method/i4_mean.ppm.gz: New img file. + * doc/labeling/cmp_method/i4_merge.ppm.gz: New img file + * doc/labeling/cmp_method/i5_mean.ppm.gz: New img file. + * doc/labeling/cmp_method/i5_merge.ppm.gz: New img file. + * doc/labeling/cmp_method/l2_input.pgm.gz: New img file. + * doc/labeling/cmp_method/l3_input.pgm.gz: New img file. + * doc/labeling/cmp_method/l4_input.pgm.gz: New img file. + * doc/labeling/cmp_method/l5_input.pgm.gz: New img file. + * doc/labeling/cmp_method/s2_histo.txt.gz: New txt file. + * doc/labeling/cmp_method/s3_histo.txt.gz: New txt file. + * doc/labeling/cmp_method/s4_histo.txt.gz: New txt file. + * doc/labeling/cmp_method/s5_histo.txt.gz: New txt file. + * doc/labeling/cmp_method/reponse_theo.eml.gz: New email. + * doc/labeling/cmp_method/synthese.txt.gz: New experiment doc. + + * doc/labeling/cmp_quant: New directory. + * doc/labeling/cmp_quant/h0_input.pgm.gz: New img file. + * doc/labeling/cmp_quant/h5_mean_q2.pgm.gz: New img file. + * doc/labeling/cmp_quant/h5_mean_q3.pgm.gz: New img file. + * doc/labeling/cmp_quant/h5_mean_q4.pgm.gz: New img file. + * doc/labeling/cmp_quant/h5_mean_q5.pgm.gz: New img file. + * doc/labeling/cmp_quant/h5_mean_q6.pgm.gz: New img file. + * doc/labeling/cmp_quant/h5_mean_q7.pgm.gz: New img file. + * doc/labeling/cmp_quant/h5_mean_q8.pgm.gz: New img file. + * doc/labeling/cmp_quant/h5_merge_q2.pgm.gz: New img file. + * doc/labeling/cmp_quant/h5_merge_q3.pgm.gz: New img file. + * doc/labeling/cmp_quant/h5_merge_q4.pgm.gz: New img file. + * doc/labeling/cmp_quant/h5_merge_q5.pgm.gz: New img file. + * doc/labeling/cmp_quant/h5_merge_q6.pgm.gz: New img file. + * doc/labeling/cmp_quant/h5_merge_q7.pgm.gz: New img file. + * doc/labeling/cmp_quant/h5_merge_q8.pgm.gz: New img file. + * doc/labeling/cmp_quant/i5_mean_q2.ppm.gz: New img file. + * doc/labeling/cmp_quant/i5_mean_q3.ppm.gz: New img file. + * doc/labeling/cmp_quant/i5_mean_q4.ppm.gz: New img file. + * doc/labeling/cmp_quant/i5_mean_q5.ppm.gz: New img file. + * doc/labeling/cmp_quant/i5_mean_q6.ppm.gz: New img file. + * doc/labeling/cmp_quant/i5_mean_q7.ppm.gz: New img file. + * doc/labeling/cmp_quant/i5_mean_q8.ppm.gz: New img file. + * doc/labeling/cmp_quant/i5_merge_q2.ppm.gz: New img file. + * doc/labeling/cmp_quant/i5_merge_q3.ppm.gz: New img file. + * doc/labeling/cmp_quant/i5_merge_q4.ppm.gz: New img file. + * doc/labeling/cmp_quant/i5_merge_q5.ppm.gz: New img file. + * doc/labeling/cmp_quant/i5_merge_q6.ppm.gz: New img file. + * doc/labeling/cmp_quant/i5_merge_q7.ppm.gz: New img file. + * doc/labeling/cmp_quant/i5_merge_q8.ppm.gz: New img file. + * doc/labeling/cmp_quant/l5_input_q2.pgm.gz: New img file. + * doc/labeling/cmp_quant/l5_input_q3.pgm.gz: New img file. + * doc/labeling/cmp_quant/l5_input_q4.pgm.gz: New img file. + * doc/labeling/cmp_quant/l5_input_q5.pgm.gz: New img file. + * doc/labeling/cmp_quant/l5_input_q6.pgm.gz: New img file. + * doc/labeling/cmp_quant/l5_input_q7.pgm.gz: New img file. + * doc/labeling/cmp_quant/l5_input_q8.pgm.gz: New img file. + * doc/labeling/cmp_quant/s5_histo_q2.txt.gz: New txt file. + * doc/labeling/cmp_quant/s5_histo_q3.txt.gz: New txt file. + * doc/labeling/cmp_quant/s5_histo_q4.txt.gz: New txt file. + * doc/labeling/cmp_quant/s5_histo_q5.txt.gz: New txt file. + * doc/labeling/cmp_quant/s5_histo_q6.txt.gz: New txt file. + * doc/labeling/cmp_quant/s5_histo_q7.txt.gz: New txt file. + * doc/labeling/cmp_quant/s5_histo_q8.txt.gz: New txt file. + * doc/labeling/cmp_quant/synthese.txt.gz: New experiment doc. + + * doc/labeling/mp00411c: New directory. + * doc/labeling/mp00411c/colormap_all_q4.txt.gz: New txt file. + * doc/labeling/mp00411c/colormap_all_q5.txt.gz: New txt file. + * doc/labeling/mp00411c/colormap_thick_q4.txt.gz: New txt file. + * doc/labeling/mp00411c/colormap_thick_q5.txt.gz: New txt file. + * doc/labeling/mp00411c/colormap_thin_q4.txt.gz: New txt file. + * doc/labeling/mp00411c/colormap_thin_q5.txt.gz: New txt file. + * doc/labeling/mp00411c/histo_all_q4.dump.gz: New dump file. + * doc/labeling/mp00411c/histo_all_q5.dump.gz: New dump file. + * doc/labeling/mp00411c/histo_thick_q4.dump.gz: New dump file. + * doc/labeling/mp00411c/histo_thick_q5.dump.gz: New dump file. + * doc/labeling/mp00411c/histo_thin_q4.dump.gz: New dump file. + * doc/labeling/mp00411c/histo_thin_q5.dump.gz: New dump file. + * doc/labeling/mp00411c/iz_all_q4.dump.gz: New dump file. + * doc/labeling/mp00411c/iz_all_q5.dump.gz: New dump file. + * doc/labeling/mp00411c/iz_thick_q4.dump.gz: New dump file. + * doc/labeling/mp00411c/iz_thick_q5.dump.gz: New dump file. + * doc/labeling/mp00411c/iz_thin_q4.dump.gz: New dump file. + * doc/labeling/mp00411c/iz_thin_q5.dump.gz: New dump file. + * doc/labeling/mp00411c/labeled_all_q4.dump.gz: New dump file. + * doc/labeling/mp00411c/labeled_all_q5.dump.gz: New dump file. + * doc/labeling/mp00411c/labeled_thick_q4.dump.gz: New dump file. + * doc/labeling/mp00411c/labeled_thick_q5.dump.gz: New dump file. + * doc/labeling/mp00411c/labeled_thin_q4.dump.gz: New dump file. + * doc/labeling/mp00411c/labeled_thin_q5.dump.gz: New dump file. + * doc/labeling/mp00411c/mean3_all_q4.ppm.gz: New ppm file. + * doc/labeling/mp00411c/mean3_all_q5.ppm.gz: New ppm file. + * doc/labeling/mp00411c/mean3_thick_q4.ppm.gz: New ppm file. + * doc/labeling/mp00411c/mean3_thick_q5.ppm.gz: New ppm file. + * doc/labeling/mp00411c/mean3_thin_q4.ppm.gz: New ppm file. + * doc/labeling/mp00411c/mean3_thin_q5.ppm.gz: New ppm file. + * doc/labeling/mp00411c/mean4_all_q4.ppm.gz: New ppm file. + * doc/labeling/mp00411c/mean4_all_q5.ppm.gz: New ppm file. + * doc/labeling/mp00411c/mean4_thick_q4.ppm.gz: New ppm file. + * doc/labeling/mp00411c/mean4_thick_q5.ppm.gz: New ppm file. + * doc/labeling/mp00411c/mean4_thin_q4.ppm.gz: New ppm file. + * doc/labeling/mp00411c/mean4_thin_q5.ppm.gz: New ppm file. + * doc/labeling/mp00411c/mp00411c.ppm.gz: New input file. + * doc/labeling/mp00411c/mp00411c_thin.pbm.gz: New gradient mask. + * doc/labeling/mp00411c/mp00411c_thick.pbm.gz: New gradient mask. + * doc/labeling/mp00411c/mp00411c.sh.gz: New script shell. + * doc/labeling/mp00411c/opened_all_q4.dump.gz: New dump file. + * doc/labeling/mp00411c/opened_all_q5.dump.gz: New dump file. + * doc/labeling/mp00411c/opened_thick_q4.dump.gz: New dump file. + * doc/labeling/mp00411c/opened_thick_q5.dump.gz: New dump file. + * doc/labeling/mp00411c/opened_thin_q4.dump.gz: New dump file. + * doc/labeling/mp00411c/opened_thin_q5.dump.gz: New dump file. + * doc/labeling/mp00411c/proj1_all_q4.pgm.gz: New pgm file. + * doc/labeling/mp00411c/proj1_all_q5.pgm.gz: New pgm file. + * doc/labeling/mp00411c/proj1_thick_q4.pgm.gz: New pgm file. + * doc/labeling/mp00411c/proj1_thick_q5.pgm.gz: New pgm file. + * doc/labeling/mp00411c/proj1_thin_q4.pgm.gz: New pgm file. + * doc/labeling/mp00411c/proj1_thin_q5.pgm.gz: New pgm file. + * doc/labeling/mp00411c/proj2_all_q4.pgm.gz: New pgm file. + * doc/labeling/mp00411c/proj2_all_q5.pgm.gz: New pgm file. + * doc/labeling/mp00411c/proj2_thick_q4.pgm.gz: New pgm file. + * doc/labeling/mp00411c/proj2_thick_q5.pgm.gz: New pgm file. + * doc/labeling/mp00411c/proj2_thin_q4.pgm.gz: New pgm file. + * doc/labeling/mp00411c/proj2_thin_q5.pgm.gz: New pgm file. + * doc/labeling/mp00411c/proj3_all_q4.ppm.gz: New ppm file. + * doc/labeling/mp00411c/proj3_all_q5.ppm.gz: New ppm file. + * doc/labeling/mp00411c/proj3_thick_q4.ppm.gz: New ppm file. + * doc/labeling/mp00411c/proj3_thick_q5.ppm.gz: New ppm file. + * doc/labeling/mp00411c/proj3_thin_q4.ppm.gz: New ppm file. + * doc/labeling/mp00411c/proj3_thin_q5.ppm.gz: New ppm file. + * doc/labeling/mp00411c/proj4_all_q4.ppm.gz: New ppm file. + * doc/labeling/mp00411c/proj4_all_q5.ppm.gz: New ppm file. + * doc/labeling/mp00411c/proj4_thick_q4.ppm.gz: New ppm file. + * doc/labeling/mp00411c/proj4_thick_q5.ppm.gz: New ppm file. + * doc/labeling/mp00411c/proj4_thin_q4.ppm.gz: New ppm file. + * doc/labeling/mp00411c/proj4_thin_q5.ppm.gz: New ppm file. + * doc/labeling/mp00411c/quant_q4.ppm.gz: New ppm file. + * doc/labeling/mp00411c/quant_q5.ppm.gz: New ppm file. + * doc/labeling/mp00411c/stat3_all_q4.txt.gz: New txt file. + * doc/labeling/mp00411c/stat3_all_q5.txt.gz: New txt file. + * doc/labeling/mp00411c/stat3_thick_q4.txt.gz: New txt file. + * doc/labeling/mp00411c/stat3_thick_q5.txt.gz: New txt file. + * doc/labeling/mp00411c/stat3_thin_q4.txt.gz: New txt file. + * doc/labeling/mp00411c/stat3_thin_q5.txt.gz: New txt file. + * doc/labeling/mp00411c/stat4_all_q4.txt.gz: New txt file. + * doc/labeling/mp00411c/stat4_all_q5.txt.gz: New txt file. + * doc/labeling/mp00411c/stat4_thick_q4.txt.gz: New txt file. + * doc/labeling/mp00411c/stat4_thick_q5.txt.gz: New txt file. + * doc/labeling/mp00411c/stat4_thin_q4.txt.gz: New txt file. + * doc/labeling/mp00411c/stat4_thin_q5.txt.gz: New txt file. + * doc/labeling/mp00411c/synthese.txt.gz: New txt file. + + * doc/labeling/mp00307c_bis: New directory. + * doc/labeling/mp00307c_bis/colormap_all_q4_r06f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_all_q4_r06h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_all_q4_r18f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_all_q4_r18h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_all_q4_r26f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_all_q4_r26h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_all_q5_r06f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_all_q5_r06h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_all_q5_r18f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_all_q5_r18h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_all_q5_r26f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_all_q5_r26h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thin_q4_r06f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thin_q4_r06h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thin_q4_r18f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thin_q4_r18h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thin_q4_r26f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thin_q4_r26h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thin_q5_r06f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thin_q5_r06h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thin_q5_r18f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thin_q5_r18h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thin_q5_r26f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thin_q5_r26h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thick_q4_r06f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thick_q4_r06h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thick_q4_r18f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thick_q4_r18h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thick_q4_r26f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thick_q4_r26h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thick_q5_r06f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thick_q5_r06h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thick_q5_r18f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thick_q5_r18h.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thick_q5_r26f.txt: New colormap. + * doc/labeling/mp00307c_bis/colormap_thick_q5_r26h.txt: New colormap. + * doc/labeling/mp00307c_bis/histo_all_q4.dump.gz: New histo. + * doc/labeling/mp00307c_bis/histo_all_q5.dump.gz: New histo. + * doc/labeling/mp00307c_bis/histo_all_q8.dump.gz: New histo. + * doc/labeling/mp00307c_bis/histo_thin_q4.dump.gz: New histo. + * doc/labeling/mp00307c_bis/histo_thin_q5.dump.gz: New histo. + * doc/labeling/mp00307c_bis/histo_thin_q8.dump.gz: New histo. + * doc/labeling/mp00307c_bis/histo_thick_q4.dump.gz: New histo. + * doc/labeling/mp00307c_bis/histo_thick_q5.dump.gz: New histo. + * doc/labeling/mp00307c_bis/histo_thick_q8.dump.gz: New histo. + * doc/labeling/mp00307c_bis/iz_all_q4_r06f_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r06f_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r06f_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r06h_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r06h_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r06h_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r18f_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r18f_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r18f_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r18h_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r18h_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r18h_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r26f_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r26f_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r26f_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r26h_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r26h_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q4_r26h_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r06f_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r06f_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r06f_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r06h_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r06h_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r06h_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r18f_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r18f_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r18f_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r18h_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r18h_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r18h_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r26f_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r26f_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r26f_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r26h_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r26h_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_all_q5_r26h_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r06f_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r06f_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r06f_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r06h_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r06h_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r06h_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r18f_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r18f_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r18f_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r18h_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r18h_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r18h_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r26f_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r26f_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r26f_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r26h_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r26h_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q4_r26h_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r06f_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r06f_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r06f_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r06h_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r06h_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r06h_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r18f_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r18f_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r18f_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r18h_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r18h_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r18h_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r26f_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r26f_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r26f_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r26h_i06.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r26h_i18.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thin_q5_r26h_i26.dump.gz: New lbl propag. + * doc/labeling/mp00307c_bis/iz_thick_q4_r06f_i06.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r06f_i18.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r06f_i26.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r06h_i06.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r06h_i18.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r06h_i26.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r18f_i06.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r18f_i18.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r18f_i26.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r18h_i06.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r18h_i18.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r18h_i26.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r26f_i06.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r26f_i18.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r26f_i26.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r26h_i06.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r26h_i18.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q4_r26h_i26.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r06f_i06.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r06f_i18.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r06f_i26.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r06h_i06.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r06h_i18.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r06h_i26.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r18f_i06.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r18f_i18.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r18f_i26.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r18h_i06.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r18h_i18.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r18h_i26.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r26f_i06.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r26f_i18.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r26f_i26.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r26h_i06.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r26h_i18.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/iz_thick_q5_r26h_i26.dump.gz: New lbl prop. + * doc/labeling/mp00307c_bis/labeled_all_q4_r06f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_all_q4_r06h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_all_q4_r18f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_all_q4_r18h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_all_q4_r28f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_all_q4_r28h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_all_q5_r06f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_all_q5_r06h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_all_q5_r18f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_all_q5_r18h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_all_q5_r28f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_all_q5_r28h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thin_q4_r06f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thin_q4_r06h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thin_q4_r18f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thin_q4_r18h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thin_q4_r28f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thin_q4_r28h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thin_q5_r06f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thin_q5_r06h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thin_q5_r18f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thin_q5_r18h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thin_q5_r28f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thin_q5_r28h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thick_q4_r06f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thick_q4_r06h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thick_q4_r18f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thick_q4_r18h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thick_q4_r28f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thick_q4_r28h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thick_q5_r06f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thick_q5_r06h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thick_q5_r18f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thick_q5_r18h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thick_q5_r28f.dump.gz: New histo. + * doc/labeling/mp00307c_bis/labeled_thick_q5_r28h.dump.gz: New histo. + * doc/labeling/mp00307c_bis/mean3_all_q4_r06f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_all_q4_r06h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_all_q4_r18f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_all_q4_r18h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_all_q4_r26f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_all_q4_r26h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_all_q5_r06f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_all_q5_r06h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_all_q5_r18f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_all_q5_r18h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_all_q5_r26f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_all_q5_r26h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thin_q4_r06f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thin_q4_r06h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thin_q4_r18f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thin_q4_r18h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thin_q4_r26f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thin_q4_r26h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thin_q5_r06f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thin_q5_r06h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thin_q5_r18f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thin_q5_r18h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thin_q5_r26f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thin_q5_r26h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thick_q4_r06f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thick_q4_r06h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thick_q4_r18f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thick_q4_r18h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thick_q4_r26f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thick_q4_r26h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thick_q5_r06f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thick_q5_r06h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thick_q5_r18f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thick_q5_r18h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thick_q5_r26f.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean3_thick_q5_r26h.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r06f_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r06f_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r06f_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r06h_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r06h_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r06h_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r18f_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r18f_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r18f_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r18h_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r18h_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r18h_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r26f_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r26f_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r26f_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r26h_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r26h_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q4_r26h_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r06f_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r06f_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r06f_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r06h_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r06h_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r06h_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r18f_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r18f_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r18f_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r18h_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r18h_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r18h_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r26f_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r26f_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r26f_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r26h_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r26h_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_all_q5_r26h_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r06f_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r06f_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r06f_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r06h_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r06h_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r06h_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r18f_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r18f_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r18f_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r18h_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r18h_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r18h_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r26f_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r26f_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r26f_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r26h_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r26h_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q4_r26h_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r06f_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r06f_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r06f_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r06h_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r06h_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r06h_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r18f_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r18f_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r18f_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r18h_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r18h_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r18h_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r26f_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r26f_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r26f_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r26h_i06.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r26h_i18.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thin_q5_r26h_i26.ppm.gz: New mean img. + * doc/labeling/mp00307c_bis/mean4_thick_q4_r06f_i06.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r06f_i18.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r06f_i26.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r06h_i06.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r06h_i18.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r06h_i26.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r18f_i06.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r18f_i18.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r18f_i26.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r18h_i06.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r18h_i18.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r18h_i26.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r26f_i06.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r26f_i18.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r26f_i26.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r26h_i06.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r26h_i18.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q4_r26h_i26.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r06f_i06.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r06f_i18.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r06f_i26.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r06h_i06.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r06h_i18.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r06h_i26.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r18f_i06.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r18f_i18.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r18f_i26.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r18h_i06.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r18h_i18.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r18h_i26.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r26f_i06.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r26f_i18.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r26f_i26.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r26h_i06.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r26h_i18.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mean4_thick_q5_r26h_i26.ppm.gz: New mean . + * doc/labeling/mp00307c_bis/mp00307c.ppm.gz: New input img. + * doc/labeling/mp00307c_bis/mp00307c.sh.gz: New script shell. + * doc/labeling/mp00307c_bis/mp00307c_thick.pgm.gz: New mask. + * doc/labeling/mp00307c_bis/mp00307c_thin.pgm.gz: New mask. + * doc/labeling/mp00307c_bis/opened_all_q4.dump.gz: New filtered histo. + * doc/labeling/mp00307c_bis/opened_all_q5.dump.gz: New filtered histo. + * doc/labeling/mp00307c_bis/opened_all_q8.dump.gz: New filtered histo. + * doc/labeling/mp00307c_bis/opened_thin_q4.dump.gz: New filtered histo. + * doc/labeling/mp00307c_bis/opened_thin_q5.dump.gz: New filtered histo. + * doc/labeling/mp00307c_bis/opened_thin_q8.dump.gz: New filtered histo. + * doc/labeling/mp00307c_bis/opened_thick_q4.dump.gz: New filtered histo. + * doc/labeling/mp00307c_bis/opened_thick_q5.dump.gz: New filtered histo. + * doc/labeling/mp00307c_bis/opened_thick_q8.dump.gz: New filtered histo. + * doc/labeling/mp00307c_bis/proj1_all_q4.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_all_q4.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_all_q5.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_all_q5.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_all_q8.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_all_q8.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_thin_q4.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_thin_q4.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_thin_q5.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_thin_q5.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_thin_q8.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_thin_q8.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_thick_q4.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_thick_q4.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_thick_q5.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_thick_q5.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_thick_q8.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj1_thick_q8.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_all_q4.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_all_q4.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_all_q5.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_all_q5.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_all_q8.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_all_q8.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_thin_q4.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_thin_q4.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_thin_q5.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_thin_q5.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_thin_q8.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_thin_q8.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_thick_q4.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_thick_q4.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_thick_q5.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_thick_q5.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_thick_q8.pgm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj2_thick_q8.ppm.gz: New r/g projection. + * doc/labeling/mp00307c_bis/proj3_all_q4_r06f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_all_q4_r06h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_all_q4_r18f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_all_q4_r18h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_all_q4_r26f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_all_q4_r26h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_all_q5_r06f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_all_q5_r06h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_all_q5_r18f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_all_q5_r18h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_all_q5_r26f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_all_q5_r26h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thin_q4_r06f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thin_q4_r06h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thin_q4_r18f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thin_q4_r18h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thin_q4_r26f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thin_q4_r26h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thin_q5_r06f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thin_q5_r06h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thin_q5_r18f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thin_q5_r18h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thin_q5_r26f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thin_q5_r26h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thick_q4_r06f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thick_q4_r06h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thick_q4_r18f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thick_q4_r18h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thick_q4_r26f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thick_q4_r26h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thick_q5_r06f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thick_q5_r06h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thick_q5_r18f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thick_q5_r18h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thick_q5_r26f.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj3_thick_q5_r26h.ppm.gz: New r/g proj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r06f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r06f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r06f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r06h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r06h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r06h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r18f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r18f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r18f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r18h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r18h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r18h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r26f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r26f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r26f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r26h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r26h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q4_r26h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r06f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r06f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r06f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r06h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r06h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r06h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r18f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r18f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r18f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r18h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r18h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r18h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r26f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r26f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r26f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r26h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r26h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_all_q5_r26h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r06f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r06f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r06f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r06h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r06h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r06h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r18f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r18f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r18f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r18h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r18h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r18h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r26f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r26f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r26f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r26h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r26h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q4_r26h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r06f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r06f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r06f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r06h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r06h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r06h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r18f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r18f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r18f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r18h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r18h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r18h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r26f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r26f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r26f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r26h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r26h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thin_q5_r26h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r06f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r06f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r06f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r06h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r06h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r06h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r18f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r18f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r18f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r18h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r18h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r18h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r26f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r26f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r26f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r26h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r26h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q4_r26h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r06f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r06f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r06f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r06h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r06h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r06h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r18f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r18f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r18f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r18h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r18h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r18h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r26f_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r26f_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r26f_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r26h_i06.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r26h_i18.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/proj4_thick_q5_r26h_i26.ppm.gz: New rg prj. + * doc/labeling/mp00307c_bis/quant_q4.ppm.gz: New quantified img. + * doc/labeling/mp00307c_bis/quant_q5.ppm.gz: New quantified img. + * doc/labeling/mp00307c_bis/quant_q8.ppm.gz: New quantified img. + * doc/labeling/mp00307c_bis/stats3_all_q4_r06f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_all_q4_r06h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_all_q4_r18f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_all_q4_r18h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_all_q4_r26f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_all_q4_r26h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_all_q5_r06f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_all_q5_r06h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_all_q5_r18f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_all_q5_r18h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_all_q5_r26f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_all_q5_r26h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thin_q4_r06f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thin_q4_r06h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thin_q4_r18f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thin_q4_r18h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thin_q4_r26f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thin_q4_r26h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thin_q5_r06f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thin_q5_r06h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thin_q5_r18f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thin_q5_r18h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thin_q5_r26f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thin_q5_r26h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thick_q4_r06f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thick_q4_r06h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thick_q4_r18f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thick_q4_r18h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thick_q4_r26f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thick_q4_r26h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thick_q5_r06f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thick_q5_r06h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thick_q5_r18f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thick_q5_r18h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thick_q5_r26f.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats3_thick_q5_r26h.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r06f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r06f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r06f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r06h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r06h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r06h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r18f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r18f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r18f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r18h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r18h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r18h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r26f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r26f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r26f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r26h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r26h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q4_r26h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r06f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r06f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r06f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r06h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r06h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r06h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r18f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r18f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r18f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r18h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r18h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r18h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r26f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r26f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r26f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r26h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r26h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_all_q5_r26h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r06f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r06f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r06f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r06h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r06h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r06h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r18f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r18f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r18f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r18h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r18h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r18h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r26f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r26f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r26f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r26h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r26h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q4_r26h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r06f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r06f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r06f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r06h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r06h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r06h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r18f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r18f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r18f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r18h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r18h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r18h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r26f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r26f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r26f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r26h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r26h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thin_q5_r26h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r06f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r06f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r06f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r06h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r06h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r06h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r18f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r18f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r18f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r18h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r18h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r18h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r26f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r26f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r26f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r26h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r26h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q4_r26h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r06f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r06f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r06f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r06h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r06h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r06h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r18f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r18f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r18f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r18h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r18h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r18h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r26f_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r26f_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r26f_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r26h_i06.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r26h_i18.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/stats4_thick_q5_r26h_i26.ppm.gz: New stats. + * doc/labeling/mp00307c_bis/synthese.txt.gz: New synthesis file. + + + * doc/labeling/mp00042c: New directory. + * doc/labeling/mp00042c/histo_all.dump.gz: New histo. + * doc/labeling/mp00042c/histo_thick.dump.gz: New histo. + * doc/labeling/mp00042c/histo_thin.dump.gz: New histo. + * doc/labeling/mp00042c/labeled_all.dump.gz: New labeled histo. + * doc/labeling/mp00042c/labeled_thick.dump.gz: New labeled histo. + * doc/labeling/mp00042c/labeled_thin.dump.gz: New labeled histo. + * doc/labeling/mp00042c/mean_all.dump.gz: New mean img. + * doc/labeling/mp00042c/mean_thin.dump.gz: New mean img. + * doc/labeling/mp00042c/mean_thick.dump.gz: New mean img. + * doc/labeling/mp00042c/mp00042c.ppm.gz: New input img. + * doc/labeling/mp00042c/mp00042c.sh.gz: New script shell. + * doc/labeling/mp00042c/mp00042c_thick.gz: New mask. + * doc/labeling/mp00042c/mp00042c_thin.gz: New mask. + * doc/labeling/mp00042c/opened_all.gz: New filtered histo. + * doc/labeling/mp00042c/opened_thin.gz: New filtered histo. + * doc/labeling/mp00042c/opened_thick.gz: New filtered histo. + * doc/labeling/mp00042c/pal_all.gz: New colormap. + * doc/labeling/mp00042c/pal_thin.gz: New colormap. + * doc/labeling/mp00042c/pal_thick.gz: New colormap. + * doc/labeling/mp00042c/proj1.pgm.gz: New r/g projection. + * doc/labeling/mp00042c/proj2.pgm.gz: New r/g projection. + * doc/labeling/mp00042c/proj3.ppm.gz: New r/g projection. + * doc/labeling/mp00042c/proj2_all.pgm.gz: New r/g projection + * doc/labeling/mp00042c/proj2_thin.pgm.gz: New r/g projection. + * doc/labeling/mp00042c/proj2_thick.pgm.gz: New r/g projection. + * doc/labeling/mp00042c/proj3_all.pgm.gz: New r/g projection. + * doc/labeling/mp00042c/proj3_thin.pgm.gz: New r/g projection. + * doc/labeling/mp00042c/proj3_thick.pgm.gz: New r/g projection. + * doc/labeling/mp00042c/proj_all.pgm.gz: New r/g projection. + * doc/labeling/mp00042c/proj_thick.pgm.gz: New r/g projection. + * doc/labeling/mp00042c/proj_thin.pgm.gz: New r/g projection. + * doc/labeling/mp00042c/quant.ppm.gz: New quantified img. + + * doc/labeling/mp00307c: New directory. + * doc/labeling/mp00307c/colormap_all.txt.tgz: New colormap. + * doc/labeling/mp00307c/colormap_thin.txt.tgz: New colormap. + * doc/labeling/mp00307c/colormap_thick.txt.tgz: New colormap. + * doc/labeling/mp00307c/histo_all.dump.tgz: New histo. + * doc/labeling/mp00307c/histo_thin.dump.tgz: New histo. + * doc/labeling/mp00307c/histo_thick.dump.tgz: New histo. + * doc/labeling/mp00307c/iz_all.dump.tgz: New label propagation.. + * doc/labeling/mp00307c/iz_thick.dump.tgz: New label propagation.. + * doc/labeling/mp00307c/labeled_all.dump.tgz: New label histo. + * doc/labeling/mp00307c/labeled_thin.dump.tgz: New label histo. + * doc/labeling/mp00307c/labeled_thick.dump.tgz: New label histo. + * doc/labeling/mp00307c/mean3_all.ppm.tgz: New mean img. + * doc/labeling/mp00307c/mean3_thin.ppm.tgz: New mean img. + * doc/labeling/mp00307c/mean3_thick.ppm.tgz: New mean img. + * doc/labeling/mp00307c/mean4_all.ppm.tgz: New mean img. + * doc/labeling/mp00307c/mean4_thin.ppm.tgz: New mean img. + * doc/labeling/mp00307c/mean4_thick.ppm.tgz: New mean img. + * doc/labeling/mp00307c/mp00307.ppm.tgz: New input img. + * doc/labeling/mp00307c/mp00307.sh.tgz: New script shell. + * doc/labeling/mp00307c/mp00307_thin.pbm.tgz: New mask. + * doc/labeling/mp00307c/mp00307_thick.pbm.tgz: New mask. + * doc/labeling/mp00307c/opened_all.dump.tgz: New filtered img. + * doc/labeling/mp00307c/opened_thin.dump.tgz: New filtered img. + * doc/labeling/mp00307c/opened_thick.dump.tgz: New filtered img. + * doc/labeling/mp00307c/proj1_all.pgm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj1_all.ppm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj1_thin.pgm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj1_thin.ppm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj1_thick.pgm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj1_thick.ppm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj2_all.pgm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj2_all.ppm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj2_thin.pgm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj2_thin.ppm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj2_thick.pgm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj2_thick.ppm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj3_all.pgm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj3_all.ppm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj3_thin.pgm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj3_thin.ppm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj3_thick.pgm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj3_thick.ppm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj4_all.pgm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj4_all.ppm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj4_thin.pgm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj4_thin.ppm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj4_thick.pgm.tgz: New r/g projection. + * doc/labeling/mp00307c/proj4_thick.ppm.tgz: New r/g projection + * doc/labeling/mp00307c/quant.ppm.tgz: New quantified img + * doc/labeling/mp00307c/stats3_all.txt.tgz: New stats file. + * doc/labeling/mp00307c/stats3_thin.txt.tgz: New stats file. + * doc/labeling/mp00307c/stats3_thick.txt.tgz: New stats file. + * doc/labeling/mp00307c/stats4_all.txt.tgz: New stats file. + * doc/labeling/mp00307c/stats4_thin.txt.tgz: New stats file. + * doc/labeling/mp00307c/stats4_thick.txt.tgz: New stats file. + * doc/labeling/mp00307c/synthese.txt.tgz: New synthesis file. + + Import materials for next tests. + + * doc/labeling/mp00215c: New directory. + * doc/labeling/mp00215c/mp00215c.ppm.gz: New color input img. + * doc/labeling/mp00215c/mp00215c_thick.pbm.gz: New thick mask. + * doc/labeling/mp00215c/mp00215c_thin.pbm.gz: New thin mask. + + * doc/labeling/mp00234c: New directory. + * doc/labeling/mp00234c/mp00234c.ppm.gz: New color input img. + * doc/labeling/mp00234c/mp00234c_thick.pbm.gz: New thick mask. + * doc/labeling/mp00234c/mp00234c_thin.pbm.gz: New thin mask. + + * doc/labeling/mp00248c: New directory. + * doc/labeling/mp00248c/mp00248c.ppm.gz: New color input img. + * doc/labeling/mp00248c/mp00248c_thick.pbm.gz: New thick mask. + * doc/labeling/mp00248c/mp00248c_thin.pbm.gz: New thin mask. + + * doc/labeling/mp00031c: New directory. + * doc/labeling/mp00031c/mp00031c.ppm.gz: New color input img. + * doc/labeling/mp00031c/mp00031c_thick.pbm.gz: New thick mask. + * doc/labeling/mp00031c/mp00031c_thin.pbm.gz: New thin mask. + + * doc/labeling/mp00083c: New directory. + * doc/labeling/mp00083c/mp00083c.ppm.gz: New color input img. + * doc/labeling/mp00083c/mp00083c_thick.pbm.gz: New thick mask. + * doc/labeling/mp00083c/mp00083c_thin.pbm.gz: New thin mask. + + Import annotating search notes. + + * doc/annotating/class.txt: New documentation text file. + * doc/annotating/syntheseMillet.txt: New documentation text file. + * doc/annotating/testMillet2008: New documentation text file. + + Import milena learning examples. + + * doc/examples: New directory. + + * doc/examples/hello_world: New directory. + * doc/examples/hello_world/Makefile.am: New makefile. + * doc/examples/hello_world/hellow_world.cc: New source file. + * doc/examples/hello_world/print.cc: New source file. + + * doc/examples/hello_milena: New directory. + * doc/examples/hello_milena/Makefile.am: New makefile. + * doc/examples/hello_milena/hello_milena.cc: New source file. + + * doc/examples/learn_milena: New directory. + * doc/examples/learn_milena/Makefile.am: New makefile. + * doc/examples/learn_milena/learn_milena.cc: New source file. + + * doc/examples/otsu: New directory. + * doc/examples/otsu/Makefile.am: New makefile. + * doc/examples/otsu/otsu.cc: New source file. + + * doc/examples/frac: New directory. + * doc/examples/frac/Makefile.am: New makefile. + * doc/examples/frac/frac.cc: New source file. + * doc/examples/frac/frac.hh: New source file. + * doc/examples/frac/sign_prod.hh: New source file. + * doc/examples/frac/gcd.hh: New source file. + + * doc/examples/accu_color: New directory. + * doc/examples/accu_color/accu_color.cc: New source file. + + * doc/examples/io: New directory. + * doc/examples/io/Makefile.am: New makefile. + * doc/examples/io/io.cc: New source file. + + Write down the basis of the quick tour summary documentation. + + * doc/quick_tour: New specific directory. + * doc/quick_tour/quick_tour.tex: New documentation work. + + Write down 3d currently used formulaes. + + * doc/formulae: New specific directory. + * doc/formulae/formulae.tex: New recipe of 3d formulae. + + + 2010-06-30 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Add some futur materials on regional maxima. + + * test_labelling_2.cc: New file. + * test_labelling_3.cc: New file. + + 2010-06-28 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Implement the kmean algorithh and start to optimize it. + + Implement the first version with vectors and matrices. + + * mln/clustering/k_mean.hh: New library component. + + * use/clustering/k_mean: New directory. + * use/clustering/k_mean/Makefile.am: New makefile. + * use/clustering/k_mean/k_mean.cc: New source file. + + * tests/clustering/k_mean: New directory. + * tests/clustering/k_mean/Makefile.am: New makefile. + * tests/clustering/k_mean/k_mean.cc: New source file. + + Implement the second version with image and working in 1d. + + * mln/clustering/kmean1d.hh: New library component. + + * use/clustering/kmean1d: New directory. + * use/clustering/kmean1d/Makefile.am: New makefile. + * use/clustering/kmean1d/kmean1d.cc: New source file. + + * demo/clustering/kmean1d: New directory. + * demo/clustering/kmean1d/Makefile.am: New makefile. + * demo/clustering/kmean1d/kmean1d.cc: New source file. + + Implement transformation between RG space and RGB space. + + * mln/fun/v2v/rg_to_rgb.hh: New library component. + * use/fun/v2v/rg_to_rgb: New directory. + * use/fun/v2v/rg_to_rgb/Makefile.am: New makefile. + * use/fun/v2v/rg_to_rgb/rg_to_rgb.cc: New source file. + + Implement the third version working in 2d (r/g). + + * mln/clustering/kmean2d.hh: New library component. + + * use/clustering/kmean2d: New directory. + * use/clustering/kmean2d/Makefile.am: New makefile. + * use/clustering/kmean2d/kmean2d.cc: New source file. + + * demo/clustering/kmean2d: New directory. + * demo/clustering/kmean2d/Makefile.am: New makefile. + * demo/clustering/kmean2d/kmean2d.cc: New source file. + + Implement the fourth version working in 3d (rgb). + + * mln/clustering/kmean3d.hh: New library component. + + * use/clustering/kmean3d: New directory. + * use/clustering/kmean3d/Makefile.am: New makefile. + * use/clustering/kmean3d/kmean3d.cc: New source file. + + * demo/clustering/kmean3d: New directory. + * demo/clustering/kmean3d/Makefile.am: New makefile. + * demo/clustering/kmean3d/kmean3d.cc: New source file. + + Implement the fith version as a function (working in rgb space). + + * mln/clustering/kmean_rgb.hh: New library component. + + * use/clustering/kmean_rgb: New directory. + * use/clustering/kmean_rgb/Makefile.am: New makefile. + * use/clustering/kmean_rgb/kmean_rgb.cc: New source file. + + * demo/clustering/kmean_rgb: New directory. + * demo/clustering/kmean_rgb/Makefile.am: New makefile. + * demo/clustering/kmean_rgb/kmean_rgb.cc: New source file. + + Benchmark distance algorithm for the kmean algorithm. + + * bench/clustering/distance: New directory. + * bench/clustering/distance/Makefile.am: New makefile. + * bench/clustering/distance/distance.cc: New source file. + + 2010-06-24 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Define documentation files. + + * README: Delete this file and replace it by README.green. + * README.green: New index for source files in scribo/sandbox/green. + * README.img: New index for image database. + * README.result: New index for histogram database. + + 2010-06-23 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Define gnuplot shell export format. + + * mln/io/plot/save_image_sh.hh: New header file. + + Give an example of code. + + * use/io/plot/save_image_sh: New directory. + * use/io/plot/save_image_sh/Makefile.am: New makefile. + * use/io/plot/save_image_sh/save_image_sh.cc: New source file. + + Make some unitary tests on gnuplot shell export. + + * tests/io/plot/save_image_sh: New directory. + * tests/io/plot/save_image_sh/Makefile.am: New makefile. + * tests/io/plot/save_image_sh/save_image_sh.cc: New source file. + + 2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Define accumulator which computes histogram view as image. + + * mln/img_path.hh: New header file. + + Define the 1d component version of the the library. + + * mln/accu/stat/histo1d.hh: New header file. + + Give an example of code. + + * use/accu/stat/histo1d: New directory. + * use/accu/stat/histo1d/Makefile.am: New makefile. + * use/accu/stat/histo1d/histo1d.cc: New source. + + Make some unitary tests on histo1d library. + + * tests/accu/stat/histo1d: New directory. + * tests/accu/stat/histo1d/Makefile.am: New makefile. + * tests/accu/stat/histo1d/histo1d.cc: New source. + + Define the 2d component version of the the library. + + * mln/accu/stat/histo2d.hh: New header file. + * mln/value/rg.hh: New header file. + * mln/fun/v2v/rgb_to_rg.hh: New header file. + + Give an example of code. + + * use/accu/stat/histo2d: New directory. + * use/accu/stat/histo2d/Makefile.am: New makefile. + * use/accu/stat/histo2d/histo2d.cc: New source. + + * use/value/rg: New directory. + * use/value/rg/Makefile.am: New makefile. + * use/value/rg/rg.cc: New source. + + * use/fun/v2v/rgb_to_rg: New directory. + * use/fun/v2v/rgb_to_rg/Makefile.am: New makefile. + * use/fun/v2v/rgb_to_rg/rgb_to_rg.cc: New source. + + Define the RGB 3d component version of the the library. + + * mln/accu/stat/histo3d_rgb.hh: New header file. + * mln/fun/v2v/rgb8_to_rgbn.hh: New header file. + + Give an example of code. + + * use/accu/stat/histo3_rgb: New directory. + * use/accu/stat/histo3d_rgb/Makefile.am: New makefile. + * use/accu/stat/histo3d_rgb/histo3d_rgb.cc: New source. + + * use/fun/v2v/rgb8_to_rgbn: New directory. + * use/fun/v2v/rgb8_to_rgbn/Makefile.am: New makefile. + * use/fun/v2v/rgb8_to_rgbn/rgb8_to_rgbn.cc: New source. + + Make some unitary tests on histo3d library. + + * tests/accu/stat/histo3d_rgb: New directory. + * tests/accu/stat/histo3d_rgb/Makefile.am: New makefile. + * tests/accu/stat/histo3d_rgb/histo3d_rgb.cc: New source. + + + Define the HSL 3d component version of the the library. + + * mln/accu/stat/histo3d_hsl.hh: New header file. + + Give an example of code. + + * use/accu/stat/histo3_hsl: New directory. + * use/accu/stat/histo3d_hsl/Makefile.am: New makefile. + * use/accu/stat/histo3d_hsl/histo3d_hsl.cc: New source. + + Make some unitary tests on histo3d library. + + * tests/accu/stat/histo3d_hsl: New directory. + * tests/accu/stat/histo3d_hsl/Makefile.am: New makefile. + * tests/accu/stat/histo3d_hsl/histo3d_hsl.cc: New source. + + 2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Import files from milena/sandbox/green. + + * gaussian.sh: New gnuplot shell file. + * guassian2d.sh: New gnuplot shell file. + * test_labelling.cc: New source. + * tests/clustering/k_mean/Makefile.am: New makefile. + * tests/clustering/k_mean/k_mean.cc: New source. + * tests/clustering/kmean1d/Makefile.am: New makefile. + * tests/clustering/kmean1d/kmean1d.cc: New source. + * tests/io/plot/save_image_sh/Makefile.am: New makefile. + * tests/io/plot/save_image_sh/save_image_sh.cc: New source. + + 2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Import files from milena/sandbox/green. + + * mln/accu/stat/histo1d.hh: New header file. + * mln/accu/stat/histo2d.hh: New header file. + * mln/accu/stat/histo3d_hsl.hh: New header file. + * mln/accu/stat/histo3d_rgb.hh: New header file. + * mln/clustering/k_mean.hh: New header file. + * mln/clustering/kmean1d.hh: New header file. + * mln/clustering/kmean2d.hh: New header file. + * mln/clustering/kmean3d.hh: New header file. + * mln/clustering/kmean_rgb.hh: New header file. + * mln/display/display_histo.hh: New header file. + * mln/display/project_histo.hh: New header file. + * mln/fun/p2b/achromatic.hh: New header file. + * mln/fun/p2b/component_equals.hh: New header file. + * mln/fun/v2v/achromatism.hh: New header file. + * mln/fun/v2v/hue_concentration.hh: New header file. + * mln/fun/v2v/int_u16_to_int_u14.hh: New header file. + * mln/fun/v2v/int_u16_to_int_u14.hh: New header file. + * mln/fun/v2v/log.hh: New header file. + * mln/fun/v2v/rg_to_rgb.hh: New header file. + * mln/fun/v2v/rgb8_to_int_u8: New header file. + * mln/fun/v2v/rgb_to_achromastism_map.hh: New header file. + * mln/fun/v2v/rgb_to_hsv.hh: New header file. + * mln/fun/v2v/rgb_to_hue_map.hh: New header file. + * mln/fun/v2v/rgb_to_saturation_map.hh: New header file. + * mln/fun/v2v/rgb_to_value_map.hh: New header file. + * mln/img_path.hh: New header file. + * mln/io/plot/save_image_sh.hh: New header file. + * mln/math/cell.hh: New header file. + * mln/math/floor.hh: New header file. + * tests/accu/stat/histo1d/Makefile.am: New makefile. + * tests/accu/stat/histo1d/histo1d.cc: New source. + * tests/accu/stat/histo2d/Makefile.am: New makefile. + * tests/accu/stat/histo2d/histo2d.cc: New source. + + 2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Simple integration test. + + * README: New text file. + * ok/mln/img_path.hh: New header file. + * ok/mln/accu/histo/histo1d.hh: New header file. + * ok/mln/accu/histo/histo2d.hh: New header file. + * ok/mln/accu/histo/histo3d.hh: New header file. + * ok/test/accu/histo/gaussian.sh: New gnuplot script file. + * ok/test/accu/histo/histo1d.cc: New source file. + +2010-06-30 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Add some futur materials on regional maxima. + + * test_labelling_2.cc: New file. + * test_labelling_3.cc: New file. + +2010-06-28 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Implement the kmean algorithh and start to optimize it. + + Implement the first version with vectors and matrices. + + * mln/clustering/k_mean.hh: New library component. + + * use/clustering/k_mean: New directory. + * use/clustering/k_mean/Makefile.am: New makefile. + * use/clustering/k_mean/k_mean.cc: New source file. + + * tests/clustering/k_mean: New directory. + * tests/clustering/k_mean/Makefile.am: New makefile. + * tests/clustering/k_mean/k_mean.cc: New source file. + + Implement the second version with image and working in 1d. + + * mln/clustering/kmean1d.hh: New library component. + + * use/clustering/kmean1d: New directory. + * use/clustering/kmean1d/Makefile.am: New makefile. + * use/clustering/kmean1d/kmean1d.cc: New source file. + + * demo/clustering/kmean1d: New directory. + * demo/clustering/kmean1d/Makefile.am: New makefile. + * demo/clustering/kmean1d/kmean1d.cc: New source file. + + Implement transformation between RG space and RGB space. + + * mln/fun/v2v/rg_to_rgb.hh: New library component. + * use/fun/v2v/rg_to_rgb: New directory. + * use/fun/v2v/rg_to_rgb/Makefile.am: New makefile. + * use/fun/v2v/rg_to_rgb/rg_to_rgb.cc: New source file. + + Implement the third version working in 2d (r/g). + + * mln/clustering/kmean2d.hh: New library component. + + * use/clustering/kmean2d: New directory. + * use/clustering/kmean2d/Makefile.am: New makefile. + * use/clustering/kmean2d/kmean2d.cc: New source file. + + * demo/clustering/kmean2d: New directory. + * demo/clustering/kmean2d/Makefile.am: New makefile. + * demo/clustering/kmean2d/kmean2d.cc: New source file. + + Implement the fourth version working in 3d (rgb). + + * mln/clustering/kmean3d.hh: New library component. + + * use/clustering/kmean3d: New directory. + * use/clustering/kmean3d/Makefile.am: New makefile. + * use/clustering/kmean3d/kmean3d.cc: New source file. + + * demo/clustering/kmean3d: New directory. + * demo/clustering/kmean3d/Makefile.am: New makefile. + * demo/clustering/kmean3d/kmean3d.cc: New source file. + + Implement the fith version as a function (working in rgb space). + + * mln/clustering/kmean_rgb.hh: New library component. + + * use/clustering/kmean_rgb: New directory. + * use/clustering/kmean_rgb/Makefile.am: New makefile. + * use/clustering/kmean_rgb/kmean_rgb.cc: New source file. + + * demo/clustering/kmean_rgb: New directory. + * demo/clustering/kmean_rgb/Makefile.am: New makefile. + * demo/clustering/kmean_rgb/kmean_rgb.cc: New source file. + + Benchmark distance algorithm for the kmean algorithm. + + * bench/clustering/distance: New directory. + * bench/clustering/distance/Makefile.am: New makefile. + * bench/clustering/distance/distance.cc: New source file. + +2010-06-24 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Define documentation files. + + * README: Delete this file and replace it by README.green. + * README.green: New index for source files in scribo/sandbox/green. + * README.img: New index for image database. + * README.result: New index for histogram database. + +2010-06-23 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Define gnuplot shell export format. + + * mln/io/plot/save_image_sh.hh: New header file. + + Give an example of code. + + * use/io/plot/save_image_sh: New directory. + * use/io/plot/save_image_sh/Makefile.am: New makefile. + * use/io/plot/save_image_sh/save_image_sh.cc: New source file. + + Make some unitary tests on gnuplot shell export. + + * tests/io/plot/save_image_sh: New directory. + * tests/io/plot/save_image_sh/Makefile.am: New makefile. + * tests/io/plot/save_image_sh/save_image_sh.cc: New source file. + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Define accumulator which computes histogram view as image. + + * mln/img_path.hh: New header file. + + Define the 1d component version of the the library. + + * mln/accu/stat/histo1d.hh: New header file. + + Give an example of code. + + * use/accu/stat/histo1d: New directory. + * use/accu/stat/histo1d/Makefile.am: New makefile. + * use/accu/stat/histo1d/histo1d.cc: New source. + + Make some unitary tests on histo1d library. + + * tests/accu/stat/histo1d: New directory. + * tests/accu/stat/histo1d/Makefile.am: New makefile. + * tests/accu/stat/histo1d/histo1d.cc: New source. + + Define the 2d component version of the the library. + + * mln/accu/stat/histo2d.hh: New header file. + * mln/value/rg.hh: New header file. + * mln/fun/v2v/rgb_to_rg.hh: New header file. + + Give an example of code. + + * use/accu/stat/histo2d: New directory. + * use/accu/stat/histo2d/Makefile.am: New makefile. + * use/accu/stat/histo2d/histo2d.cc: New source. + + * use/value/rg: New directory. + * use/value/rg/Makefile.am: New makefile. + * use/value/rg/rg.cc: New source. + + * use/fun/v2v/rgb_to_rg: New directory. + * use/fun/v2v/rgb_to_rg/Makefile.am: New makefile. + * use/fun/v2v/rgb_to_rg/rgb_to_rg.cc: New source. + + Define the RGB 3d component version of the the library. + + * mln/accu/stat/histo3d_rgb.hh: New header file. + * mln/fun/v2v/rgb8_to_rgbn.hh: New header file. + + Give an example of code. + + * use/accu/stat/histo3_rgb: New directory. + * use/accu/stat/histo3d_rgb/Makefile.am: New makefile. + * use/accu/stat/histo3d_rgb/histo3d_rgb.cc: New source. + + * use/fun/v2v/rgb8_to_rgbn: New directory. + * use/fun/v2v/rgb8_to_rgbn/Makefile.am: New makefile. + * use/fun/v2v/rgb8_to_rgbn/rgb8_to_rgbn.cc: New source. + + Make some unitary tests on histo3d library. + + * tests/accu/stat/histo3d_rgb: New directory. + * tests/accu/stat/histo3d_rgb/Makefile.am: New makefile. + * tests/accu/stat/histo3d_rgb/histo3d_rgb.cc: New source. + + + Define the HSL 3d component version of the the library. + + * mln/accu/stat/histo3d_hsl.hh: New header file. + + Give an example of code. + + * use/accu/stat/histo3_hsl: New directory. + * use/accu/stat/histo3d_hsl/Makefile.am: New makefile. + * use/accu/stat/histo3d_hsl/histo3d_hsl.cc: New source. + + Make some unitary tests on histo3d library. + + * tests/accu/stat/histo3d_hsl: New directory. + * tests/accu/stat/histo3d_hsl/Makefile.am: New makefile. + * tests/accu/stat/histo3d_hsl/histo3d_hsl.cc: New source. + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Import files from milena/sandbox/green. + + * gaussian.sh: New gnuplot shell file. + * guassian2d.sh: New gnuplot shell file. + * test_labelling.cc: New source. + * tests/clustering/k_mean/Makefile.am: New makefile. + * tests/clustering/k_mean/k_mean.cc: New source. + * tests/clustering/kmean1d/Makefile.am: New makefile. + * tests/clustering/kmean1d/kmean1d.cc: New source. + * tests/io/plot/save_image_sh/Makefile.am: New makefile. + * tests/io/plot/save_image_sh/save_image_sh.cc: New source. + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Import files from milena/sandbox/green. + + * mln/accu/stat/histo1d.hh: New header file. + * mln/accu/stat/histo2d.hh: New header file. + * mln/accu/stat/histo3d_hsl.hh: New header file. + * mln/accu/stat/histo3d_rgb.hh: New header file. + * mln/clustering/k_mean.hh: New header file. + * mln/clustering/kmean1d.hh: New header file. + * mln/clustering/kmean2d.hh: New header file. + * mln/clustering/kmean3d.hh: New header file. + * mln/clustering/kmean_rgb.hh: New header file. + * mln/display/display_histo.hh: New header file. + * mln/display/project_histo.hh: New header file. + * mln/fun/p2b/achromatic.hh: New header file. + * mln/fun/p2b/component_equals.hh: New header file. + * mln/fun/v2v/achromatism.hh: New header file. + * mln/fun/v2v/hue_concentration.hh: New header file. + * mln/fun/v2v/int_u16_to_int_u14.hh: New header file. + * mln/fun/v2v/int_u16_to_int_u14.hh: New header file. + * mln/fun/v2v/log.hh: New header file. + * mln/fun/v2v/rg_to_rgb.hh: New header file. + * mln/fun/v2v/rgb8_to_int_u8: New header file. + * mln/fun/v2v/rgb_to_achromastism_map.hh: New header file. + * mln/fun/v2v/rgb_to_hsv.hh: New header file. + * mln/fun/v2v/rgb_to_hue_map.hh: New header file. + * mln/fun/v2v/rgb_to_saturation_map.hh: New header file. + * mln/fun/v2v/rgb_to_value_map.hh: New header file. + * mln/img_path.hh: New header file. + * mln/io/plot/save_image_sh.hh: New header file. + * mln/math/cell.hh: New header file. + * mln/math/floor.hh: New header file. + * tests/accu/stat/histo1d/Makefile.am: New makefile. + * tests/accu/stat/histo1d/histo1d.cc: New source. + * tests/accu/stat/histo2d/Makefile.am: New makefile. + * tests/accu/stat/histo2d/histo2d.cc: New source. + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Save histogram library. + + * mln/accu/histo/histo1d.hh: New header file. + * mln/accu/histo/histo2d.hh: New header file. + * mln/accu/histo/histo3d_rgb.hh: New header file. + * mln/accu/histo/histo3d_hsl.hh: New header file. + +2010-06-21 Yann Jacquelet <jacquelet(a)lrde.epita.fr> + + Simple integration test. + + * README: New text file. + * ok/mln/img_path.hh: New header file. + * ok/mln/accu/histo/histo1d.hh: New header file. + * ok/mln/accu/histo/histo2d.hh: New header file. + * ok/mln/accu/histo/histo3d.hh: New header file. + * ok/test/accu/histo/gaussian.sh: New gnuplot script file. + * ok/test/accu/histo/histo1d.cc: New source file. + diff --cc scribo/sandbox/green/README.green index 02d8654,5d6e147..e649eb8 --- a/scribo/sandbox/green/README.green +++ b/scribo/sandbox/green/README.green @@@ -394,23 -473,739 +473,739 @@@ centres) X REGIONAL MAXIMA ----------------- - ==> to do - - - XI ANNOTATING - ------------- - - ==> to do - - - a) La sauvegarde des images au format gnuplot shell - - * mln/io/plot/save_image_sh.hh: Librairie sauvegarde format gnuplot shell. - - to do ... - - - - - + Pour cette partie, le temps a commencé à s'accélérer, ce qui fait + qu'il n'y a plus de tests unitaires. Par ailleurs, comme la + fonctionnalité n'a pas été pensée comme un élément de la librairie, il + n'y a donc pas non plus de répertoire "use" à cet effet. + + + a) Segmentation basé sur le watershed + + Cet exemple essaye une première méthode de filtrage de + l'histogramme. A noter elle ne compile pas. Elle eu compilé dans le + temps, mais le source a été tellement remanié que sa reconstruction + doit régler encore quelques détails. Sa compilation n'a pas vraiment + d'intérêt en soi, seule la démarche compte ici. Le temps me manque et + je ne persisterais pas à essayer de le faire compiler à tout prix. D'autres + sources sont beaucoup plus intéressant. Nota, gaussian.sh est un gnuplot + script shell qui sert à calibrer le filtrage de l'histogramme. Il permet + de déterminer visuellement la taille de la fenêtre win utilisée lors de la + convolution en fonction d'un écart type sigma donné. + + * demo/labeling/watershed: Demonstrator de la segmentation d'un histogramme. + + + b) Second essai avec les regional_maxima + + Le programme actuel ne compile pas non plus. Il n'est pas d'une grande + importance, alors du coup je le laisse tel quel. Il a servi a + plusieurs choses, en premier à tester les regional_maxima mais en + dernier lieu surtout à tester le filtrage par attribut (volume) qui + semblait avoir quelques soucis. A l'heure d'aujourd'hui, je ne peux + toujours pas dire s'il fonctionne convenablement ou non, il semble que + parfois des anomalies se produisent à ce niveau, mais elles peuvent + aussi bien être générées par un problème interne à mon programme. + + * demo/labeling/regional_maxima: Testeur du filtrage par attribut de volume. + + + c) Déplacement du programme b) dans exp. + + Même programme que b) mais qui compile. + + * exp/labeling/regional_maxima: Testeur du filtrage par attribut de volume. + + + d) Sources importantes ==> regional_maxima + + Il y avait une autre version des regional_maxima ou toute la chaine était + présente, si j'avais davantage de temps, je l'aurais réecrite. Il semble + qu'elle se soit perdue lors de la migration de SVN vers GIT. Aucune importance. + Les outils "up to date" sont ceux dont les sources sont dans tools. La classe + outil représente des binaires un peu plus travaillé au niveau de l'interface + texte, en gros ils prennent plein de paramètres et génèrent des résultats + intermédiaires. Chaque outil à son usage ... + + + Ce qu'il faut savoir sur l'outil histo. Tout d'abord le programme + prend 7 ou 8 arguments et c'est le dernier qui est optionnel. Les + arguments sont l'image couleur à partir de laquelle on veut extraire + l'histogramme couleur (3d), le degré de quantification que l'on veut + utiliser (sous échantillonnnage de l'image), le chemin de l'image + couleur quantifiée résultante après analyse, le chemin de + l'histogramme produit (réutilisé par les autres outils), la + visualisation rouge/verte de l'histogramme (brute) et la visualisation + augmentée de ce même histogramme avec les maxima dessus. Se reporter à + la documentation des histogrammes pour avoir plus d'information sur ce + sujet. Le dernier paramètre optionnel est un masque à appliquer sur + les pixels de l'image d'entrée. La chaine de traitement de l'outil, + commence par sous échantillonner l'image en n bits, n < 8, puis + construit l'histogramme 3d à partir des pixels présents dans le masque, + si ce dernier existe et enfin sauvegarde des résultats et des images + servant à la visualisation. + + * tools/labeling/histo: Construction de l'histogramme. + + + Ce qu'il faut savoir sur l'outil de filtrage de l'histogramme. Tout + d'abord, il prend en paramètre 6 arguments obligatoires. Les arguments + sont la quantification utilisée par l'outil de création de + l'histogramme, le chemin de l'histogramme à filtrer, le seuil utilisé + pour le filtrage (c'est le volume minimal en dessous duquel + l'information est jugée comme du bruit et donc ne doit pas passer), le + chemin de l'histogramme filtré, le chemin de la projection en densité + de l'histogramme et le chemin de la projection en couleurs + majoritaires de l'histogramme. Se reporter au chapitre sur la + visualisation pour comprendre les différentes projections. Le filtrage + est un traitement très simple, il applique uniquement l'algorithme + morphologique d'ouverture sur les attributs de volume. Imagine un + histogramme en 1d, l'attribut de volume est alors la surface sous la + courbe de l'histogramme. Une ouverture volumique consiste à supprimer + tous les pics ayant un volume inférieur au seuil. Cela fonctionne très + bien en général, toutefois, il y a des cas où les informations + retournées ne sont pas celles attendues. Concrêtement, des composantes + de volume inférieur au seuil sont retrouvées plus loin dans la chaine + de traitement, ce qui contredit l'usage de l'ouverture + morphologique. Il est difficile de définir ce qui se passe vraiment, + il est possible qu'il y ait un bug ou simplement que le reste de ma + chaine induise quelque fois ce résultat étrange. Honnêtement, je ne + sais pas ce qui se passe. Le cas n'arrive pas fréquemment, donc il est + très difficile d'isoler l'erreur. + + * tools/labeling/opening: Filtrage de l'histogramme. + + + Ce qu'il faut savoir sur l'outil de labellisation. Tout d'abord, il + prend 11 arguments dont le dernier est optionel. Les arguments sont + l'image originale (nécessaire pour calculer la couleur moyenne des + labels ==> réalité augmentée), la quantification utilisée + précédemment, l'image préalablement quantifiée, l'histogramme + original, l'histogramme filtré, le voisinage sur lequel effectué les + opérations (c6, c18 ou c26), l'histogramme segmenté en 3d, la + projection red/green associée, la colormap, l'image reconstruite des + moyennes associé à chaque label et éventuellement un fichier décrivant + les statistiques associés aux labels (couleur moyenne associé au + label, plus nombre de pixels concernés dans l'image, plus pourcentage + absolu et pourcentage sans tenir compte du fond). Le seul appel + intéressant est la labellisation de l'histogramme filtré qui produit + une image 3d de label. Tout le reste est de la tuyauterie pour faire + de la rélatité augmentée. Par exemple pour formée l'image des moyennes + associées à chaque label, il est nécessaire de construire l'image 2d + des labels qui fait intervenir elle-même l'image d'entrée quantifiée + et l'image originale. Idem pour la construction de la + colormap. L'outil segmente l'histogramme filtré par la détermination + des maxima régionnaux, autrement dit des zones de très fortes + densités. Ces zones sont en général très petites, quelques pixels pas + plus. C'est pourquoi l'outil suivant va nous servir à les étendre un + peu. + + * tools/labeling/regmax: Segmentation de l'histogramme. + + + Petite suprise désagréable, l'outil iz ne compile plus. La raison en + est toute simple, il y a eu du mouvement dans les fonctions + mln::transform::influence_zone_geodesic(). Un revamp un peu violent, + avec une version + mln::transform::influence_zone_geodesic_saturated(). J'ai corrigé le + changement d'appel, mais cela ne suffit pas. Dans la méthode + mln::transform::influence_zone_geodesic_fastest(), l.127, tu utilises + la méthode at() pour une image 2d et là pas de chance, moi j'utilise + cet algorithme pour une image de labels 3d (nous sommes dans un espace + RGB quantifié en n bits, n < 8). Je ne veux surtout rien détruire dans + scribo, donc je te laisse effectuer les changements qui s'imposent et + je continue la documentation. + + Ce qu'il faut savoir sur iz. Tout d'abord cette routine prend 12 + arguments dont le dernier est optionel. Les arguments sont + l'histogramme labelisé par l'outil précédent, la profondeur utilisée + pour l'influence par zone géodésique (0 signifie l'infini), puis vient + le voisinage 3d utilisé pour la propagation, puis l'image initiale, + puis le degrée de quantification utilisé par tous les outils, puis le + dump de l'histogramme, la colormap (utilisée pour la projection r/g + avec segmentation, puis l'histogramme labelisé après propagation nommé + iz et enfin la projection r/g, l'image reconstruite à l'aide des + moyennes des classes et le fichier de statistiques intégrant la + propagation des classes. La propagation a pour vocation d'agrandir les + classes obtenues jusqu'à maintenant. C'est une information que l'on + voit bien avec les changements dans les projections r/g. + + * tools/labeling/iz: Propagation des classes par zone d'influence. + + + Comme le paramétrage est difficile, il est conseillé de relire les + scripts des jeux de tests qui coordonnent l'appel de ces routines avec + une sucession de paramètres cohérents. Je sais ce que tu vas me dire, + c'est mal, il ne faut pas mettre d'images sur le dépot git. Dans + l'absolu, je suis d'accord, mais aujourd'hui, le code iz est cassé et + rejouer ces tests peut prendre énormément de temps, donc par facilité, + je me contente des résultats que j'avais archivé et que tu seras + content de trouver pour en inclure une partie dans ton rapport. + + Tout d'abord un jeu de répertoire de test en instance d'être lancé. Le + répertoire porte le nom de l'image sur laquelle est effectué le + test. On y trouvera l'image originale pleine résolution, et les deux + masques de gradient fin et un peu plus épais. Pour faire le test, il + suffit d'écrire le script comme dans doc/labeling/mp00307. + + * doc/labeling/mp00215c + * doc/labeling/mp00234c + * doc/labeling/mp00248c + * doc/labeling/ta00031c + * doc/labeling/ta00083c + + + Puis, nous avons les tous premiers tests qui ont servi pour déterminer + la quantification à utiliser et la méthode de propagation (infinie ou + saturée). Il y a longtemps, pour ces tests, je disposais d'une chaine + complète mais cette dernière c'est perdu dans la migration entre svn + et git. Il n'y a donc pas de script shell qui lance les outils, par + contre il existe un fichier de synthese qui explique exactement ce qui + a avait été lancé et avec quels paramètres, histoire de pouvoir rejouer le test. + + * doc/labeling/cmp_method: Test sur le type de propagation à utiliser. + * doc/labelling/cmp_quant: Test sur la quantification a utiliser. + + + Puis, nous avons les tests effectués à l'aide d'un script. Lire les + scripts pour situer correctement les binaires outils utilisés. Le + premier jeu test avait pour but d'étudier la combinatoire des options + et de choisir ensuite les paramètres qui vont bien. Il n'y a pas de + certitude complète en la matière. Lire attentivement le fichier + synthèse. Tout ces éléments ont été validés par théo. Je ne me rapelle + plus du détail, mais j'ai rédigé tout ce que je pouvais. Le dernier + répertoire n'a pas de fichier synthèse, je pense que l'étude était du + même gabarit que le test précédent. J'en étais à tester la routine sur + un maximum d'images pour voir si le jeu réduit de couleurs obtenues + correspondait à nos attentes ou non. Les paramètres stables sont à + rechercher dans les derniers répertoires mp00042c et mp00307c. + + * doc/labeling/mp00307c_bis: Test sur un grand nombre de combinaisons. + * doc/labeling/mp00411c: Test sur l'altération des statistiques. + * doc/labeling/mp00042c: Test sur la representativité des couleurs trouvées. + * doc/labeling/mp00307c: Test sur la representativité des couleurs trouvées. + + + XI AUTRES ASPECTS DOCUMENTAIRES + ------------------------------- + + Ces exemples de codes sont livrés tels quels sans aucune documentation + de ma part. Si tu as besoin de quelque chose, sert toi, tu les + remanieras à ta sauce. Il n'y a pas de raison de les documenter, se + serait disperser mes efforts vainement. + + * doc/examples/accu_color: Petit programme pour se bidouiller avec la couleur. + * doc/examples/frac: Librairie pour manipuler des fractions sous milena. + * doc/examples/hello_milena: Petit exemple allant avec la doc de milena. + * doc/examples/hello_world: Test de la plateforme c++. + * doc/examples/io: Rien de vraiment intéressant dans l'état actuel. + * doc/examples/learn_milena: Autre exemple de base avec milena. + * doc/examples/otsu: Petit programme Otsu. + * doc/examples/stats: Exemple de manipulation d'accumulateurs. + + + Voici deux exemples sous LaTex. Un jeu de test avec la confection de + vecteur et de matrices pour relater les forrmules connues en espace + 3d. La version actuelle est dégradée par rapport à ce que j'avais pu + écrire. J'étais arrivé à la mise au point d'un extracteur de valeurs + propres mais je n'ai jamais pu retrouver cette version là, surement + une erreur sous svn. Le second document devait présenter la + documentation quick tour sous milena, mais j'avoue que c'est un + lamentable échec, je n'ai pas pris le temps de le faire. Je pense que + l'idée d'une documentation collaborative permettrait de répartir + l'effort. + + * doc/formulae: LaTex directory. + * doc/quick_tour: LaTex directory. + + + XII ANNOTATING + -------------- + Tout d'abord, voici les notes documentaires qui ont été réalisées sur + la problématique d'annotation d'image. On trouvera un fichier + class.txt qui a pour but de poser quelques réflexions sur les types de + classes de document. Les informations ne sont pas abouties mais + permettent de défricher un peu le terrain. Le document + syntheseMillet2008 est un compte-rendu de lecture des parties + relatives à nos travaux dans la thèse de Millet. Pour bien comprendre + mon travail, il est impératif de lire les travaux de Millet, ou + simplement ce compte-rendu. Le dernier document est moins intéressant, + il s'agit d'une note de travail sur les indicateurs de Millet bruts de + fonderie (testMillet2008). Cette note n'est ni achevée, ni + aboutie. Elle conclue sur le fait que les indicateurs et les seuils + donnés par Millet dans sa thèse sont complètement à revoir pour nos + besoins. Notemment, des tests sur la détection des images par rapport + aux cliparts nous ont convaincu que certaines images AFP contiennent + des de grandes zones homogènes qui induisent des erreurs dans les + prédicteurs de Millet. Néanmoins, les cas particuliers qui + contredisent les aspects opérationnnels de Millet n'enlèvent pas sa + réflexion: Les images noir/blanc (ou monochromes) ont une très faible + saturation, et/ou une forte concentration de la teinte. Les cliparts + ont une forte concentration de niveaux de gris autour d'un pic. + + * doc/annotating: La documentation relative à l'annotation. + + + Après la lecture des descripteurs de Millet, un des premiers réflexe a + été d'en implémenter plusieurs pour voir ce qu'ils pouvaient ressortir + sur les images que nous avions. Le descripteur BIC sépare une image en + deux ensembles de pixels, les points intérieurs et les points + extérieurs. Les points intérieurs ont la propriété d'être de même + couleur que leur 4-voisins. Attention, la couleur est évaluée dans un + espace RGB à 3 bits. + + * demo/annotating/bic: Histogrammes des points intérieurs et extérieurs. + + + Le descripteur LEP, lui, propose de seuiller par sobel l'image et de + faire l'histogramme des configurations du voisinage des points + seuillés. Pour ce faire, on utilise une convolution un peu spéciale + qui va attribué un unique id en fonction du voisinage. + + * demo/annotating/lep: Histogramme des configurations des voisinages des pixels. + + + Un autre descripteur simple est le nombre de couleur dans une + image. Pour cela, il est possible de construire l'histogramme des + couleurs et de compter les cellules pleines. On peut éventuellement + appliquer une quantification sur l'espace des couleurs. La + compilation laisse place à d'étranges warnings sur une comparaison + entre entiers signés et non signés, mais je n'ai pas la main dans mon + code (ou je ne sais pas comment faire) pour enlever ces warnings. Ils + sont récents, je n'avais pas souvenir de les avoir eu. + + * demo/annotating/nb_color: Compte le nombre de couleurs dans une image. + * exp/annotating/nb_color: Adaptation pour fonctionner sur une base d'image. + + + L'histogramme RGB-64 est un descripteur simple qui quantifie les + couleurs sur 2 bits et réalise l'histogramme dans cet espace. C'est + bien sûr une classification gros grain, mais ajouté au reste ... La + version RGB-64-9 ajoute une phase de division de l'image en 9 sous + images. De cette manière, l'histogramme RGB-64 est construit sur les 9 + sous images. Pour former le descripteur final, on fusionne les neufs + histogrammes. + + * demo/annotating/rgb_64: Histogramme couleur dans l'espace RGB-64 (2 bits/axe). + * demo/annotating/rgb_64_9: Histogramme RGB-64 sur les 9 sous images. + + + Le descripteur de projection relaté par Millet est particulier. En + premier lieu l'image est sous échantillonnée pour réduire sa dimension + à 100 x 100 de manière à borner la taille des vecteurs obtenus au + final. Puis l'image est seuillée par sobel (threshold = 100). L'image + est d'abord divisée horizontalement en deux. Puis on établit la + projecton perpendiculairement à la séparation de manière à obtenir + deux vecteurs de 100 valeurs chacunes. On recommence l'opération en + divisant maintenant l'image verticalement. L'union des 4 vecteurs + forme le descripteur de projection. L'information condensée dans ces + vecteurs est simplement la répartition des contours de manière + horizontale ou verticale. + + * demo/annotating/project: Répartition des contours horizontaux et verticaux. + + + La reconnaissance des cliparts s'appuie sur une analyse d'histogramme + qui est fournie dans le code suivant. L'idée est de dire qu'une image + de type clipart va être reconnaissable surtout à l'aide de ces + contours. La couleur existe mais est très grossière. Le faitde + dessiner à la main implique de simplifier énormément, de caricaturer, + le remplissage. Du coup, une analyse en niveau de gris de + l'histogramme révèle très peu de nuances. Il peut cependant en avoir + un peu. Néanmoins, il existe des logiciels pour aider à la fabrication + des cliparts qui proposent l'usage de dégradé, ce qui nuit à cette + méthode de reconnaissance. Millet analyze l'histogramme normalisé + (histogramme divisé par son pic) et regarde si son energie ne serait + pas concentrée autour du pic (5 pixels de chaque côté + maximum). Parfois cette méthode ne fonctionne pas correctement sur des + photographies qui ont un cadre uniforme. La méthode trouve un pic (le + cadre) et vérifie alors qu'une proportion non négligeable des pixels + sont bien autour de ce pic (tout dépend de l'épaisseur du cadre). Pour + palier à cet inconvénient, Millet propose d'utiliser ce test, non plus + sur l'image entière, mais sur chacune des 16 sous images après un + découpage géométrique régulier. De facto, la contribution du cadre + diminue suffisemment pour repasser en dessous du seuil de + reconnaissance. + + * demo/annotating/stddev_color: Descripteur utilisé reconnaitre des cliparts. + * exp/annotating/stddev_color_16: Adaptation pour le travail sur base. + * demo/annotating/stddev_color_16: Descripteur pour cliparts avec 16 imagettes. + * exp/annotating/stddev_color: Adaptation pour le travail sur une base d'image. + + + A partir de maintenant, tous les morceaux de codes réalisés préparent + directement ou indirectement le résultat de la classification des + bases (exp/annotating/bench). + + Plus de temps pour faire le code use correspondant aux fichiers + librairies. Tout le code pour le faire est dans hsv. Rien de + compliqué, mais allons à l'essentiel. + + Le but du code HSV est d'effectuer les tests de Millet ou des + améliorations sur ces tests. Le premier test proposé par Millet est + l'achromaticité. Il s'agit de regarder s'il existe une faible + variation entre les trois canaux (R/G/B) pour un grand nombre de + pixels. Si c'est le cas, c'est que l'image est presque en niveau de + gris et peut être remplacée facilement par une image grisée sans trop + de distorsions au niveau de la couleur. Nous avons essayer de + généraliser un peu le test de manière à produire, non pas seulement + une réponse sur l'achromaticité de l'image, mais aussi avoir une vue + d'ensemble (sous forme d'image) des variations entre les cannaux pour + chaque pixel. Il n'est pas utile d'analyser les différences sur chacun + des canaux, prendre la différence absolue entre le canal min et le + canal max suffit pour définir le test d'achromaticité. + + Les autres tests de Millet sont la faible saturation et la dominance + de la teinte. Pour savoir si la saturation est faible, il faut + utiliser un histogramme du canal dédié à la saturation. Si 95% des + pixels sont en dessous de 100, alors l'image est faiblement saturée, + elle est en noir et blanc. De la même manière, on regarde la dominance + de la teinte. Pour ce faire, il faut voir si l'histogramme de la + teinte ne possède pas un pic avec une très faible variance (tout + rapproché autour du pic). Si c'est le cas, la dominance de la teinte + est avérée et l'on peut calculé la couleur dominante. L'image est en + niveau de gris, mais colorisé autour d'une couleur (par cepia, vert + ...). + + Ce programme est très très sujet à changements, il m'a servit de test + et je ne peux pas juré qu'il est complètement sain au niveau du + traitement. D'autres versions sont potentiellement plus + stables. Notemment celle dans exp/annotating/hsv. + + * mln/fun/v2v/rgb_to_achromatism_map.hh : Distance pour l'achromaticité. + * mln/fun/v2v/achromatic.hh : Define the achromatic map. + * mln/fun/v2v/hue_concentration.hh : Define the distance hue/peak map. + * mln/fun/p2b/achromatic.hh : Say if a site is achromatic. + * demo/annotating/hsv: Code des différents tests de Millet. + + + Dans le répertoire exp/annotating/hue, on trouve 3 fichiers textes qui + rassemblent des classes d'images. Tout d'abord les images ICDAR + n'ayant que du texte et des traces de couleurs (lettrine de couleur, + trait, petit bandeau), un fichier où il n'y a que du texte noir & + blanc et un fichier contenant les images couleurs (avec photographies + ou dessins). Cette classification a été effectuée de manière manuelle. + Le code hue test la proportion de pixels étant autour du pic de + teinte. Il s'agit de savoir si la dominance d'une teinte est + avérée. Le code renvoit la proportion de pixels agglomérés autour du + pic. Le but est de généralisé les tests de millets pour qu'ils se + ressemblent le plus possible. + + * exp/annotating/hue: Implémentation de la généralisation du test de Millet. + * mln/fun/v2v/rgb_to_hue_map.hh : Construction de la map de teinte. + + + On retrouve les trois fichiers permettant de classifier la base ICDAR + en trois sous populations. Le test de saturation consiste simplement à + regarder si une certaine quantité de la population de l'histogramme de + saturation est en dessous d'un certain seuil. La généralisation du + test ne porte pas sur le test en lui-même, mais sur la forme dans + lequel le test est fait. + + * exp/annotating/saturation: Implémentation de la généralisation du test. + * mln/fun/v2v/rgb_to_saturation_map.hh : Construction de la map de saturation. + + + Le test de value a déjà été décrit précédemment dans + stddev_color. L'idée est toujours la même, mais cette fois il est + effectué dans l'espace des valeurs (HSV). Cela ne change pas grand + chose, puisqu'il était utilisé sur des images en niveau de gris. C'est + l'un des tests importants car il réagit à la différentiation entre une + image type photographie et une image plus stylisée comme un + clipart. Ce test a aussi des vertus pour la distinction entre du noir + & blanc et de la couleur. Il s'avère que les images type photographie + avec pleins de couleurs ont un histogramme moins sujet aux pics que + les histogrammes noir & blanc. De facto, l'énergie de l'histogramme + est distribué sur l'ensemble de la plage contrairement aux images noir + & blanc où il y a une concentration de chaque côté de l'histogramme + (bipolarité). + + * exp/annotating/value: Implémentation de la généralisation du test de Millet. + * mln/fun/v2v/rgb_to_value_map.hh : Transformation d'espace. + + + Le programme hsv reprend les tests préalablement élaborés auparavant + sur les plans H, S puis V. Il combine tout en un seul programme pour + avoir une vision plus synthétique de ce qui se passe sur les 3 espaces + simultanément. + + Les tests incorpore mes transformations. C'est à dire que l'on + effectue une série de test équivalent à ceux de Millet (au moins dans + l'idée et le plus souvent, il s'agit d'une réecriture sous une autre + forme) en partant des histogrammes normalisés. Un histogramme + normalisé est un histogramme de flottant qui contient l'histogramme + classique divisé par le nombre total de pixels. En faisant cela, on se + déplace dans l'espace des distributions. Si l'histogramme n'a qu'un + seul pic et que ce dernier contient tous les pixels (pic de dirac par + exemple), alors l'histogramme normalisé donnera 1 comme valeur de + proportion à ce pic. En fait, l'intégrale d'une distribution vaut + 1. Le but des distributions est de s'affranchir des caractéristiques + de taille de l'image, ce qui permet de comparer les histogrammes entre + eux. On peut ainsi comparer les histogrammes d'une photo AFP petit + format avec celui d'une image grand format de la base ICDAR. Le but du + jeu est de garder les idées de Millet dans ce nouvel espace. Les tests + obtenus sont équivalents mais pas identiques. + + Pour la teinte, une fois l'histogramme normalisé obtenu, on cherche à + savoir s'il existe un pic avec une forte proportion de l'histogramme + autour de ce pic. Plutôt que le pic, nous prenons la moyenne qui est + un opérateur un peu plus robuste et nous calculons la proportion de + l'histogramme autour (un seuil donné en paramètre défini le périmètre + du calcul). L'expression sous forme de proportion plutôt que sous la + forme d'une variance rend le test homogène avec les autres tests. + + Pour la saturation, après normalisation, on regarde la proportion de + l'histogramme en dessous d'un certain seuil. Il n'y a pas de + changement significatif par rapport au test de Millet. Le seuil + initialement proposé par Millet était 100, il a été adapté car nos + bases sont différentes des siennes (le notre est à 25). + + Le test sur les valeurs (cliparts contre photos) a vraiment un intérêt + au delà de ce cas d'utilisation. Il nous renseigne sur la + concentration autour d'un pic de l'histogramme ou non. Nous préferrons + la mesure de similarité à l'équi-répartition des densités, mais l'idée + est exactement la même. Est-ce que notre histogramme est plat ou + inversement, est-ce que les contributions sont rassemblées autour d'un + pic? Si une image est noir et blanc, il existera un pic correspondant + au fond et la densité s'éloignera fortement de la distribution + équiprobable. Dans le cas maintenant d'une image couleur, la + répartition est plus homogène, couvrant un large spectre dans le + domaine de l'histogramme. Du coup, la distribution semblera davantage + equi-répartie. On notera que nous prenons le test à l'envers de ce que + propose Millet. Il essaye de voir si il y a un pic et calcule une + forme de contribution normalisée autour de ce pic. Nous au contraire, + on regarde l'absence de pic et on calcule la différence entre la + densité et cette absence de pic. Notre avantage par rapport à Millet + est démontré particulièrement dans les cas où il existe plusieurs + grosses distributions. A contrario, notre test souffre des cas où il + existe de nombreuses petites distributions. + + + Voici un premier retour sur les expériementations: + La discrimination entre la base AFP et la base ICDAR peut se faire en + étudiant la forme des densités des niveaux de gris. Les images + naturelles semblent avoir un spectre recouvrant en général les 256 + niveaux de gris alors que les images de documents ont une présence + importante du fond. Dans le cadre d'une densité, ce qui est alloué sur + le fond ne peut se retrouver ailleurs. Une comparaison avec la densité + équiprobable nous renseigne donc sur la nature des images. Il semble + néanmoins qu'un certain nombre d'images défient ce dispositif. Par + exemple des gros plans sur des zones mono-teintée (ski, voile,site + web). + + * exp/annotating/hsv: Code unifiant les trois tests sur chacun des plans HSV. + * mln/fun/v2v/rgb_to_hue_map.hh : Transformation d'espace. + * mln/fun/v2v/rgb_to_saturation_map.hh : Transformation d'espace. + * mln/fun/v2v/rgb_to_value_map.hh : Transformation d'espace. + + + Le test sur l'achromatisme des images est décrit dans le code + suivant. Il a été purement et simplement abandonné dans la mesure où + c'est un cas très particulier qui est repris par une saturation très + faible. La saturation s'exprime comme 1 - min(channel)/max(channel), + mais dans le cas où le min(channel) == max(channel), la saturation + vaut 0. Le problème vient plutôt du calcul de la teine qui ne peut pas + admettre que le min soit égal au max. Pour ce calcul, on se débrouille + pour gérer le cas et renvoyer une valeur standardisée, Millet + proposait -1. + + * exp/annotating/achromatism: Détection d'image couleur en niveau de gris. + * mln/fun/v2v/rgb_to_achromatism_map.hh : Transformation d'espace. + + + Ce programme a pour but de créer les histogrammes normalisés en rafale + pour les bases AFP et ICDAR. Il assure leur création dans les six + plans possibles R,G,B,H,S,V. De cette manière il est possible de + vérifier les corrélations éventuelles entre le canal B et G. Par + ailleurs, après visionnement de tous les histogrammes, on note des + spécificités dans les deux bases sur les plans S et V. Certaines + images ont des réactions très fortes sur le plan H, mais ce n'est pas + une caractéristique pour une base (seulement pour ces images en + question). Les résultats ont déjà été sauvegardés dans le répertoire + image du LRDE. Des infos sont notés à ce sujet dans README.result. Le + seul but de ce calcul est de maîtriser csujet dans README.result. Le + seul but de ce calcul est de maîtriser ce qui se passe dans ces + espaces, pas simplement de supposer ce qu'il pourrait s'y passer. La + comparaison des images est rendu possible quelque soit la base + d'origine par le fait qu'elles sont normalisées. Chaque fréquence des + histogrammes est divisée par la somme des fréquences. On obtient donc + une version discrète des densitées. La somme des nouvelles fréquences + vaut 1. On voit davantage si les densités se rapprochent d'une + équi-répartition ou non. La négative implique un ou plusieurs pics. Le + cas défavorable dans mon approche (qui existe pour certaines images) + est une multitude de tout petits pics autour de l'équi-répartition. Ce + n'est pas équi-répartie pour les calculs mais ce n'est clairement pas + la manisfestation d'une concentration de l'énergie quelque part. + + * exp/annotating/histo: Creation des histogrammes normalisés. + * mln/fun/v2v/rgb_to_hue_map.hh: Transformation d'espace. + * mln/fun/v2v/rgb_to_saturation_map.hh: Transformation d'espace. + * mln/fun/v2v/rgb_to_value_map.hh: Transformation d'espace. + + + Dans le programme erreur, on teste l'idée de jonathan. Une référence à + ce sujet peut être trouvée dans README.img. Les bases AFP et ICDAR + sont retravaillées à l'aide de ImageMagick et de Gimp pour diminuer le + nombre de couleurs initiales. On oblige à n'avoir que 30, 20 ou 10 + couleurs pour chaque base. Il y a donc 4 versions de chacune des bases + en comptant la version originale des images. Les algorithmes utilisés + par Gimp et ImageMagick sont très différents. L'idée de Jonathan était + de dire que lorsqu'une image est couleur, plus on réduit le nombre de + couleur, plus elle change vis-à-vis de l'image originale. Inversement, + si une image possède peu de couleurs (noir & blanc), sa dégradation ne + l'altérera pas tant que cela. Prenons une image d'un skieur de la base + AFP, en réduisant le nombre de couleurs, la combinaison marron va + devenir marron strictement homogène et la perception que nous en avons + est visuellement très altérée. A contrario, une image en noir & blanc + ne semble pas bouger d'un pouce. La comparaison avec la discrimination + sur la saturation ou la valeur montrera des résultats un peu meilleur + plus tard mais il impossible de préjuger a priori des résultats + futurs. L'erreur entre l'image initiale et l'image dégradée est + calculée avec le PNSNR (compression p278 Handbook Color). Le programme + calcule la dégradation et essaie de trouver automatiquement des seuils + de séparation pour les deux bases. 4 détection de seuils sont testées. + Ces seuils sont calculées avec deux bases représentatives des bases à + discriminer. En mode production, le seuil est vu comme une constante + pour le programme. Les deux premières classifications renvoient un + seuil calculée comme une moyenne pondérée des moyennes des populations + à discriminer. Le premier détecteur pondère par la déviation standard + et le second par la variance. Le troisième simule deux populations + gaussiennes de variances différentes et résoud l'équation de second + degré qui en résulte. Enfin, le dernier test ne préjuge pas des + distributions statistiques et réalise la minimisation de l'erreur de + classification. Pour cela, il suffit de compter le nombre d'images + bien classées et mal classées sur les bases d'apprentissage des + populations. On utilise pour cela la méthode Otsu. Le détecteur PNSRN + renvoie une valeur. Pour chaque population (AFP, ICDAR), on construit + l'histogramme de des valeurs obtenues. A noter, qu'il faut que les + valeurs du PNSNR soient ramenées entre 0 et 255. En pratique ce n'est + pas un problème, mais il faut le mettre en oeuvre, dans mon code, ce + n'est pas fait (les valeurs ne posaient pas de problème). Donc, pour + chaque seuil possible (de 0 à 256), on étudie la matrice de classement + (groupe 1 - détecté groupe 1, groupe 1 - détecté groupe 2, groupe 2 - + détecté groupe 1, groupe 2 - détecté groupe 2). L'erreur est + simplement la somme des quantités groupe x - détecté groupe y avec x + != y. Finalement, pour chaque seuil, il est possible de connaitre + l'erreur. Le processus de minimisation de l'erreur revient à chercher + le seuil associé à l'erreur minimale. C'est ce dernier test que nous + préconisons. Il faut mettre en lumière que ces quatre tests renvoient + à peu près les mêmes seuils. La minimisation de l'erreur étant le + meilleur de tous puisqu'il minimise directement l'erreur de + classification et c'est ce que nous cherchions en fin de compte. Un + cinquième test a été fait avec une analyse de fisher sur l'histogramme + des populations mélangées, mais c'est une idée saugrenue car nous + disposons à ce niveau des populations séparées et évidemment les + résultats sont moins bons. + + Petit rappel. Un vieux problème a été mis à jour ici. Lorsqu'on + calcule des informations sur un histogramme, le type temporaire qui + contient les résultats ne doit pas être le type qui encode les valeurs + des résultats. Par exemple, un histogramme de byte, un calcul de + variance tout simple où il faut stocker la valeur des pixels au carré + multiplié par leur occurrence tiendra facilement dans un long mais pas + dans un byte. Le sucre avec les acesseurs des itérateurs tend à + mélanger les genres. Une solution simple est de stocker la valeur de + l'histogramme dans un type pouvant effectuer les calculs et ensuite + retravailler avec ce type. Nous avions déjà discuté de ce problème et + je ne sais pas si tu avais pu corriger le problème. Si la + classification renvoit n'importe quoi, il se peut que cela provienne + de ce problème. Le problème ne se voit pas sur des calculs de + moyennes, il ne s'observe que sur certains calculs de variance (dépend + de la formule utilisée). + + * exp/annotating/error: Test de l'idée de jonathan (dégradation des couleurs) + + + Le travail dans bench.cc reprend toute sorte de travaux déjà réalisés + dans d'autres fichiers. Il a pour but de comparer ensemble tous les + descripteurs pour la reconnaissance de base de données entre l'AFP et + l'ICDAR. + + Le travail commence avec un certain nombres de routines travaillant + sur les histogrammes permettant de trouver le pic, la moyenne, la + variance et d'autres éléments. Les routines étaient éparpillées dans + le code, du coup je les ai regroupées au même endroit. Il y a des + redondances de code correspondant à des copier/coller ou à différents + essais. Prendre les versions les plus génériques et en faire des + accumulateurs serait un riche idée. + + Huit détecteurs sont comparés ensembles: + - hue1, détection d'un pic de teinte très dense par la méthode de Millet. + - sat1, détection d'une densité importante dans les saturations basses (Millet). + - lvl0, comptage du nombre de niveau de gris (idée de Millet). + - hue0, détection d'un pic de teinte par la méthode des densités. + - sat0, détection d'une forte basse saturation par la méthode des densités. + - val0, détection d'un pic de niveau de gris par la méthode des densités. + - val1, détection d'un pic de niveau de gris par la méthode de Millet. + - err, PNSNR (idée de jonathan). + + FIXME: Attention, le PNSNR n'est pas borné, il faut le faire, il doit avoir + au maximum 255 comme valeur. + + Tous les détecteurs ont été expliqués en large, en long et en travers + dans les sources précédentes. LIRE le chapitre XII (ANNOTATING) de ce fichier + en entier. + + Ensuite vient les séparateurs de population statistiques qui ont été + déjà introduit dans le fichier error. Bien que tous soient présent, + c'est la minimisation de l'erreur qui est utilisée. + + Enfin vient le front end, l'un des plus complexes que j'ai écrit cette + année. Le main lui même, n'est pas la partie la plus complexe. Il + définit les actions fonctionnelles à réaliser et la structure de + donnée réalisée pour garder la trace de tous les résultats. + - File_name : Cette variable retient le nom des fichiers. C'est un tableau + de la taille du nombre d'images rencontrées toute base confondue. Comme on + ne parcourt qu'une fois les répertoires, il faut pouvoir retenir cette + information qui servira éventuellement pour la nomenclature des dumps + par la suite. + - Result : Cette variable contient toutes les informations du traitement. + C'est un tableau à deux dimensions, une pour les images et une autre pour + les descripteurs. L'index d'image est le même que pour file_name. + - Size : Cette variable contient le nombre d'images par database. + - Threshold : Cette variable va stocker les seuils calculés sur chacun + des descripteurs. Ces seuils sont sensés effectuer la séparation entre les + deux bases. + - Cxx : variables de comptage des images bien ou mal classées relativement + à la position des seuils et à l'appartenance d'origine des images. Cette + appartenance d'origine est calculée à l'aide Size qui contient le nombre + d'image par base de données. Comme les images sont vues dans l'ordre, les X + premières appartiennent à la base ICDAR et les Y suivantes à la base AFP. + - histo : Variable servant à effectuer par database et par descripteur un + histogramme utilisé ensuite lors de la discrimination des bases. + + La partie compute_descriptors a pour mission de passer une fois sur + toutes les images et de calculer les descripteurs associés. A l'issue + de cette passe file_name, result et size sont remplis et pourront être + utilisés par les autres routines. + + La partie dump_descriptors a pour but de réaliser un tracé en gnuplot, + avec une couleur différente pour chaque base. Le graphe montre les + valeurs utilisées par chaque descripteur pour toutes les images de la + base. + + La partie correction des descripteurs est optionnelle et force un + certain nombre de valeurs pour être inférieures à 256. Le but était de + pouvoir travaillé, même si les descripteurs n'étaient pas complètement + opérationnels. Elle sert donc pour le debug. + + La partie calcul des histogrammes sert à obtenir la distribution des + valeurs de chacun des descripteurs en fonction des bases + utilisées. C'est une étape préliminaire à l'analyse des populations et + au calcul des seuils. + + La partie calcul des seuils repose sur la minimisation des erreurs de + classification. Cette méthode ne fonctionne bien si la classe zéro à + une moyenne inférieure à la classe un. Du coup, il n'est pas possible + de déterminer de manière simple si la classe 0 correspond à l'AFP ou à + l'ICDAR. Pour chaque descripteur, les cartes sont rebattues. + + Enfin, tous les histogrammes sont sauvés pour pouvoir comprendre et + visualiser les résultats. + + Le main2 ne sert à rien, juste pour des essais. + + Attention, modification VAL0/VAL1, vérifiez que le bon descripteur est + au bon endroit dans le tableau. + -* exp/annotating/bench: Comparaison des détecteurs pour la classif. ICDAR/AFP. ++* exp/annotating/bench: Comparaison des détecteurs pour la classif. ICDAR/AFP. diff --cc scribo/sandbox/green/mln/accu/stat/histo1d.hh index 7677d3b,fae94c8..e5c643d --- a/scribo/sandbox/green/mln/accu/stat/histo1d.hh +++ b/scribo/sandbox/green/mln/accu/stat/histo1d.hh @@@ -1,4 -1,4 +1,5 @@@ --// Copyright (C) 2007, 2008, 2009, 2010 EPITA LRDE ++// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory ++// (LRDE) // // This file is part of Olena. // diff --cc scribo/sandbox/green/mln/accu/stat/histo2d.hh index ee4d145,11a1bb3..67a3344 --- a/scribo/sandbox/green/mln/accu/stat/histo2d.hh +++ b/scribo/sandbox/green/mln/accu/stat/histo2d.hh @@@ -1,4 -1,4 +1,5 @@@ --// Copyright (C) 2007, 2008, 2009, 2010 EPITA LRDE ++// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory ++// (LRDE) // // This file is part of Olena. // diff --cc scribo/sandbox/green/mln/accu/stat/histo3d_hsl.hh index a8888cd,35d78e2..ba96978 --- a/scribo/sandbox/green/mln/accu/stat/histo3d_hsl.hh +++ b/scribo/sandbox/green/mln/accu/stat/histo3d_hsl.hh @@@ -1,4 -1,4 +1,5 @@@ --// Copyright (C) 2007, 2008, 2009, 2010 EPITA LRDE ++// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory ++// (LRDE) // // This file is part of Olena. // diff --cc scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh index 2fb6084,6a48024..cdfea4d --- a/scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh +++ b/scribo/sandbox/green/mln/accu/stat/histo3d_rgb.hh @@@ -1,4 -1,4 +1,5 @@@ --// Copyright (C) 2007, 2008, 2009, 2010 EPITA LRDE ++// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory ++// (LRDE) // // This file is part of Olena. // diff --cc scribo/sandbox/green/mln/clustering/kmean2d.hh index 51aaf49,4539083..145e7bc --- a/scribo/sandbox/green/mln/clustering/kmean2d.hh +++ b/scribo/sandbox/green/mln/clustering/kmean2d.hh @@@ -1,4 -1,4 +1,5 @@@ --// Copyright (C) 2007,2008,2009,2010 EPITA LRDE ++// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory ++// (LRDE) // // This file is part of Olena. // diff --cc scribo/sandbox/green/mln/display/display_histo.hh index ef47182,d48f47f..439b09f --- a/scribo/sandbox/green/mln/display/display_histo.hh +++ b/scribo/sandbox/green/mln/display/display_histo.hh @@@ -1,6 -1,6 +1,5 @@@ --// Copyright (C) 2007 EPITA Research and Development Laboratory (LRDE) --// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) --// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) ++// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory ++// (LRDE) // // This file is part of Olena. // @@@ -64,6 -149,22 +148,21 @@@ namespace ml display2_histo3d_unsigned(const image3d<unsigned>& histo, const value::int_u<n> ambiguous_color); - + /// \brief Allow the visualization of the color of the 3d segmented histo. + /// + /// Direction r = 1 + /// Direction g = 2 + /// Direction b = 0 + /// + /// \parameter[in] histo the histogram in 3d. + /// \parameter[in] label the label image to associate the result with. + /// \parameter[in] ambiguous_color the color when no max is found. + /// \result return the projection of the histogram in 2d. + /// + /// The 3d histogram is projected in red/green space. In the blue + /// direction we check the max blue component. The position in + /// this blue axis is associated to a segmented label and this label + /// is returned in the projection image. template <unsigned n> image2d<value::label_8> display2_histo3d_unsigned(const image3d<unsigned>& histo, diff --cc scribo/sandbox/green/mln/display/project_histo.hh index 30bcd6d,36a5542..9b9065e --- a/scribo/sandbox/green/mln/display/project_histo.hh +++ b/scribo/sandbox/green/mln/display/project_histo.hh @@@ -1,6 -1,6 +1,5 @@@ --// Copyright (C) 2007 EPITA Research and Development Laboratory (LRDE) --// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) --// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) ++// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory ++// (LRDE) // // This file is part of Olena. // @@@ -74,6 -191,24 +190,25 @@@ namespace ml project2_histo(const image3d<unsigned>& histo, const image3d<V>& label); ++ + /// \brief Allow the visualization with color of the 3d histo. + /// + /// Parameter A is the type of accumulator, for instance, accu::math::sum. + /// Parameter direction is the way of the projection, for instance blue one. + /// Parameter V is the value we use to accumulate information. + /// + /// Direction r = 1 + /// Direction g = 2 + /// Direction b = 0 + /// + /// \parameter[in] histo the histogram in 3d. + /// \parameter[in] ambiguous_color the color when no max is found. + /// \result return the projection of the histogram in 2d. + /// + /// The 3d histogram is projected in red/green space. In the blue + /// direction we check the max blue component. The position is + /// used to build a rgb color and put it as a returned value in + /// projection image. Not limited to red/green space. template <unsigned n, unsigned direction> image2d< value::rgb<n> > project3_histo(const image3d<unsigned>& histo, @@@ -91,18 -245,6 +245,7 @@@ # ifndef MLN_INCLUDE_ONLY - /// \brief Allow the visualization of 3d histogram. - /// - /// The 3d histogram is projected in 2d such as the data in that direction - /// are accumulated to the two others. - /// - /// Parameter A is the type of accumulator, for instance, accu::math::sum. - /// Parameter direction is the way of the projection, for instance blue one. - /// Parameter V is the value we use to accumulate information. - /// - /// \prameter[in] the histogram 3d. - /// \result the 2d projection of the 3d histogram. + template <typename A, unsigned direction, typename V> image2d<mln_result(A)> project_histo(const image3d<V>& histo) diff --cc scribo/sandbox/green/mln/fun/p2b/achromatic.hh index 1f45b2d,91a2dc5..892917d --- a/scribo/sandbox/green/mln/fun/p2b/achromatic.hh +++ b/scribo/sandbox/green/mln/fun/p2b/achromatic.hh @@@ -1,4 -1,4 +1,5 @@@ --// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) ++// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory ++// (LRDE) // // This file is part of Olena. // @@@ -44,9 -44,9 +45,10 @@@ namespace ml namespace p2b { - /// \brief Functor that compare the i-th component of a value. - // V is for the type of the value received - // i is the ith component to select ++ + /// \brief Functor that compare the i-th component with a threshold. + /// + /// T_rgb is the kind of RGB we use. template <typename T_rgb> struct achromatic : public Function_v2b< achromatic<T_rgb> > { diff --cc scribo/sandbox/green/mln/fun/v2v/hue_concentration.hh index 84d26c8,e776c9a..cdd84c1 --- a/scribo/sandbox/green/mln/fun/v2v/hue_concentration.hh +++ b/scribo/sandbox/green/mln/fun/v2v/hue_concentration.hh @@@ -1,4 -1,4 +1,5 @@@ --// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) ++// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory ++// (LRDE) // // This file is part of Olena. // diff --cc scribo/sandbox/green/mln/fun/v2v/rgb_to_achromatism_map.hh index 6de63ec,126f9bd..9db1a5e --- a/scribo/sandbox/green/mln/fun/v2v/rgb_to_achromatism_map.hh +++ b/scribo/sandbox/green/mln/fun/v2v/rgb_to_achromatism_map.hh @@@ -1,6 -1,6 +1,5 @@@ --// Copyright (C) 2007 EPITA Research and Development Laboratory (LRDE) --// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) --// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) ++// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory ++// (LRDE) // // This file is part of Olena. // @@@ -25,7 -25,7 +24,7 @@@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. --#ifndef MLN_FUN_V2V_RGB_TO_ACHROMATISM_MAP_HH ++#ifndef MLN_FUN_V2V_RGB_TO_ACHROMATISM_MAP_HH # define MLN_FUN_V2V_RGB_TO_ACHROMATISM_MAP_HH # include <mln/math/abs.hh> diff --cc scribo/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh index 3dd8eb0,a191095..ea125e8 --- a/scribo/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh +++ b/scribo/sandbox/green/mln/fun/v2v/rgb_to_hsv.hh @@@ -34,6 -34,11 +34,11 @@@ #include <mln/value/hsv.hh> #include <mln/value/rgb.hh> -/// \fiie ++/// \file + /// + /// This is the millet [millet.phd.2008.pdf] transformation from RGB + /// space to HSV space. + namespace mln { diff --cc scribo/sandbox/green/use/accu/stat/histo1d/histo1d.cc index ec80ff1,af39d94..3c91204 --- a/scribo/sandbox/green/use/accu/stat/histo1d/histo1d.cc +++ b/scribo/sandbox/green/use/accu/stat/histo1d/histo1d.cc @@@ -1,4 -1,4 +1,5 @@@ --// Copyright (C) 2007, 2008, 2009, 2010 EPITA LRDE ++// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory ++// (LRDE) // // This file is part of Olena. // hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-572-ge91a188 Output change in xml_tranform.
by Guillaume Lazzara 18 Nov '10

18 Nov '10

* arthur/xml_transform/README * arthur/xml_transform/templates/opendoc/xsl.xsl * arthur/xml_transform/templates/pdf/main.xsl * arthur/xml_transform/templates/pdf/regions.xsl * arthur/xml_transform/image_crop.cc, * arthur/xml_transform/image_crop.hh: Change ppm loader to magick loader. * arthur/xml_transform/main.cc: Change man. * arthur/xml_transform/templates/pdf/main_crop_64.xsl, * arthur/xml_transform/templates/pdf/regions_base64.xsl, * arthur/xml_transform/templates/pdf/regions_png.xsl, * arthur/xml_transform/templates/html/html_generator.sh, * arthur/xml_transform/templates/pdf/svg_generator.sh, * arthur/xml_transform/templates/pdf/pdf_generator.sh: Delete. * arthur/xml_transform/templates/html/xsl.xsl: Rename as... * thur/xml_transform/templates/html/main.xsl: ...This. * arthur/xml_transform/templates/html/xsl_base64.xsl: Rename as... * arthur/xml_transform/templates/html/main.xsl: ...This. * arthur/xml_transform/templates/pdf/regions_svg.xsl: Rename as... * arthur/xml_transform/templates/svg/regions.xsl: ...This. * arthur/xml_transform/templates/xml_transform.sh, * arthur/xml_transform/templates/svg/line.xsl, * arthur/xml_transform/templates/ooconvert, * arthur/xml_transform/templates/pdf/full/line.xsl: New. * arthur/xml_transform/xml_transform.cc, * arthur/xml_transform/xml_transform.hh: Change output. * arthur/xml_transform/xml_transform.pro: Add QMAKE_POST_LINK. --- scribo/sandbox/ChangeLog | 44 ++- scribo/sandbox/arthur/xml_transform/README | 31 +- scribo/sandbox/arthur/xml_transform/image_crop.cc | 73 ++- scribo/sandbox/arthur/xml_transform/image_crop.hh | 11 +- scribo/sandbox/arthur/xml_transform/main.cc | 139 ++++-- .../xml_transform/templates/html/html_generator.sh | 3 - .../templates/html/{xsl.xsl => main.xsl} | 46 ++- .../html/{xsl_base64.xsl => main_base64.xsl} | 111 +++-- .../arthur/xml_transform/templates/ooconvert | 517 ++++++++++++++++++++ .../templates/opendoc/opendoc_generator.sh | 24 - .../arthur/xml_transform/templates/opendoc/xsl.xsl | 33 ++- .../arthur/xml_transform/templates/pdf/main.xsl | 22 +- .../arthur/xml_transform/templates/pdf/main64.xsl | 62 --- .../xml_transform/templates/pdf/pdf_generator.sh | 3 - .../pdf/{regions_base64.xsl => regions.xsl} | 0 .../xml_transform/templates/pdf/regions_png.xsl | 59 --- .../xml_transform/templates/pdf/svg_generator.sh | 3 - .../xml_transform/templates/{pdf => svg}/line.xsl | 0 .../templates/{pdf/main_crop.xsl => svg/main.xsl} | 0 .../{pdf/regions_svg.xsl => svg/regions.xsl} | 0 .../xml_transform/templates/xml_transform.sh | 134 +++++ .../sandbox/arthur/xml_transform/xml_transform.cc | 76 +-- .../sandbox/arthur/xml_transform/xml_transform.hh | 2 + .../sandbox/arthur/xml_transform/xml_transform.pro | 8 +- 24 files changed, 1018 insertions(+), 383 deletions(-) delete mode 100644 scribo/sandbox/arthur/xml_transform/templates/html/html_generator.sh rename scribo/sandbox/arthur/xml_transform/templates/html/{xsl.xsl => main.xsl} (89%) rename scribo/sandbox/arthur/xml_transform/templates/html/{xsl_base64.xsl => main_base64.xsl} (75%) create mode 100755 scribo/sandbox/arthur/xml_transform/templates/ooconvert delete mode 100755 scribo/sandbox/arthur/xml_transform/templates/opendoc/opendoc_generator.sh delete mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/main64.xsl delete mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/pdf_generator.sh rename scribo/sandbox/arthur/xml_transform/templates/pdf/{regions_base64.xsl => regions.xsl} (100%) delete mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/regions_png.xsl delete mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/svg_generator.sh copy scribo/sandbox/arthur/xml_transform/templates/{pdf => svg}/line.xsl (100%) rename scribo/sandbox/arthur/xml_transform/templates/{pdf/main_crop.xsl => svg/main.xsl} (100%) rename scribo/sandbox/arthur/xml_transform/templates/{pdf/regions_svg.xsl => svg/regions.xsl} (100%) create mode 100755 scribo/sandbox/arthur/xml_transform/templates/xml_transform.sh diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 176e809..dcff59e 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,4 +1,40 @@ -2010-07-23 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> +2010-08-05 Arthur Crepin-Leblond <crepin@ptaouchnok.lrde.epita.fr@> + + Output change in xml_tranform. + + * arthur/xml_transform/README + * arthur/xml_transform/templates/opendoc/xsl.xsl + * arthur/xml_transform/templates/pdf/main.xsl + * arthur/xml_transform/templates/pdf/regions.xsl + + * arthur/xml_transform/image_crop.cc, + * arthur/xml_transform/image_crop.hh: Change ppm loader to magick loader. + * arthur/xml_transform/main.cc: Change man. + + * arthur/xml_transform/templates/pdf/main_crop_64.xsl, + * arthur/xml_transform/templates/pdf/regions_base64.xsl, + * arthur/xml_transform/templates/pdf/regions_png.xsl, + * arthur/xml_transform/templates/html/html_generator.sh, + * arthur/xml_transform/templates/pdf/svg_generator.sh, + * arthur/xml_transform/templates/pdf/pdf_generator.sh: Delete. + + * arthur/xml_transform/templates/html/xsl.xsl: Rename as... + * thur/xml_transform/templates/html/main.xsl: ...This. + * arthur/xml_transform/templates/html/xsl_base64.xsl: Rename as... + * arthur/xml_transform/templates/html/main.xsl: ...This. + * arthur/xml_transform/templates/pdf/regions_svg.xsl: Rename as... + * arthur/xml_transform/templates/svg/regions.xsl: ...This. + + * arthur/xml_transform/templates/xml_transform.sh, + * arthur/xml_transform/templates/svg/line.xsl, + * arthur/xml_transform/templates/ooconvert, + * arthur/xml_transform/templates/pdf/full/line.xsl: New. + + * arthur/xml_transform/xml_transform.cc, + * arthur/xml_transform/xml_transform.hh: Change output. + * arthur/xml_transform/xml_transform.pro: Add QMAKE_POST_LINK. + +2010-07-23 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> OpenDocument output (odt and odf). @@ -13,7 +49,7 @@ * arthur/xml_transform/xml_transform.cc * arthur/xml_transform/xml_transform.hh -2010-07-22 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> +2010-07-22 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> SVG output. @@ -60,7 +96,7 @@ * arthur/xml_transform/templates/pdf/regions.xsl: Rename as... * arthur/xml_transform/templates/pdf/regions_png.xsl:...this. -2010-07-08 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> +2010-07-08 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> XML transform program. @@ -99,7 +135,7 @@ * arthur/xml_transform/templates/pdf/regions.xsl, * arthur/xml_transform/xml_transform.pro: New. -2010-07-05 Arthur Crepin-Leblond <crepin(a)stockholm.lrde.epita.fr> +2010-07-05 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> ICDAR XML to HTML. diff --git a/scribo/sandbox/arthur/xml_transform/README b/scribo/sandbox/arthur/xml_transform/README index 9ac4973..1733535 100644 --- a/scribo/sandbox/arthur/xml_transform/README +++ b/scribo/sandbox/arthur/xml_transform/README @@ -2,35 +2,31 @@ xml_transform OPTIONS: HTML output: - --html <xml> <ppm> <out_dir> : HTML output with non-text regions cropped into many png files. - --html-base64 <xml> <out_dir> : HTML output from a container XML file. + --html input.xml image output.html Creates HTML file, images are embedded inside in base 64 format. + --html-base64 input.xml output.html Same as --html but input is a XML file with images encoded in base 64 inside. + --html-full input.xml image output_dir Creates HTML file without converting images in base 64. Images + HTML file are placed in output_dir. PDF output: - --pdf <xml> <ppm> <out_dir> : PDF output with non-text regions cropped into many png files. - --pdf-no-crop <xml> <ppm> <out_dir>: PDF output with the entire picture displayed over the text. - --pdf-base64 <xml> <out_dir> : PDF output from a container XML file. - --pdf-base64-no-crop <xml> <ppm> <out_dir> : PDF with the entire picture displayed over the text, the picture is loaded from a container XML file. + --pdf input.xml image output.pdf Creates PDF file, images are embedded inside in base 64 format. + --pdf-base64 input.xml output.pdf Same as --pdf but input is a XML file with images encoded in base 64 inside. -SVG output: - --svg <xml> <out_dir> : SVG output (works only with base 64 xml encoded. - -Base 64 operations: - --to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format. +SVG output (experimental, may not work with all files): + --svg input.xml image output.svg Creates SVG file, images are embedded inside in base 64 format. + --svg-base64 input.xml output.svg Same as --svg but input is a XML file with images encoded in base 64 inside. OpenDocument output: - --open <xml> <ppm> <out_dir> : OpenDocument output (odt, odf). + --oo-doc input.xml image output.odt Creates Open Document Writer (odt) file. Base 64 operations: - --to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format. - --to-base64-no-crop <xml> <ppm> <out_xml> : Same as to-base64 but only the picture is converted in base 64. - --from-base64 <xml> <out_dir> : Decodes a XML container file to produce original image files. + --to-base64 input.xml image output.xml Creates a container XML file. It will contain regions which are cropped and converted in base 64. + --to-base64-no-crop input.xml mage output.xml Same as --to-base64 but only the full picture will be converted, regions are not cropped + --from-base64 input.xml output_dir Decodes a XML file which has been encoded in base 64, regions will be converted into png files and saved in output_dir. -For PDF/HTML/SVG/OD output, Bourne shell scripts are provided to produce the outputs, just run sh *_generator.sh Requirements: PDF : fop >= 0.95 HTML : xsltproc SVG : trunk version of fop -OpenDocument : ooconvert +OpenDocument : ooconvert (included) BUILD: @@ -38,7 +34,6 @@ Chnage the environment variable QMAKE_CXXFLAGS in xml_transfrom.pro then mkdir _build cd _build -cp -r ../templates . qmake ../xml_transfrom.pro make diff --git a/scribo/sandbox/arthur/xml_transform/image_crop.cc b/scribo/sandbox/arthur/xml_transform/image_crop.cc index ffe2b44..50fadd8 100644 --- a/scribo/sandbox/arthur/xml_transform/image_crop.cc +++ b/scribo/sandbox/arthur/xml_transform/image_crop.cc @@ -34,6 +34,7 @@ #include <mln/core/alias/box2d.hh> #include <mln/core/image/image2d.hh> #include <mln/io/magick/save.hh> +#include <mln/io/magick/load.hh> #include <mln/io/ppm/all.hh> ImageCrop::ImageCrop(QString xml, QString img, QString output) : @@ -47,26 +48,15 @@ ImageCrop::~ImageCrop() { } -/* Save PPM image to PNG format in output_dir/img. */ -void ImageCrop::save_image(QString file) +/* Save image to PNG format in output_dir/img. */ +void ImageCrop::save_image(QString out) { using namespace mln; image2d<value::rgb8> ima; - io::ppm::load(ima, image_.toStdString()); + io::magick::load(ima, image_.toStdString()); - QString filename; - if (file == QString::Null()) - filename = Common::get_file_name(image_); - else - filename = file; - - // std::cout << "Saving " << image_.toStdString() << " to " - // << output_dir_.toStdString() << "img/" - // << filename.toStdString() << ".png" - // << std::endl; - - io::magick::save(ima, output_dir_.toStdString() + "img/" + filename.toStdString() + ".png"); + io::magick::save(ima, out.toStdString()); } /* Return the image in base 64. */ @@ -83,7 +73,7 @@ QString ImageCrop::img_to_base64() } /* Decode the base 64 string str and save into output_dir_/img/img_name. */ -bool ImageCrop::img_from_base64(QString str, QString img_name, QString mime) +bool ImageCrop::img_from_base64(QString str, QString img) { QByteArray ba; @@ -91,7 +81,7 @@ bool ImageCrop::img_from_base64(QString str, QString img_name, QString mime) QByteArray out_ba = QByteArray::fromBase64(ba); QImage ima = QImage::fromData(out_ba); - return ima.save(output_dir_ + "img/" + img_name + "." + mime); + return ima.save(output_dir_ + img); } /* Read all regions of the XML file and save all base 64 data into output_dir/img */ @@ -125,7 +115,8 @@ void ImageCrop::from_base64() { QString data = node.firstChildElement("data").text(); QString mime = node.firstChildElement("mime").text(); - img_from_base64(data, id, mime); + QString img = id + "." + mime; + img_from_base64(data, img); } } child = child.nextSibling(); @@ -138,6 +129,21 @@ void ImageCrop::to_base64(QString out_file, bool no_crop) { QFile file(xml_); file.open(QIODevice::ReadOnly); + + QDomDocument doc; + doc.setContent(&file); + + QDomElement root = doc.documentElement(); + QDomNode child = root.firstChild(); + + while (!child.isNull() && !child.toElement().tagName().contains("page")) + child = child.nextSibling(); + + QString width = child.toElement().attribute("image_width", "0"); + QString height = child.toElement().attribute("image_height", "0"); + + file.close(); + file.open(QIODevice::ReadOnly); QTextStream stream(&file); QFile file2(out_file); @@ -163,9 +169,10 @@ void ImageCrop::to_base64(QString out_file, bool no_crop) stream2 << "\n" << " <container>\n"; stream2 << " <mime>png</mime>\n"; - QString file_name = Common::get_file_name(image_); - save_image(); - QFile img(output_dir_ + "img/" + file_name + ".png"); + QTemporaryFile tmp(output_dir_ + Common::get_file_name(image_) + "_XXXXXX.png"); + tmp.open(); + save_image(tmp.fileName()); + QFile img(tmp.fileName()); img.open(QIODevice::ReadOnly); stream2 << " <data>\n"; @@ -178,7 +185,9 @@ void ImageCrop::to_base64(QString out_file, bool no_crop) stream2 << "\n <coords>\n"; stream2 << " <point x=\"0\" y=\"0\" />\n"; - stream2 << " <point x=\"0\" y=\"0\" />"; + stream2 << " <point x=\"" << width << "\" y=\"0\" />\n"; + stream2 << " <point x=\"" << width << "\" y=\"" << height << "\" />\n"; + stream2 << " <point x=\"0\" y=\"" << height << "\" />"; stream2 << "\n </coords>"; stream2 << "\n" << " </image_region>\n"; @@ -210,7 +219,7 @@ void ImageCrop::to_base64(QString out_file, bool no_crop) QDomElement root = doc.documentElement(); QString id = root.attribute("id", "none"); - QFile img(output_dir_ + "img/" + id + ".png"); + QFile img(region_map_[id]); img.open(QIODevice::ReadOnly); stream2 << " <data>\n"; @@ -220,6 +229,7 @@ void ImageCrop::to_base64(QString out_file, bool no_crop) stream2 << " </data>"; stream2 << "\n </container>"; + img.remove(); img.close(); } @@ -233,7 +243,7 @@ void ImageCrop::to_base64(QString out_file, bool no_crop) file.close(); } -bool ImageCrop::crop_regions() +bool ImageCrop::crop_regions(bool temp) { Loader loader; QFile f(xml_); @@ -265,7 +275,7 @@ bool ImageCrop::crop_regions() QDomNode coords = region.firstChild(); QString id = region.toElement().attribute("id", "none"); - qDebug() << region.toElement().tagName(); + // qDebug() << region.toElement().tagName(); while (!coords.isNull() && !coords.toElement().tagName().contains("coords")) coords = coords.nextSibling(); @@ -301,10 +311,19 @@ bool ImageCrop::crop_regions() box2d box = make::box2d(y_min, x_min, y_max, x_max); image2d<value::rgb8> ima; - io::ppm::load(ima, image_.toStdString()); + io::magick::load(ima, image_.toStdString()); ima = scribo::preprocessing::crop(ima, box); - io::magick::save(ima, output_dir_.toStdString() + "img/" + id.toStdString() + ".png"); + if (temp) + { + QTemporaryFile tmp(output_dir_ + id + ".XXXXXX.png"); + tmp.open(); + region_map_[id] = tmp.fileName(); + tmp.setAutoRemove(false); + io::magick::save(ima, tmp.fileName().toStdString()); + } + else + io::magick::save(ima, QString(output_dir_ + id + ".png").toStdString()); } region = region.nextSibling(); } diff --git a/scribo/sandbox/arthur/xml_transform/image_crop.hh b/scribo/sandbox/arthur/xml_transform/image_crop.hh index 9b034cc..ee5ca56 100644 --- a/scribo/sandbox/arthur/xml_transform/image_crop.hh +++ b/scribo/sandbox/arthur/xml_transform/image_crop.hh @@ -36,15 +36,15 @@ class ImageCrop : public QObject Q_OBJECT public: - ImageCrop(QString xml, QString img, QString output); + ImageCrop(QString, QString, QString); ~ImageCrop(); - void save_image(QString file = QString::Null()); - bool crop_regions(); + void save_image(QString); + bool crop_regions(bool temp = false); QString img_to_base64(); - bool img_from_base64(QString str, QString img_name, QString mime); - void to_base64(QString out_file, bool no_crop); + bool img_from_base64(QString, QString); + void to_base64(QString, bool); void from_base64(); @@ -52,6 +52,7 @@ private: QString xml_; QString image_; QString output_dir_; + QMap<QString, QString> region_map_; }; #endif /* !IMAGE_CROP_HH */ diff --git a/scribo/sandbox/arthur/xml_transform/main.cc b/scribo/sandbox/arthur/xml_transform/main.cc index 34a1b6e..2270d2e 100644 --- a/scribo/sandbox/arthur/xml_transform/main.cc +++ b/scribo/sandbox/arthur/xml_transform/main.cc @@ -1,5 +1,7 @@ #include <iostream> -#include <QDomDocument> +#include <string> +#include <string> +#include <cstdlib> #include "xml_transform.hh" int main(int argc, char **argv) @@ -8,60 +10,109 @@ int main(int argc, char **argv) std::string man; man = "xml_transform\n" "OPTIONS:\n\n" + "HTML output:\n" - "\t--html <xml> <ppm> <out_dir> : HTML output with non-text regions cropped into many png files.\n" - "\t--html-base64 <xml> <out_dir> : HTML output from a container XML file.\n\n" + "\t\033[01m--html\033[00m\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.html\033[00m" + "\t\t\tCreates HTML file, images are embedded inside in base 64 format.\n" + "\t\033[01m--html-base64\033[00m \033[04minput.xml\033[00m \033[04moutput.html\033[00m" + "\t\t\tSame as --html but input is a XML file with images encoded in base 64 inside.\n" + + "\t\033[01m--html-full\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput_dir\033[00m" + "\t\t\tCreates HTML file without converting images in base 64. Images + HTML file are placed in output_dir.\n\n" + "PDF output:\n" - "\t--pdf <xml> <ppm> <out_dir> : PDF output with non-text regions cropped into many png files.\n" - "\t--pdf-no-crop <xml> <ppm> <out_dir>: PDF output with the entire picture displayed over the text.\n" - "\t--pdf-base64 <xml> <out_dir> : PDF output from a container XML file.\n" - "\t--pdf-base64-no-crop <xml> <ppm> <out_dir> : PDF with the entire picture displayed over the text, the picture is loaded from a container XML file.\n\n" - "SVG output:\n" - "\t--svg <xml> <out_dir> : SVG output (works only with base 64 xml encoded.\n\n" - "Base 64 operations:\n" - "\t--to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format.\n\n" + "\t\033[01m--pdf\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.pdf\033[00m" + "\t\t\tCreates PDF file, images are embedded inside in base 64 format.\n" + "\t\033[01m--pdf-base64\033[00m \033[04minput.xml\033[00m \033[04moutput.pdf\033[00m" + "\t\t\tSame as --pdf but input is a XML file with images encoded in base 64 inside.\n\n" + + "SVG output (experimental, may not work with all files):\n" + "\t\033[01m--svg\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.svg\033[00m" + "\t\t\tCreates SVG file, images are embedded inside in base 64 format.\n" + "\t\033[01m--svg-base64\033[00m \033[04minput.xml\033[00m \033[04moutput.svg\033[00m" + "\t\t\tSame as --svg but input is a XML file with images encoded in base 64 inside.\n\n" "OpenDocument output:\n" - "\t--open <xml> <ppm> <out_dir> : OpenDocument output (odt, odf).\n\n" + "\t\033[01m--oo-doc\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.odt\033[00m" + "\t\t\tCreates Open Document Writer (odt) file.\n\n" + "Base 64 operations:\n" - "\t--to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format.\n" - "\t--to-base64-no-crop <xml> <ppm> <out_xml> : Same as to-base64 but only the picture is converted in base 64.\n" - "\t--from-base64 <xml> <out_dir> : Decodes a XML container file to produce original image files.\n\n" - "For PDF/HTML/SVG/OD output, Bourne shell scripts are provided to produce the outputs, just run sh *_generator.sh \n" + "\t\033[01m--to-base64\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.xml\033[00m" + "\t\t\tCreates a container XML file. It will contain regions which are cropped and converted in base 64.\n" + + "\t\033[01m--to-base64-no-crop\033[00m \033[04minput.xml\033[00m \033[04image\033[00m \033[04moutput.xml\033[00m" + "\t\tSame as --to-base64 but only the full picture will be converted, regions are not cropped\n" + + "\t\033[01m--from-base64\033[00m \033[04minput.xml\033[00m \033[04moutput_dir\033[00m" + "\t\t\tDecodes a XML file which has been encoded in base 64, regions will be converted into png files and saved in output_dir.\n\n" + "Requirements:\n" "PDF : fop >= 0.95\n" "HTML : xsltproc\n" "SVG : trunk version of fop\n" - "OpenDocument : ooconvert"; - + "OpenDocument : ooconvert (included)"; if (argc > 4) { std::string html = "--html"; - std::string open = "--open"; + std::string html_full = "--html-full"; + std::string open = "--oo-doc"; std::string pdf = "--pdf"; - std::string pdf_no_crop = "--pdf-no-crop"; + std::string svg = "--svg"; std::string to_base64 = "--to-base64"; std::string to_base64nocrop = "--to-base64-no-crop"; - if (html.compare(argv[1]) == 0) + if (html_full.compare(argv[1]) == 0) { XmlTransform xmlt(argv[2], argv[3], argv[4]); xmlt.createHTML(false); + + QString cmd = "sh templates/xml_transform.sh html " + xmlt.out() + "output.xml " + xmlt.out() + "output.html"; + return system (cmd.toAscii().constData()); + } + else if (html.compare(argv[1]) == 0) + { + QTemporaryFile tmp; + tmp.open(); + tmp.fileName(); + + XmlTransform xmlt(argv[2], argv[3], QString::Null(), tmp.fileName()); + xmlt.toBase64(false); + + QString cmd = "sh templates/xml_transform.sh html-base64 " + tmp.fileName() + " " + argv[4]; + return system (cmd.toAscii().constData()); } else if (pdf.compare(argv[1]) == 0) { - XmlTransform xmlt(argv[2], argv[3], argv[4]); - xmlt.createPDF(true, false); + QTemporaryFile tmp; + tmp.open(); + tmp.fileName(); + + XmlTransform xmlt(argv[2], argv[3], QString::Null(), tmp.fileName()); + xmlt.toBase64(false); + + QString cmd = "sh templates/xml_transform.sh pdf " + tmp.fileName() + " " + argv[4]; + return system (cmd.toAscii().constData()); } - else if (open.compare(argv[1]) == 0) + else if (svg.compare(argv[1]) == 0) { - XmlTransform xmlt(argv[2], argv[3], argv[4]); - xmlt.createOpen(); + QTemporaryFile tmp; + tmp.open(); + tmp.fileName(); + + XmlTransform xmlt(argv[2], argv[3], QString::Null(), tmp.fileName()); + xmlt.toBase64(false); + + QString cmd = "sh templates/xml_transform.sh svg " + tmp.fileName() + " " + argv[4]; + return system (cmd.toAscii().constData()); } - else if (pdf_no_crop.compare(argv[1]) == 0) + else if (open.compare(argv[1]) == 0) { - XmlTransform xmlt(argv[2], argv[3], argv[4]); - xmlt.createPDF(false, false); + QString dir = QDir::tempPath() + "/xml_transform." + argv[4]; + XmlTransform xmlt(argv[2], argv[3], dir); + xmlt.createOpen(); + + QString cmd = "sh templates/xml_transform.sh oo-doc " + dir + " " + argv[4]; + return system (cmd.toAscii().constData()); } else if (to_base64.compare(argv[1]) == 0) { @@ -78,31 +129,25 @@ int main(int argc, char **argv) } else if (argc > 3) { - std::string pdfbase64 = "--pdf-base64"; - std::string svg = "--svg"; - std::string pdfbase64nocrop = "--pdf-base64-no-crop"; - std::string htmlbase64 = "--html-base64"; + std::string pdf_base64 = "--pdf-base64"; + std::string svg_base64 = "--svg-base64"; + std::string html_base64 = "--html-base64"; std::string from_base64 = "--from-base64"; - if (pdfbase64.compare(argv[1]) == 0) - { - XmlTransform xmlt(argv[2], QString::Null(), argv[3]); - xmlt.createPDF(true, true); - } - else if (svg.compare(argv[1]) == 0) + if (svg_base64.compare(argv[1]) == 0) { - XmlTransform xmlt(argv[2], QString::Null(), argv[3]); - xmlt.createSVG(); + QString cmd = "sh templates/xml_transform.sh svg " + QString(argv[2]) + " " + QString(argv[3]); + return system (cmd.toAscii().constData()); } - else if (pdfbase64nocrop.compare(argv[1]) == 0) + else if (pdf_base64.compare(argv[1]) == 0) { - XmlTransform xmlt(argv[2], QString::Null(), argv[3]); - xmlt.createPDF(false, true); + QString cmd = "sh templates/xml_transform.sh pdf " + QString(argv[2]) + " " + QString(argv[3]); + return system (cmd.toAscii().constData()); } - else if (htmlbase64.compare(argv[1]) == 0) + else if (html_base64.compare(argv[1]) == 0) { - XmlTransform xmlt(argv[2], QString::Null(), argv[3]); - xmlt.createHTML(true); + QString cmd = "sh templates/xml_transform.sh html-base64 " + QString(argv[2]) + " " + QString(argv[3]); + return system (cmd.toAscii().constData()); } else if (from_base64.compare(argv[1]) == 0) { diff --git a/scribo/sandbox/arthur/xml_transform/templates/html/html_generator.sh b/scribo/sandbox/arthur/xml_transform/templates/html/html_generator.sh deleted file mode 100644 index bb24305..0000000 --- a/scribo/sandbox/arthur/xml_transform/templates/html/html_generator.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -xsltproc xsl.xsl output.xml > output.html \ No newline at end of file diff --git a/scribo/sandbox/arthur/xml_transform/templates/html/xsl.xsl b/scribo/sandbox/arthur/xml_transform/templates/html/main.xsl similarity index 89% rename from scribo/sandbox/arthur/xml_transform/templates/html/xsl.xsl rename to scribo/sandbox/arthur/xml_transform/templates/html/main.xsl index 1f29044..9c90970 100644 --- a/scribo/sandbox/arthur/xml_transform/templates/html/xsl.xsl +++ b/scribo/sandbox/arthur/xml_transform/templates/html/main.xsl @@ -6,7 +6,37 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>SCRIBO</title> - <link rel="stylesheet" type="text/css" href="css.css" /> + <style type="text/css"> + .line + { + position:absolute; + z-index:7; + display:inline; + white-space:pre; + +  + letter-spacing:-2px; + + padding:0px; + margin:0px; + font-family:"Times New Roman", Times, serif; + } + .para + { + position:absolute; + z-index:6; + } + .region + { + position:absolute; + z-index:5; + } + .image + { + position:absolute; + border:0; + } + </style> </head> <body> @@ -129,10 +159,8 @@ </xsl:choose> </xsl:variable> - <div class="line" onmouseover="this.style.opacity=0.2;this.filters.alpha.opacity=20" - onmouseout="this.style.opacity=1;this.filters.alpha.opacity=100"> + <div class="line"> <xsl:attribute name="style"> - opacity:1; height:auto; font-size:<xsl:value-of select="$a+$d" />px; width:<xsl:value-of select="$x2 - $x1" />px; @@ -146,7 +174,7 @@   - <xsl:if test="name() = 'text_region'"> +   - <xsl:if test="name() = 'paragraph'"> +   @@ -209,7 +237,7 @@ <xsl:attribute name="height"> <xsl:value-of select="$y2 - $y1" /> </xsl:attribute> - <xsl:attribute name="src">img/<xsl:value-of select="$id"/>.png</xsl:attribute> + <xsl:attribute name="src"><xsl:value-of select="$id"/>.png</xsl:attribute> </img> </div> diff --git a/scribo/sandbox/arthur/xml_transform/templates/html/xsl_base64.xsl b/scribo/sandbox/arthur/xml_transform/templates/html/main_base64.xsl similarity index 75% rename from scribo/sandbox/arthur/xml_transform/templates/html/xsl_base64.xsl rename to scribo/sandbox/arthur/xml_transform/templates/html/main_base64.xsl index 1c25e42..b24f02d 100644 --- a/scribo/sandbox/arthur/xml_transform/templates/html/xsl_base64.xsl +++ b/scribo/sandbox/arthur/xml_transform/templates/html/main_base64.xsl @@ -6,7 +6,40 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>SCRIBO</title> - <link rel="stylesheet" type="text/css" href="css.css" /> + <style type="text/css"> + .line + { + position:absolute; + background-color:white; + z-index:7; + display:inline; + white-space:pre; + + /* FIXME */ + letter-spacing:-2px; + + padding:0px; + margin:0px; + filter:alpha(opacity=100); + font-family:"Times New Roman", Times, serif; + } + .para + { + position:absolute; + z-index:6; + } + .region + { + position:absolute; + z-index:5; + } + .image + { + position:absolute; + border:0; + } + </style> + </head> <body> @@ -174,46 +207,48 @@  <xsl:if test="name() = 'image_region' or name() = 'separator_region' or name() = 'graphic_region' or name() = 'chart_region' or name() = 'table_region'"> -  - <xsl:variable name="data"> - <xsl:value-of select="container/data" /> - </xsl:variable> + <xsl:if test="container"> +  + <xsl:variable name="data"> + <xsl:value-of select="container/data" /> + </xsl:variable> -  - <xsl:variable name="depth"> - <xsl:choose> - <xsl:when test="name() = 'separator_region'"> - 1 - </xsl:when> - <xsl:otherwise> - 4 - </xsl:otherwise> - </xsl:choose> - </xsl:variable> +  + <xsl:variable name="depth"> + <xsl:choose> + <xsl:when test="name() = 'separator_region'"> + 1 + </xsl:when> + <xsl:otherwise> + 4 + </xsl:otherwise> + </xsl:choose> + </xsl:variable> - <div class="image"> - <xsl:attribute name="style"> - top:<xsl:value-of select="$y1" />px; - left:<xsl:value-of select="$x1" />px; - width:<xsl:value-of select="$x2 - $x1"/>px; - height:<xsl:value-of select="$y2 - $y1"/>px; - z-index:<xsl:value-of select="$depth"/>; - </xsl:attribute> - <img> - <xsl:attribute name="alt"> - <xsl:value-of select="name()" /> + <div class="image"> + <xsl:attribute name="style"> + top:<xsl:value-of select="$y1" />px; + left:<xsl:value-of select="$x1" />px; + width:<xsl:value-of select="$x2 - $x1"/>px; + height:<xsl:value-of select="$y2 - $y1"/>px; + z-index:<xsl:value-of select="$depth"/>; </xsl:attribute> - <xsl:attribute name="width"> - <xsl:value-of select="$x2 - $x1" /> - </xsl:attribute> - <xsl:attribute name="height"> - <xsl:value-of select="$y2 - $y1" /> - </xsl:attribute> - <xsl:attribute name="src"> - data:image/png;base64,<xsl:value-of select="$data"/> - </xsl:attribute> - </img> - </div> + <img> + <xsl:attribute name="alt"> + <xsl:value-of select="name()" /> + </xsl:attribute> + <xsl:attribute name="width"> + <xsl:value-of select="$x2 - $x1" /> + </xsl:attribute> + <xsl:attribute name="height"> + <xsl:value-of select="$y2 - $y1" /> + </xsl:attribute> + <xsl:attribute name="src"> + data:image/png;base64,<xsl:value-of select="$data"/> + </xsl:attribute> + </img> + </div> + </xsl:if> </xsl:if>  diff --git a/scribo/sandbox/arthur/xml_transform/templates/ooconvert b/scribo/sandbox/arthur/xml_transform/templates/ooconvert new file mode 100755 index 0000000..6c81550 --- /dev/null +++ b/scribo/sandbox/arthur/xml_transform/templates/ooconvert @@ -0,0 +1,517 @@ +#!/bin/bash + +# ooconvert: convert openoffice documents to other formats +# Copyright (C) 2007, Metaladder, Inc. + +# Developers: +# +# Nathan Coulter +# Andrey Plotnikov +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +############################################################################## +############################################################################## +# This script should be run with the same python interpreter that openoffice +# uses, which is usually included with openoffice: +# +# /path/to/openoffice-2.0.1/program/python.sh +# +# However, under debian, ubuntu, etc, openoffice uses the system-installed +# python interpreter. To find which interpreter is being used, look in +# +# /path/to/openoffice/program/pythonloader.unorc +# +# If openoffice is using an external python interpreter, modify the following +# LD_LIBRARY_PATH to reflect your openoffice environment and to import uno +# without errors + + +# If $DISPLAY does not point to a working X server, or is unset, this program +# tries to start Xvfb. Bypass all this nonsense by having DISPLAY point to a +# working X Server. +# +# +# NOTE! - If OpenOffice has never been started interactively, this program will +# fail silently because the license agreement has not been accepted. + +############################################################################## +############################################################################## + +shopt -s -o nounset + +### site configuration +#OO_LOGLEVEL=20 +#USE_OO_INTERNAL_PYTHON=0 #set to 1 if python is embedded in openoffice +#OOPROGRAM=/usr/lib/openoffice/program #directory containing soffice +#OOPYTHON=${OOPROGRAM}/python.sh" +#OO_EXTERNAL_PYTHON=/usr/bin/python +#OOXVFB="Xvfb" +#OOXWININFO=xwininfo +#OOXVFB_START=0} #first port to try Xvfb on +#OOXVFB_RETRIES:="1000"} #how many successive port to try +#alternatively, put site details in one of these files +[ -r /etc/ooconvert ] && source /etc/ooconvert +[ -r ~/etc/ooconvert ] && source ~/etc/ooconvert +### site configuration end + +### configuration defaults start +# Choose openoffice internal python (1) or external python (0) +: ${OO_LOGLEVEL:=20} +: ${USE_OO_INTERNAL_PYTHON:=0} +: ${OOPROGRAM:="/usr/lib/openoffice/program"} +: ${OOPYTHON:="${OOPROGRAM}/python.sh"} +: ${OO_EXTERNAL_PYTHON:="/usr/bin/python"} +: ${OOXVFB:="Xvfb"} +: ${OOXWININFO:="xwininfo"} +: ${OOXVFB_START:=0} +: ${OOXVFB_RETRIES:="100"} +### configuration defaults end + +LOG_NOTSET=0 +LOG_DEBUG=10 +LOG_INFO=20 +LOG_WARNING=30 +LOG_ERROR=40 +LOG_CRITICAL=50 + +OOXVFBJOB= + +oo_log () { + if [ "$OO_LOGLEVEL" -le "$1" ]; then + shift + printf '%s\n' "$@" >&2 + fi +} + +oo_err () { + exit_status="$1" + shift + oo_log $LOG_ERROR "$@" + exit "$exit_status" +} + +### If an X Server is not detected, try to use Xvfb +if [ ! "${DISPLAY:-}" ]; then + oo_log $LOG_INFO "\"DISPLAY\" variable is not set. Attempting Xvfb." + for i in "$OOXVFB" /usr/X11/bin/Xvfb /usr/X11R6/bin/Xvfb; do + oo_log "$LOG_INFO" "Trying to invoke $i" + $i >& /dev/null + if [ $? != 127 ]; then #127 is the bash shell code for "not found" + OOXVFB="$i" + break + fi + OOXVFB= + done + unset i + if [ "$OOXVFB" ]; then + oo_log $LOG_INFO "Xvfb is installed." + for i in "$OOXWININFO" /usr/X11/bin/xwininfo \ + /usr/X11R6/bin/xwininfo "$(dirname "$OOXVFB")/xwininfo" + do + $i >& /dev/null + if [ $? != 127 ]; then #127 is the bash shell code for "not found" + OOXWININFO="$i" + break + fi + OOXWININFO= + done + [ "$OOXWININFO" ] || oo_err 130 "ooxwininfo not found" + unset i + ((last=$OOXVFB_START+$OOXVFB_RETRIES)) + while :; do + "$OOXVFB" :$OOXVFB_START -screen scrn 1280x1024x16 & + OOXVFBJOB=$! + export DISPLAY=":$OOXVFB_START" + sleep 1 + ps "$OOXVFBJOB" && "$OOXWININFO" -root && break + ps "$OOXVFBJOB" && kill "$OOXVFBJOB" + oo_log $LOG_INFO "Failed to start Xvfb on display $OOXVFB_START" + ((OOXVFB_START++)) + [ $OOXVFB_START -ge $last ] && \ + oo_err 129 "Xvfb attempts exceeded $OOXVFB_RETRIES" + done + oo_log $LOG_INFO "Xvfb started. Process id: $OOXVFBJOB" + oo_log $LOG_INFO "Setting \"Display\" to $DISPLAY for Xvfb" + fi +fi + +case "$USE_OO_INTERNAL_PYTHON" in + 0) + OOPYTHON="$OO_EXTERNAL_PYTHON" + export LD_LIBRARY_PATH="$OOPROGRAM${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" + ;; +esac + + +"$OOPYTHON" - "$@" <<EOF +# OpenOffice1.1 comes with its own python interpreter. +# This Script needs to be run with the python from OpenOffice.org: +# /opt/OpenOffice.org/program/python or python.sh + +#pythonloader.unorc + +__doc__="Document converter which uses OO for actual converting" + +import sys, os, time, signal +from optparse import OptionParser + +#how long should we wait for openoffice to start +OOCONV_MAX_STARTUP_TIME = os.getenv("OOCONV_MAX_STARTUP_TIME") +if not OOCONV_MAX_STARTUP_TIME: OOCONV_MAX_STARTUP_TIME=60 +OOCONV_MAX_STARTUP_TIME=int(OOCONV_MAX_STARTUP_TIME) + +#what port should openoffice listen on +OOCONV_PORT = os.getenv("OOCONV_PORT") +if not OOCONV_PORT: OOCONV_PORT=2002 +OOCONV_PORT = int(OOCONV_PORT) + +def importUNO(): + """ + Import UNO modules + """ + import uno + globals()['uno'] = uno + from com.sun.star.beans import PropertyValue + globals()['PropertyValue'] = PropertyValue + from com.sun.star.container import NoSuchElementException + globals()['NoSuchElementException'] = NoSuchElementException + + +class OOConverter: + """ + Convert documents by means of Open Office. + """ + + def __init__(self, desktop): + self.desktop = desktop + + def convert(self, fromFile, toFile, format): + """ + fromFile -- source file name + toFile -- destination file name + format -- sequence of propery values + """ + desktop = self.desktop + fromFile=os.path.abspath(fromFile) + url = fromFile + #url="file://%s" % fromFile + url=uno.systemPathToFileUrl(fromFile) + context = uno.getComponentContext() + properties=[] + p=PropertyValue() + p.Name="Hidden" + p.Value=True + properties.append(p) + doc=desktop.loadComponentFromURL( + url, "_blank", 0, tuple(properties)); + if not doc: + print "Failed to open '%s'" % type(file) + return False + # Save File + properties=[] + p=PropertyValue() + p.Name="Overwrite" + p.Value=True + properties.append(p) + p=PropertyValue() + p.Name="FilterName" + p.Value=property(format, 'Name').Value + properties.append(p) + p=PropertyValue() + p.Name="Hidden" + p.Value=True + url_save="file://%s" % os.path.abspath(toFile) + try: + doc.storeToURL( + url_save, tuple(properties)) + except: + print "Failed while writing: '%s'" % file + doc.dispose() + return True + + + +class FileIterator: + """ + Iterate over each conversion task. + A conversion task consists of source file name, + destination file name and format + """ + def __init__(self, sources, dest, format, ext, keep): + self.sources = sources + self.dest = dest + if not ext: ext = '' + self.ext = ext + self.keep = keep + self.isDestDir = False + if os.path.isdir(dest): + self.isDestDir = True + self.format = format + self.siter = iter(self.sources) + + def __iter__(self): + return self + + def next(self): + src = self.siter.next() + return (src, self._getDestFN(src), self.format) + + def _getDestFN(self, src): + if not self.isDestDir: + return self.dest + base = os.path.basename(src) + if not self.keep: + base, ext = os.path.splitext(base) + return os.path.join(self.dest, base) + self.ext + + def _getFormatExt(self): + return self.format.ext + + + +def expandSources(sources): + result = [] + for src in sources: + if os.path.isdir(src): + result.extend([os.path.join(src,entry) for entry in os.listdir(src) if os.path.isfile(os.path.join(src,entry))]) + elif os.path.isfile(src): + result.append(src) + return result + +def property(properties, which, default=None): + '''value: property p from a set of properties''' + for p in properties: + if p.Name == which: return p + return default + +def format(attribute, value): + for fmt in formats()[0]: + if value == property(fmt, attribute).Value: + return fmt + +def formats(): + resolve = filterFactory.getElementNames() + installed = [] + missing = [] + for name in resolve: + try: + installed.append(filterFactory.getByName(name)) + except NoSuchElementException, e: + print >> sys.stderr, 'Warning: NoSuchElementException: ', + print >> sys.stderr, e.Message + missing.append(name) + return iter(installed), iter(missing) + + +def fileformat(fileName): + url=uno.systemPathToFileUrl(fileName) + type_ = typeDetection.queryTypeByURL(url) + fmt = format('Type', type_) + return fmt + + +def componentContext(): + """ + Start OO in child process and connect to them. + Return OO component context object. + """ + pid = os.fork() + if not pid: + pid = os.getpid() + os.setpgid(pid,pid) + os.system("soffice -headless -norestore '-accept=socket,host=localhost,port=%s;urp;' &" % OOCONV_PORT) + while 1: + time.sleep(1) + else: + limit = time.time() + OOCONV_MAX_STARTUP_TIME + context = None + contextproxy = uno.getComponentContext() + resolver=contextproxy.ServiceManager.createInstanceWithContext( + "com.sun.star.bridge.UnoUrlResolver", contextproxy) + + while time.time() < limit: + try: + context = resolver.resolve( + "uno:socket,host=localhost,port=%s;urp;StarOffice.ComponentContext" % OOCONV_PORT) + break + except: + pass + time.sleep(5) + if context is None: + pgid = os.getpgid(pid) + os.killpg(pgid, signal.SIGTERM) + return None, None + return context, pid + + +def connect(host='localhost', port=OOCONV_PORT): + """ + Try to connect to the running OO instance + """ + context = uno.getComponentContext() + resolver=context.ServiceManager.createInstanceWithContext( + "com.sun.star.bridge.UnoUrlResolver", context) + try: + return resolver.resolve( + "uno:socket,host=%s,port=%s;urp;StarOffice.ComponentContext" % (host, port)) + except: + pass + return None + +def options(): + usage1 = "usage: $(basename $0) [options] <source file> <destination file>" + usage2 = " or: $(basename $0) --format=<format> [options] sources... <destination dir>" + usage3 = " or: $(basename $0) --list" + usage4 = " or: $(basename $0) --help" + parser = OptionParser(usage1+'\n'+usage2+'\n'+usage3+'\n'+usage4) + parser.add_option('-e', '--ext', dest='ext', + help='Output extension', metavar='ext') + parser.add_option('-f','--format', dest='format', + help='Output file format', metavar='format') + parser.add_option('-k', '--keep', dest='keep', + help='Keep original extension', metavar='keep') + parser.add_option('-p','--oopath', dest='oopath', metavar='path', + help='Path to OO program directory') + parser.add_option('-l','--list', dest='listFormats', action="store_true", + default=False, + help='List all available formats') + parser.add_option('-a' ,'--laddr', dest='listener', metavar='host[:port]', + help='If this option exists then try to connect to given OO listener address') + return parser + +def listFormats(): + installed, missing = formats() + if installed: + print '\n\nAvailable formats: ' + for i in installed: + print property(i, 'Name').Value + if missing: + print '\n\nFormats not currently installed: ' + for i in missing: + print i + +def services(): + smgr=context.ServiceManager + globals()['desktop'] = \ + smgr.createInstanceWithContext("com.sun.star.frame.Desktop",context) + globals()['typeDetection'] = \ + smgr.createInstance('com.sun.star.document.TypeDetection') + globals()['filterFactory'] = \ + smgr.createInstance('com.sun.star.document.FilterFactory') + +def opts_format(parser, opts, dest, isDestDir): + ## if destination is directory then format option is required + if isDestDir: + if not opts.format: + parser.error('format option is required') + return format('Name', opts.format) + elif not opts.format: + ## try to guess format by the output filename extension + format1 = fileformat(dest) + if not format1: + parser.error("can't guess output format for %s" % dest) + else: + format1 = format('Name', opts.format) + if not format1: + err = 'Unknown format: %s. ' % opts.format + err += 'Please use --list to see formats' + parser.error(err) + return format1 + + +def main(): + parser = options() + opts, args = parser.parse_args() + pid = None + try: + importUNO() + if opts.listener: + parts = opts.listener.split(':') + host = parts[0] + port=OOCONV_PORT + if len(parts)>1: + port = int(parts[1]) + context = connect(host, port) + else: + context, pid = componentContext() + + if context is None: + print "Could not connect to running openoffice" + sys.exit(1) + globals()['context'] = context + + services() + + if opts.listFormats: + listFormats() + sys.exit(0) + + if len(args)<1: + parser.error('incorrect number of arguments') + + if len(args) == 1: + dest = os.getcwd() + sources = [os.path.abspath(args[0])] + isDestDir = True + else: + dest = os.path.abspath(args[-1]) + sources = [os.path.abspath(src) for src in args[:-1]] + isDestDir = os.path.isdir(dest) + ## if we have more than one input files then last argument must be output directory + if len(args) > 2 and not isDestDir: + parser.error('last argument must be directory') + if not isDestDir and len(args)==2: + src = sources[0] + if not os.path.isfile(src): + parser.error('first argument must be a path to the file in this case') + + format1 = opts_format(parser, opts, dest, isDestDir) + + if opts.oopath: + os.environ['PATH'] = '%s:%s' % (os.environ['PATH'], opts.oopath) + sys.path.append(opts.oopath) + + sources = expandSources(sources) + + converter = OOConverter(desktop) + iterator = FileIterator(sources, dest, format1, opts.ext, opts.keep) + for fromFile, toFile, format1 in iterator: + print 'Converting %s to %s (format: %s)...' % ( + os.path.basename(fromFile), + os.path.basename(toFile), + property(format1, 'Name').Value), + converter.convert(fromFile, toFile, format1) + print 'successfully.' + finally: + if pid: + pgid = os.getpgid(pid) + os.killpg(pgid, signal.SIGTERM) + time.sleep(2) + os.killpg(pgid, signal.SIGKILL) + + +if __name__ == '__main__': + main() + +EOF + +if [ "$OOXVFBJOB" ]; then + oo_log $LOG_INFO "Killing Xvfb, running as process number $OOXVFBJOB" + kill "$OOXVFBJOB" + #necessary when process is headless + kill -s 9 $OOXVFBJOB + rm -f /tmp/.X$OOXVFB_START-lock +fi diff --git a/scribo/sandbox/arthur/xml_transform/templates/opendoc/opendoc_generator.sh b/scribo/sandbox/arthur/xml_transform/templates/opendoc/opendoc_generator.sh deleted file mode 100755 index c2d9e6f..0000000 --- a/scribo/sandbox/arthur/xml_transform/templates/opendoc/opendoc_generator.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -if [ -z "$1" ] -then - echo "opendoc_generator <odt|odf>"; -else - if [ "$1" == "odt" ] - then - echo "saving to output.odt"; - xsltproc xsl.xsl output.xml > output.html - ooconvert output.html output.odt - rm output.html - elif [ "$1" == "odf" ] - then - echo "saving to output.odf"; - xsltproc xsl.xsl output.xml > output.html - ooconvert output.html output.odf; - rm output.html - else - echo "opendoc_generator <odt|odf>"; - fi -fi - -#rm output.html \ No newline at end of file diff --git a/scribo/sandbox/arthur/xml_transform/templates/opendoc/xsl.xsl b/scribo/sandbox/arthur/xml_transform/templates/opendoc/xsl.xsl index bf1cc30..e9266d7 100755 --- a/scribo/sandbox/arthur/xml_transform/templates/opendoc/xsl.xsl +++ b/scribo/sandbox/arthur/xml_transform/templates/opendoc/xsl.xsl @@ -6,7 +6,38 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>SCRIBO</title> - <link rel="stylesheet" type="text/css" href="css.css" /> + <style type="text/css"> + .line + { + position:absolute; + z-index:7; + display:inline; + white-space:pre; + + /* FIXME */ + letter-spacing:-2px; + + padding:0px; + margin:0px; + filter:alpha(opacity=100); + font-family:"Times New Roman", Times, serif; + } + .para + { + position:absolute; + z-index:6; + } + .region + { + position:absolute; + z-index:5; + } + .image + { + position:absolute; + border:0; + } + </style> </head> <body> diff --git a/scribo/sandbox/arthur/xml_transform/templates/pdf/main.xsl b/scribo/sandbox/arthur/xml_transform/templates/pdf/main.xsl index 065831e..0dbb673 100644 --- a/scribo/sandbox/arthur/xml_transform/templates/pdf/main.xsl +++ b/scribo/sandbox/arthur/xml_transform/templates/pdf/main.xsl @@ -4,6 +4,7 @@  + <xsl:import href="regions.xsl"/> <xsl:import href="line.xsl"/> <xsl:template match="/"> @@ -31,28 +32,7 @@ <fo:page-sequence master-reference="page"> <fo:flow flow-name="xsl-region-body"> - <xsl:apply-imports /> - - <fo:block-container position="absolute" z-index="-3"> - - <xsl:attribute name="left"> - 0px - </xsl:attribute> - <xsl:attribute name="top"> - 0px - </xsl:attribute> - - <fo:block> - <fo:external-graphic> - <xsl:attribute name="src"> - url('img/image.png') - </xsl:attribute> - </fo:external-graphic> - </fo:block> - - </fo:block-container> - </fo:flow> </fo:page-sequence> diff --git a/scribo/sandbox/arthur/xml_transform/templates/pdf/main64.xsl b/scribo/sandbox/arthur/xml_transform/templates/pdf/main64.xsl deleted file mode 100644 index ecc7443..0000000 --- a/scribo/sandbox/arthur/xml_transform/templates/pdf/main64.xsl +++ /dev/null @@ -1,62 +0,0 @@ -<?xml version="1.0"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0"> - -  - - <xsl:import href="line.xsl"/> - - <xsl:template match="/"> - <fo:root> - - <fo:layout-master-set> - <fo:simple-page-master master-name="page" margin-left="0cm" margin-right="0cm" margin-bottom="0cm" margin-top="0cm"> - -  - <xsl:attribute name="page-width"> - <xsl:value-of select="pcGts/page/@image_width" />px - </xsl:attribute> - <xsl:attribute name="page-height"> - <xsl:value-of select="pcGts/page/@image_height" />px - </xsl:attribute> - - <fo:region-body - margin-top="0mm" margin-bottom="0mm" - margin-left="0mm" margin-right="0mm"/> - <fo:region-after extent="0mm"/> - - </fo:simple-page-master> - </fo:layout-master-set> - - <fo:page-sequence master-reference="page"> - - <fo:flow flow-name="xsl-region-body"> - - <xsl:apply-imports /> - - <fo:block-container position="absolute" z-index="-3"> - - <xsl:attribute name="left"> - 0px - </xsl:attribute> - <xsl:attribute name="top"> - 0px - </xsl:attribute> - - <fo:block> - <fo:external-graphic> - <xsl:attribute name="src"> - data:image/png;base64,<xsl:value-of select="pcGts/page/image_region/container/data" /> - </xsl:attribute> - </fo:external-graphic> - </fo:block> - - </fo:block-container> - - </fo:flow> - - </fo:page-sequence> - </fo:root> - </xsl:template> - -</xsl:stylesheet> diff --git a/scribo/sandbox/arthur/xml_transform/templates/pdf/pdf_generator.sh b/scribo/sandbox/arthur/xml_transform/templates/pdf/pdf_generator.sh deleted file mode 100644 index c6339a5..0000000 --- a/scribo/sandbox/arthur/xml_transform/templates/pdf/pdf_generator.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -fop -xsl main.xsl -xml output.xml -pdf output.pdf \ No newline at end of file diff --git a/scribo/sandbox/arthur/xml_transform/templates/pdf/regions_base64.xsl b/scribo/sandbox/arthur/xml_transform/templates/pdf/regions.xsl similarity index 100% rename from scribo/sandbox/arthur/xml_transform/templates/pdf/regions_base64.xsl rename to scribo/sandbox/arthur/xml_transform/templates/pdf/regions.xsl diff --git a/scribo/sandbox/arthur/xml_transform/templates/pdf/regions_png.xsl b/scribo/sandbox/arthur/xml_transform/templates/pdf/regions_png.xsl deleted file mode 100644 index 65a8c79..0000000 --- a/scribo/sandbox/arthur/xml_transform/templates/pdf/regions_png.xsl +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="1.0"> - -  - - <xsl:template match="pcGts/page/image_region| - pcGts/page/graphic_region| - pcGts/page/chart_region| - pcGts/page/table_region| - pcGts/page/separator_region"> - -  - <xsl:variable name="id"> - <xsl:value-of select="@id" /> - </xsl:variable> - -  - <xsl:variable name="y1"> - <xsl:for-each select="coords/point"> - <xsl:sort select="@y" order="ascending" data-type="number"/> - <xsl:if test="position() = 1"> - <xsl:value-of select="@y" /> - </xsl:if> - </xsl:for-each> - </xsl:variable> - - <xsl:variable name="x1"> - <xsl:for-each select="coords/point"> - <xsl:sort select="@x" order="ascending" data-type="number"/> - <xsl:if test="position() = 1"> - <xsl:value-of select="@x" /> - </xsl:if> - </xsl:for-each> - </xsl:variable> -  - - <fo:block-container position="absolute"> - - <xsl:attribute name="left"> - <xsl:value-of select="$x1" />px - </xsl:attribute> - <xsl:attribute name="top"> - <xsl:value-of select="$y1" />px - </xsl:attribute> - - <fo:block> - <fo:external-graphic> - <xsl:attribute name="src"> - url('img/<xsl:value-of select="$id" />.png') - </xsl:attribute> - </fo:external-graphic> - </fo:block> - - </fo:block-container> - - </xsl:template> - -</xsl:stylesheet> diff --git a/scribo/sandbox/arthur/xml_transform/templates/pdf/svg_generator.sh b/scribo/sandbox/arthur/xml_transform/templates/pdf/svg_generator.sh deleted file mode 100644 index 0d4907c..0000000 --- a/scribo/sandbox/arthur/xml_transform/templates/pdf/svg_generator.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -fop -xsl main.xsl -xml output.xml -svg output.svg \ No newline at end of file diff --git a/scribo/sandbox/arthur/xml_transform/templates/pdf/line.xsl b/scribo/sandbox/arthur/xml_transform/templates/svg/line.xsl similarity index 100% copy from scribo/sandbox/arthur/xml_transform/templates/pdf/line.xsl copy to scribo/sandbox/arthur/xml_transform/templates/svg/line.xsl diff --git a/scribo/sandbox/arthur/xml_transform/templates/pdf/main_crop.xsl b/scribo/sandbox/arthur/xml_transform/templates/svg/main.xsl similarity index 100% rename from scribo/sandbox/arthur/xml_transform/templates/pdf/main_crop.xsl rename to scribo/sandbox/arthur/xml_transform/templates/svg/main.xsl diff --git a/scribo/sandbox/arthur/xml_transform/templates/pdf/regions_svg.xsl b/scribo/sandbox/arthur/xml_transform/templates/svg/regions.xsl similarity index 100% rename from scribo/sandbox/arthur/xml_transform/templates/pdf/regions_svg.xsl rename to scribo/sandbox/arthur/xml_transform/templates/svg/regions.xsl diff --git a/scribo/sandbox/arthur/xml_transform/templates/xml_transform.sh b/scribo/sandbox/arthur/xml_transform/templates/xml_transform.sh new file mode 100755 index 0000000..05e9569 --- /dev/null +++ b/scribo/sandbox/arthur/xml_transform/templates/xml_transform.sh @@ -0,0 +1,134 @@ +#!/bin/sh + +SRC_DIR=`dirname $0`; + +if [ -z "$1" ] +then + echo "Please give an output type !" +else + if [ -z "$2" ] + then + echo "Please give input XML file !" + else + +# HTML + if [ "$1" = "html" ] + then + which xsltproc > /dev/null; + if [ $? -eq 0 ] + then + out="$3"; + if [ -z "$out" ] + then + out="output.html" + fi + out=`readlink -f $out` + + echo "HTML output : $out" + xsltproc "$SRC_DIR/html/main.xsl" "$2" > "$out" + + rm -f $2; + fi +# HTML BASE 64 + elif [ "$1" = "html-base64" ] + then + which xsltproc > /dev/null; + if [ $? -eq 0 ] + then + out="$3"; + if [ -z "$out" ] + then + out="output.html" + fi + out=`readlink -f $out` + + echo "HTML output : $out" + xsltproc "$SRC_DIR/html/main_base64.xsl" "$2" > "$out" + fi + +# PDF/SVG + elif [ -n "`echo $1 | grep -E 'pdf(\-base64)?|svg'`" ] + then + which fop > /dev/null; + if [ $? -eq 0 ] + then + out="$3"; + +# PDF + if [ "$1" = "pdf" ] + then + if [ -z "$out" ] + then + out="output.pdf" + fi + out=`readlink -f $out` + + echo "PDF output : $out" + fop -xsl "$SRC_DIR/pdf/main.xsl" -xml "$2" -pdf "$out"; + +# SVG + elif [ "$1" = "svg" ] + then + if [ -z "$out" ] + then + out="output.svg" + fi + out=`readlink -f $out` + + echo "SVG output : $out" + fop -xsl "$SRC_DIR/svg/main.xsl" -xml "$2" -svg "$out" + else + echo "Wrong output format !"; + fi + else + echo "fop >= 0.95 required !" + fi + +# Open Document + elif [ "$1" = "oo-doc" ] + then + which xsltproc > /dev/null; + if [ $? -eq 0 ] + then + + out="$3"; + if [ -z "$out" ] + then + out="output.odt" + fi + out=`readlink -f $out` + + xsltproc "$SRC_DIR/html/main.xsl" "$2/output.xml" > "$2/out.html" + + echo "Open Document output : $out" + "$SRC_DIR/ooconvert" "$2/out.html" "$2/out.odt" > /dev/null + + cur_dir=`pwd`; + tmp_dir="$2/oo_tmp" + + mkdir $tmp_dir + unzip $tmp_dir/../out.odt -d $tmp_dir > /dev/null + + cat $tmp_dir/content.xml | sed -re 's!\.\./([a-zA-Z0-9])!Pictures/\1!g' >> $tmp_dir/tmp.xml + + mkdir $tmp_dir/Pictures + + mv $2/*.png $tmp_dir/Pictures/ + + mv $tmp_dir/tmp.xml $tmp_dir/content.xml + + cd $tmp_dir + zip zip.odt -r * > /dev/null + cp zip.odt "$out" + cd $cur_dir; + + rm -r $2; + else + echo "xsltproc required !" + fi + + else + echo "Wrong output format !"; + fi + fi +fi \ No newline at end of file diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.cc b/scribo/sandbox/arthur/xml_transform/xml_transform.cc index 90af5a5..be5a137 100644 --- a/scribo/sandbox/arthur/xml_transform/xml_transform.cc +++ b/scribo/sandbox/arthur/xml_transform/xml_transform.cc @@ -39,9 +39,15 @@ XmlTransform::XmlTransform(QString xml_file, QString image_file, QString output, QFile fx(xml_file_); if (file_ != QString::Null()) - output_dir_ = "/tmp/xml_transform"; + { + output_dir_ = QDir::tempPath() + "/xml_transform/"; + tmp_ = true; + } else - output_dir_ = output; + { + tmp_ = false; + output_dir_ = output; + } if (output_dir_ != QString::Null() && !loader_->set_output(output_dir_)) { @@ -68,29 +74,15 @@ XmlTransform::~XmlTransform() void XmlTransform::fromBase64() { - QString output = output_dir_; - output.append("img"); - - if (loader_->set_output(output)) - crop_->from_base64(); - else - abort(); + crop_->from_base64(); } -void XmlTransform::toBase64(bool crop) +void XmlTransform::toBase64(bool nocrop) { - QString output = output_dir_; - output.append("img"); - - if (loader_->set_output(output)) - { - if (!crop) - crop_->crop_regions(); + if (!nocrop) + crop_->crop_regions(tmp_); - crop_->to_base64(file_, crop); - } - else - abort(); + crop_->to_base64(file_, nocrop); } void XmlTransform::createPDF (bool crop, bool base64) @@ -99,16 +91,10 @@ void XmlTransform::createPDF (bool crop, bool base64) { if (!base64) { - QString output = output_dir_; - output.append("img"); - - if (loader_->set_output(output)) - { - if (crop) - crop_->crop_regions(); - else - crop_->save_image("image"); - } + if (crop) + crop_->crop_regions(tmp_); + else + crop_->save_image(output_dir_ + "image.png"); } loader_->add_pdf_templates(crop, base64, output_dir_); @@ -120,18 +106,7 @@ void XmlTransform::createPDF (bool crop, bool base64) void XmlTransform::createOpen () { if (loader_->xml_output(xml_file_, false, output_dir_)) - { - QString output = output_dir_; - output.append("img"); - - if (loader_->set_output(output)) - { - crop_->crop_regions(); - loader_->add_open_templates(output_dir_); - } - else - abort(); - } + crop_->crop_regions(tmp_); else abort(); } @@ -139,9 +114,7 @@ void XmlTransform::createOpen () void XmlTransform::createSVG () { if (loader_->xml_output(xml_file_, false, output_dir_)) - { - loader_->add_svg_templates(output_dir_); - } + loader_->add_svg_templates(output_dir_); else abort(); } @@ -151,15 +124,8 @@ void XmlTransform::createHTML(bool base64) if (loader_->xml_output(xml_file_, true, output_dir_)) { if (!base64) - { - QString output = output_dir_; - output.append("img"); - if (loader_->set_output(output)) - crop_->crop_regions(); - else - abort(); - } - loader_->add_html_templates(base64, output_dir_); + crop_->crop_regions(tmp_); + // loader_->add_html_templates(base64, output_dir_); } else abort(); diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.hh b/scribo/sandbox/arthur/xml_transform/xml_transform.hh index ad83fd5..ee06907 100644 --- a/scribo/sandbox/arthur/xml_transform/xml_transform.hh +++ b/scribo/sandbox/arthur/xml_transform/xml_transform.hh @@ -40,6 +40,7 @@ class XmlTransform : public QObject XmlTransform(QString xml_file, QString image_file, QString output, QString file = QString::Null()); ~XmlTransform(); + QString out() { return output_dir_; } void createHTML(bool base64); void createPDF(bool crop, bool base64); void createSVG(); @@ -54,6 +55,7 @@ private: Loader* loader_; ImageCrop* crop_; QString file_; + bool tmp_; }; #endif // !XML_TRANFORM_HH diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.pro b/scribo/sandbox/arthur/xml_transform/xml_transform.pro index c038cf6..608ce64 100644 --- a/scribo/sandbox/arthur/xml_transform/xml_transform.pro +++ b/scribo/sandbox/arthur/xml_transform/xml_transform.pro @@ -3,14 +3,14 @@ ###################################################################### TEMPLATE = app -TARGET = +TARGET = DEPENDPATH += . INCLUDEPATH += . QMAKE_CXXFLAGS += -I/amd/beyrouth/home/lrde/stage/crepin/git/olena/milena -I/amd/beyrouth/home/lrde/stage/crepin/git/olena/ QT += xml LIBS += `Magick++-config --libs` - - -# Input HEADERS += common.hh image_crop.hh loader.hh xml_transform.hh SOURCES += common.cc image_crop.cc loader.cc main.cc xml_transform.cc +PWD += + +QMAKE_POST_LINK += cp -r $$PWD/templates $$OUT_PWD -- 1.5.6.5

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
37
Older →

Jump to page: