Olena-patches November 2010

olena-patches@lrde.epita.fr

7 participants
370 discussions

last-svn-commit-576-g153406c Open Document bug warning.

by Arthur Crepin-Leblond

* arthur/xml_transform/README * arthur/xml_transform/main.cc * arthur/xml_transform/TODO: New. --- scribo/sandbox/ChangeLog | 8 ++++++ scribo/sandbox/arthur/xml_transform/README | 33 +++++++++++++-------------- scribo/sandbox/arthur/xml_transform/main.cc | 11 +++++--- 3 files changed, 31 insertions(+), 21 deletions(-) diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 1a84b5f..052bd6d 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,5 +1,13 @@ 2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> + Open Document bug warning. + + * arthur/xml_transform/README + * arthur/xml_transform/main.cc + * arthur/xml_transform/TODO: New. + +2010-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> + Fix man error. * arthur/xml_transform/README diff --git a/scribo/sandbox/arthur/xml_transform/README b/scribo/sandbox/arthur/xml_transform/README index cb04495..5c22a15 100644 --- a/scribo/sandbox/arthur/xml_transform/README +++ b/scribo/sandbox/arthur/xml_transform/README @@ -2,39 +2,38 @@ 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. + This is experimental, Open Office will warn you and ask you to repair the file which is corrupted, click on repair. 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 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. + --to-base64 input.xml image output.xmlc Creates a container XML file. It will contain regions which are cropped and converted in base 64. + --to-base64-no-crop input.xml image output.xmlc 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) and OpenOffice >= 3.xx + BUILD: -Chnage the environment variable QMAKE_CXXFLAGS in xml_transfrom.pro then +Change the environment variable QMAKE_CXXFLAGS in xml_transfrom.pro then mkdir _build cd _build diff --git a/scribo/sandbox/arthur/xml_transform/main.cc b/scribo/sandbox/arthur/xml_transform/main.cc index 9c2b5ce..8489376 100644 --- a/scribo/sandbox/arthur/xml_transform/main.cc +++ b/scribo/sandbox/arthur/xml_transform/main.cc @@ -22,12 +22,15 @@ int main(int argc, char **argv) "\t--to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format.\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" + "\tThis is experimental, Open Office will warn you and ask you to repair the file which is corrupted, click on repair.\n\n" + "Base 64 operations:\n" - "\t\033[01m--to-base64\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.xml\033[00m" + "\t\033[01m--to-base64\033[00m \033[04minput.xml\033[00m \033[04mimage\033[00m \033[04moutput.xmlc\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[04mimage\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.xmlc\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" @@ -37,7 +40,7 @@ int main(int argc, char **argv) "PDF : fop >= 0.95\n" "HTML : xsltproc\n" "SVG : trunk version of fop\n" - "OpenDocument : ooconvert"; + "OpenDocument : ooconvert (included) and OpenOffice >= 3.xx"; if (argc > 4) { -- 1.5.6.5

14 years, 1 month

last-svn-commit-575-gaf079ed Fix man error.

by Arthur Crepin-Leblond

* arthur/xml_transform/README * arthur/xml_transform/main.cc --- scribo/sandbox/ChangeLog | 7 +++++++ scribo/sandbox/arthur/xml_transform/README | 6 +++--- scribo/sandbox/arthur/xml_transform/main.cc | 13 +++++++++---- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 7f2e9a1..1a84b5f 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(a)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 9ac4973..cb04495 100644 --- a/scribo/sandbox/arthur/xml_transform/README +++ b/scribo/sandbox/arthur/xml_transform/README @@ -21,9 +21,9 @@ OpenDocument output: --open <xml> <ppm> <out_dir> : OpenDocument output (odt, odf). 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 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. For PDF/HTML/SVG/OD output, Bourne shell scripts are provided to produce the outputs, just run sh *_generator.sh Requirements: diff --git a/scribo/sandbox/arthur/xml_transform/main.cc b/scribo/sandbox/arthur/xml_transform/main.cc index 34a1b6e..9c2b5ce 100644 --- a/scribo/sandbox/arthur/xml_transform/main.cc +++ b/scribo/sandbox/arthur/xml_transform/main.cc @@ -24,10 +24,15 @@ int main(int argc, char **argv) "OpenDocument output:\n" "\t--open <xml> <ppm> <out_dir> : OpenDocument output (odt, odf).\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[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" + "\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" -- 1.5.6.5

14 years, 1 month

last-svn-commit-574-gf0997ba Add arrows shortcuts.

by Arthur Crepin-Leblond

* 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

14 years, 1 month

last-svn-commit-573-g811f992 Delete two build files.

by Arthur Crepin-Leblond

* arthur/xml_transform/_build/common.o, * arthur/xml_transform/_build/image_crop.o: Delete. --- scribo/sandbox/ChangeLog | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 176e809..7f2e9a1 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,3 +1,46 @@ +2010-08-05 Arthur Crepin-Leblond <crepin(a)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-08-06 Arthur Crepin-Leblond <crepin(a)lrde.epita.fr> + + Delete two build files. + + * arthur/xml_transform/_build/common.o, + * arthur/xml_transform/_build/image_crop.o: Delete. + 2010-07-23 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> OpenDocument output (odt and odf). -- 1.5.6.5

14 years, 1 month

last-svn-commit-572-g32f92e4 Add shortcuts in Qt interface.

by Arthur Crepin-Leblond

* 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

14 years, 1 month

last-svn-commit-571-g9c0bdaa Fix bug in Qt interface.

by Arthur Crepin-Leblond

* scribo/demo/viewer/key_widget.cc * scribo/demo/viewer/viewer.cc --- scribo/ChangeLog | 7 +++++++ scribo/demo/viewer/key_widget.cc | 8 ++++---- scribo/demo/viewer/viewer.cc | 8 +++++--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 69d6306..1417b40 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2010-08-04 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> + + Fix bug in Qt interface. + + * scribo/demo/viewer/key_widget.cc + * scribo/demo/viewer/viewer.cc + 2010-07-21 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> Fix Segfault bug in Qt interface. diff --git a/scribo/demo/viewer/key_widget.cc b/scribo/demo/viewer/key_widget.cc index 44839c5..228ad67 100644 --- a/scribo/demo/viewer/key_widget.cc +++ b/scribo/demo/viewer/key_widget.cc @@ -90,16 +90,16 @@ KeyWidget::change_mode(bool b) if (b) { - text_->child(id_region)->setCheckState(0, Qt::Checked); + //text_->child(id_region)->setCheckState(0, Qt::Checked); text_->child(id_region)->setHidden(false); - text_->child(id_line)->setCheckState(0, Qt::Checked); + // text_->child(id_line)->setCheckState(0, Qt::Checked); text_->child(id_line)->setHidden(false); } else { - text_->child(id_region)->setCheckState(0, Qt::Unchecked); + //text_->child(id_region)->setCheckState(0, Qt::Unchecked); text_->child(id_region)->setHidden(true); - text_->child(id_line)->setCheckState(0, Qt::Unchecked); + // text_->child(id_line)->setCheckState(0, Qt::Unchecked); text_->child(id_line)->setHidden(true); } } diff --git a/scribo/demo/viewer/viewer.cc b/scribo/demo/viewer/viewer.cc index 36b8d82..38ca8b1 100644 --- a/scribo/demo/viewer/viewer.cc +++ b/scribo/demo/viewer/viewer.cc @@ -441,7 +441,7 @@ Viewer::load_xml(QString filename) } } - if (extended_mode_ && + if ((extended_mode_ || text_) && region.toElement().tagName().contains("text_region")) { QDomNode para = region.firstChild(); @@ -450,7 +450,8 @@ Viewer::load_xml(QString filename) if (!para.isNull()) { - add_region(para, attr_id); + if (extended_mode_) + add_region(para, attr_id); QDomNode line = para.firstChild(); while (!line.isNull() && !line.toElement().tagName().contains("line")) @@ -458,7 +459,8 @@ Viewer::load_xml(QString filename) if (!line.isNull()) { - add_region(line, attr_id); + if (extended_mode_) + add_region(line, attr_id); add_text(line, region); } } -- 1.5.6.5

14 years, 1 month

last-svn-commit-570-g09c08ad OpenDocument output (odt and odf).

by Arthur Crepin-Leblond

* arthur/xml_transform/templates/opendoc/css.css, * arthur/xml_transform/templates/opendoc/opendoc_generator.sh, * arthur/xml_transform/templates/opendoc/xsl.xsl: New. * arthur/xml_transform/README * arthur/xml_transform/loader.cc * arthur/xml_transform/loader.hh * arthur/xml_transform/main.cc * arthur/xml_transform/xml_transform.cc * arthur/xml_transform/xml_transform.hh --- scribo/sandbox/ChangeLog | 15 ++++++++++++ scribo/sandbox/arthur/xml_transform/README | 9 ++++++- scribo/sandbox/arthur/xml_transform/loader.cc | 12 ++++++++++ scribo/sandbox/arthur/xml_transform/loader.hh | 1 + scribo/sandbox/arthur/xml_transform/main.cc | 18 ++++++++++++-- .../templates/{html => opendoc}/css.css | 1 - .../templates/opendoc/opendoc_generator.sh | 24 ++++++++++++++++++++ .../templates/{html => opendoc}/xsl.xsl | 6 +---- .../sandbox/arthur/xml_transform/xml_transform.cc | 19 +++++++++++++++ .../sandbox/arthur/xml_transform/xml_transform.hh | 1 + 10 files changed, 96 insertions(+), 10 deletions(-) copy scribo/sandbox/arthur/xml_transform/templates/{html => opendoc}/css.css (93%) mode change 100644 => 100755 create mode 100755 scribo/sandbox/arthur/xml_transform/templates/opendoc/opendoc_generator.sh copy scribo/sandbox/arthur/xml_transform/templates/{html => opendoc}/xsl.xsl (95%) mode change 100644 => 100755 diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 7c53037..176e809 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,3 +1,18 @@ +2010-07-23 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> + + OpenDocument output (odt and odf). + + * arthur/xml_transform/templates/opendoc/css.css, + * arthur/xml_transform/templates/opendoc/opendoc_generator.sh, + * arthur/xml_transform/templates/opendoc/xsl.xsl: New. + + * arthur/xml_transform/README + * arthur/xml_transform/loader.cc + * arthur/xml_transform/loader.hh + * arthur/xml_transform/main.cc + * arthur/xml_transform/xml_transform.cc + * arthur/xml_transform/xml_transform.hh + 2010-07-22 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> SVG output. diff --git a/scribo/sandbox/arthur/xml_transform/README b/scribo/sandbox/arthur/xml_transform/README index 4e98a76..9ac4973 100644 --- a/scribo/sandbox/arthur/xml_transform/README +++ b/scribo/sandbox/arthur/xml_transform/README @@ -16,14 +16,21 @@ SVG output: Base 64 operations: --to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format. + +OpenDocument output: + --open <xml> <ppm> <out_dir> : OpenDocument output (odt, odf). + +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. -For PDF/HTML/SVG output, Bourne shell scripts are provided to produce the outputs, just run sh *_generator.sh +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 BUILD: diff --git a/scribo/sandbox/arthur/xml_transform/loader.cc b/scribo/sandbox/arthur/xml_transform/loader.cc index 1698899..d4778a9 100644 --- a/scribo/sandbox/arthur/xml_transform/loader.cc +++ b/scribo/sandbox/arthur/xml_transform/loader.cc @@ -141,6 +141,18 @@ void Loader::add_svg_templates(QString output) xsl.copy(output + "main.xsl"); } +void Loader::add_open_templates(QString output) +{ + QFile css("templates/opendoc/css.css"); + css.copy(output + "css.css"); + + QFile gen("templates/opendoc/opendoc_generator.sh"); + gen.copy(output + "opendoc_generator.sh"); + + QFile xsl("templates/opendoc/xsl.xsl"); + xsl.copy(output + "xsl.xsl"); +} + bool Loader::xml_output(QString xml_file, bool html, QString output) { QFile file(xml_file); diff --git a/scribo/sandbox/arthur/xml_transform/loader.hh b/scribo/sandbox/arthur/xml_transform/loader.hh index 3cbae5c..a5c3637 100644 --- a/scribo/sandbox/arthur/xml_transform/loader.hh +++ b/scribo/sandbox/arthur/xml_transform/loader.hh @@ -43,6 +43,7 @@ class Loader : public QObject bool set_output(QString& output); void add_pdf_templates(bool crop, bool base64, QString output); void add_svg_templates(QString output); + void add_open_templates(QString output); void add_html_templates(bool base64, QString output); }; diff --git a/scribo/sandbox/arthur/xml_transform/main.cc b/scribo/sandbox/arthur/xml_transform/main.cc index d1c789d..34a1b6e 100644 --- a/scribo/sandbox/arthur/xml_transform/main.cc +++ b/scribo/sandbox/arthur/xml_transform/main.cc @@ -19,18 +19,25 @@ int main(int argc, char **argv) "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" + + "OpenDocument output:\n" + "\t--open <xml> <ppm> <out_dir> : OpenDocument output (odt, odf).\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 output, Bourne shell scripts are provided to produce the outputs, just run sh *_generator.sh \n" + "For PDF/HTML/SVG/OD output, Bourne shell scripts are provided to produce the outputs, just run sh *_generator.sh \n" "Requirements:\n" "PDF : fop >= 0.95\n" "HTML : xsltproc\n" - "SVG : trunk version of fop\n"; + "SVG : trunk version of fop\n" + "OpenDocument : ooconvert"; if (argc > 4) { std::string html = "--html"; + std::string open = "--open"; std::string pdf = "--pdf"; std::string pdf_no_crop = "--pdf-no-crop"; std::string to_base64 = "--to-base64"; @@ -41,11 +48,16 @@ int main(int argc, char **argv) XmlTransform xmlt(argv[2], argv[3], argv[4]); xmlt.createHTML(false); } - if (pdf.compare(argv[1]) == 0) + else if (pdf.compare(argv[1]) == 0) { XmlTransform xmlt(argv[2], argv[3], argv[4]); xmlt.createPDF(true, false); } + else if (open.compare(argv[1]) == 0) + { + XmlTransform xmlt(argv[2], argv[3], argv[4]); + xmlt.createOpen(); + } else if (pdf_no_crop.compare(argv[1]) == 0) { XmlTransform xmlt(argv[2], argv[3], argv[4]); diff --git a/scribo/sandbox/arthur/xml_transform/templates/html/css.css b/scribo/sandbox/arthur/xml_transform/templates/opendoc/css.css old mode 100644 new mode 100755 similarity index 93% copy from scribo/sandbox/arthur/xml_transform/templates/html/css.css copy to scribo/sandbox/arthur/xml_transform/templates/opendoc/css.css index 0443390..1559149 --- a/scribo/sandbox/arthur/xml_transform/templates/html/css.css +++ b/scribo/sandbox/arthur/xml_transform/templates/opendoc/css.css @@ -1,7 +1,6 @@ .line { position:absolute; - background-color:white; z-index:7; display:inline; white-space:pre; diff --git a/scribo/sandbox/arthur/xml_transform/templates/opendoc/opendoc_generator.sh b/scribo/sandbox/arthur/xml_transform/templates/opendoc/opendoc_generator.sh new file mode 100755 index 0000000..c2d9e6f --- /dev/null +++ b/scribo/sandbox/arthur/xml_transform/templates/opendoc/opendoc_generator.sh @@ -0,0 +1,24 @@ +#!/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/html/xsl.xsl b/scribo/sandbox/arthur/xml_transform/templates/opendoc/xsl.xsl old mode 100644 new mode 100755 similarity index 95% copy from scribo/sandbox/arthur/xml_transform/templates/html/xsl.xsl copy to scribo/sandbox/arthur/xml_transform/templates/opendoc/xsl.xsl index 1f29044..bf1cc30 --- a/scribo/sandbox/arthur/xml_transform/templates/html/xsl.xsl +++ b/scribo/sandbox/arthur/xml_transform/templates/opendoc/xsl.xsl @@ -15,8 +15,6 @@ pcGts/page/chart_region| pcGts/page/table_region| pcGts/page/separator_region| - pcGts/page/text_region| - pcGts/page/text_region/paragraph| pcGts/page/text_region/paragraph/line">  @@ -129,10 +127,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; diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.cc b/scribo/sandbox/arthur/xml_transform/xml_transform.cc index c40366a..90af5a5 100644 --- a/scribo/sandbox/arthur/xml_transform/xml_transform.cc +++ b/scribo/sandbox/arthur/xml_transform/xml_transform.cc @@ -117,6 +117,25 @@ void XmlTransform::createPDF (bool crop, bool base64) abort(); } +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(); + } + else + abort(); +} + void XmlTransform::createSVG () { if (loader_->xml_output(xml_file_, false, output_dir_)) diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.hh b/scribo/sandbox/arthur/xml_transform/xml_transform.hh index 30d5c6c..ad83fd5 100644 --- a/scribo/sandbox/arthur/xml_transform/xml_transform.hh +++ b/scribo/sandbox/arthur/xml_transform/xml_transform.hh @@ -43,6 +43,7 @@ class XmlTransform : public QObject void createHTML(bool base64); void createPDF(bool crop, bool base64); void createSVG(); + void createOpen(); void toBase64(bool crop); void fromBase64(); -- 1.5.6.5

14 years, 1 month

last-svn-commit-569-gde57fc4 SVG output.

by Arthur Crepin-Leblond

* arthur/xml_transform/README * arthur/xml_transform/loader.cc * arthur/xml_transform/loader.hh * arthur/xml_transform/main.cc * arthur/xml_transform/xml_transform.cc * arthur/xml_transform/xml_transform.hh * arthur/xml_transform/templates/pdf/regions_svg.xsl, * arthur/xml_transform/templates/pdf/svg_generator.sh: New. --- scribo/sandbox/ChangeLog | 15 +++ scribo/sandbox/arthur/xml_transform/README | 25 ++++-- scribo/sandbox/arthur/xml_transform/loader.cc | 15 +++ scribo/sandbox/arthur/xml_transform/loader.hh | 1 + scribo/sandbox/arthur/xml_transform/main.cc | 41 ++++++--- .../xml_transform/templates/pdf/regions_svg.xsl | 98 ++++++++++++++++++++ .../xml_transform/templates/pdf/svg_generator.sh | 3 + .../sandbox/arthur/xml_transform/xml_transform.cc | 10 ++ .../sandbox/arthur/xml_transform/xml_transform.hh | 1 + 9 files changed, 188 insertions(+), 21 deletions(-) create mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/regions_svg.xsl create mode 100644 scribo/sandbox/arthur/xml_transform/templates/pdf/svg_generator.sh diff --git a/scribo/sandbox/ChangeLog b/scribo/sandbox/ChangeLog index 8d7b3e9..7c53037 100644 --- a/scribo/sandbox/ChangeLog +++ b/scribo/sandbox/ChangeLog @@ -1,3 +1,18 @@ +2010-07-22 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> + + SVG output. + + * arthur/xml_transform/README + * arthur/xml_transform/loader.cc + * arthur/xml_transform/loader.hh + * arthur/xml_transform/main.cc + * arthur/xml_transform/xml_transform.cc + * arthur/xml_transform/xml_transform.hh + + * arthur/xml_transform/templates/pdf/regions_svg.xsl, + * arthur/xml_transform/templates/pdf/svg_generator.sh: New. + + 2010-07-15 Arthur Crepin-Leblond <crepin(a)stockholm.lrde.epita.fr> XML Tranform. diff --git a/scribo/sandbox/arthur/xml_transform/README b/scribo/sandbox/arthur/xml_transform/README index aedf220..4e98a76 100644 --- a/scribo/sandbox/arthur/xml_transform/README +++ b/scribo/sandbox/arthur/xml_transform/README @@ -1,23 +1,29 @@ xml_transform - OPTIONS: HTML output: - --html <xml> <ppm> <out_dir> : HTML output with non-text regions croped into many png files. + --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. PDF output: - --pdf <xml> <ppm> <out_dir> : PDF output with non-text regions croped into many png files. + --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-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. + +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 croped pictures into base 64 format. + --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. +For PDF/HTML/SVG 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 BUILD: @@ -25,5 +31,10 @@ Chnage the environment variable QMAKE_CXXFLAGS in xml_transfrom.pro then mkdir _build cd _build +cp -r ../templates . qmake ../xml_transfrom.pro -make \ No newline at end of file +make + +/!\ IMPORTANT NOTE /!\ + +xml_transfrom uses a templates directory, binary and this folder should be in the same place. \ No newline at end of file diff --git a/scribo/sandbox/arthur/xml_transform/loader.cc b/scribo/sandbox/arthur/xml_transform/loader.cc index 2b64337..1698899 100644 --- a/scribo/sandbox/arthur/xml_transform/loader.cc +++ b/scribo/sandbox/arthur/xml_transform/loader.cc @@ -126,6 +126,21 @@ void Loader::add_pdf_templates(bool crop, bool base64, QString output) } } +void Loader::add_svg_templates(QString output) +{ + QFile regions("templates/pdf/regions_svg.xsl"); + regions.copy(output + "regions.xsl"); + + QFile gen("templates/pdf/svg_generator.sh"); + gen.copy(output + "svg_generator.sh"); + + QFile line("templates/pdf/line.xsl"); + line.copy(output + "line.xsl"); + + QFile xsl("templates/pdf/main_crop.xsl"); + xsl.copy(output + "main.xsl"); +} + bool Loader::xml_output(QString xml_file, bool html, QString output) { QFile file(xml_file); diff --git a/scribo/sandbox/arthur/xml_transform/loader.hh b/scribo/sandbox/arthur/xml_transform/loader.hh index fadceed..3cbae5c 100644 --- a/scribo/sandbox/arthur/xml_transform/loader.hh +++ b/scribo/sandbox/arthur/xml_transform/loader.hh @@ -42,6 +42,7 @@ class Loader : public QObject QDomDocument* xml_to_dom(QString xml_file); bool set_output(QString& output); void add_pdf_templates(bool crop, bool base64, QString output); + void add_svg_templates(QString output); void add_html_templates(bool base64, QString output); }; diff --git a/scribo/sandbox/arthur/xml_transform/main.cc b/scribo/sandbox/arthur/xml_transform/main.cc index c259c76..d1c789d 100644 --- a/scribo/sandbox/arthur/xml_transform/main.cc +++ b/scribo/sandbox/arthur/xml_transform/main.cc @@ -6,20 +6,27 @@ int main(int argc, char **argv) { std::string man; - man = "xml_transform\n"; - man += "OPTIONS:\n\n"; - man += "HTML output:\n"; - man += "\t--html <xml> <ppm> <out_dir> : HTML output with non-text regions cropped into many png files.\n"; - man += "\t--html-base64 <xml> <out_dir> : HTML output from a container XML file.\n\n"; - man += "PDF output:\n"; - man += "\t--pdf <xml> <ppm> <out_dir> : PDF output with non-text regions cropped into many png files.\n"; - man += "\t--pdf-no-crop <xml> <ppm> <out_dir>: PDF output with the entire picture displayed over the text.\n"; - man += "\t--pdf-base64 <xml> <out_dir> : PDF output from a container XML file.\n"; - man += "\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"; - man += "Base 64 operations:\n"; - man += "\t--to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format.\n"; - man += "\t--to-base64-no-crop <xml> <ppm> <out_xml> : Same as to-base64 but only the picture is converted in base 64.\n"; - man += "\t--from-base64 <xml> <out_dir> : Decodes a XML container file to produce original image files.\n"; + 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" + "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" + "\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 output, Bourne shell scripts are provided to produce the outputs, just run sh *_generator.sh \n" + "Requirements:\n" + "PDF : fop >= 0.95\n" + "HTML : xsltproc\n" + "SVG : trunk version of fop\n"; if (argc > 4) { @@ -60,6 +67,7 @@ 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 from_base64 = "--from-base64"; @@ -69,6 +77,11 @@ int main(int argc, char **argv) XmlTransform xmlt(argv[2], QString::Null(), argv[3]); xmlt.createPDF(true, true); } + else if (svg.compare(argv[1]) == 0) + { + XmlTransform xmlt(argv[2], QString::Null(), argv[3]); + xmlt.createSVG(); + } else if (pdfbase64nocrop.compare(argv[1]) == 0) { XmlTransform xmlt(argv[2], QString::Null(), argv[3]); diff --git a/scribo/sandbox/arthur/xml_transform/templates/pdf/regions_svg.xsl b/scribo/sandbox/arthur/xml_transform/templates/pdf/regions_svg.xsl new file mode 100644 index 0000000..86b5f51 --- /dev/null +++ b/scribo/sandbox/arthur/xml_transform/templates/pdf/regions_svg.xsl @@ -0,0 +1,98 @@ +<?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="data"> + <xsl:value-of select="container/data" /> + </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> + + <xsl:variable name="y2"> + <xsl:for-each select="coords/point"> + <xsl:sort select="@y" order="descending" data-type="number"/> + <xsl:if test="position() = 1"> + <xsl:value-of select="@y" /> + </xsl:if> + </xsl:for-each> + </xsl:variable> + + <xsl:variable name="x2"> + <xsl:for-each select="coords/point"> + <xsl:sort select="@x" order="descending" data-type="number"/> + <xsl:if test="position() = 1"> + <xsl:value-of select="@x" /> + </xsl:if> + </xsl:for-each> + </xsl:variable> +  + + <fo:block-container> + + <fo:block> + <fo:instream-foreign-object> + <svg:svg xmlns:svg="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + Version="1.1"> + + <xsl:attribute name="viewBox"> + <xsl:value-of select="$x1" /> <xsl:value-of select="$y1" /> <xsl:value-of select="$x2" /> <xsl:value-of select="$y2" /> + </xsl:attribute> + + <svg:image position="absolute"> + + <xsl:attribute name="y"> + <xsl:value-of select="$y1" /> + </xsl:attribute> + + <xsl:attribute name="x"> + <xsl:value-of select="$x1" /> + </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="xlink:href">data:image/png;base64,<xsl:value-of select="$data" /></xsl:attribute> + </svg:image> + + </svg:svg> + + </fo:instream-foreign-object> + + </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 new file mode 100644 index 0000000..0d4907c --- /dev/null +++ b/scribo/sandbox/arthur/xml_transform/templates/pdf/svg_generator.sh @@ -0,0 +1,3 @@ +#!/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/xml_transform.cc b/scribo/sandbox/arthur/xml_transform/xml_transform.cc index ebfbed8..c40366a 100644 --- a/scribo/sandbox/arthur/xml_transform/xml_transform.cc +++ b/scribo/sandbox/arthur/xml_transform/xml_transform.cc @@ -117,6 +117,16 @@ void XmlTransform::createPDF (bool crop, bool base64) abort(); } +void XmlTransform::createSVG () +{ + if (loader_->xml_output(xml_file_, false, output_dir_)) + { + loader_->add_svg_templates(output_dir_); + } + else + abort(); +} + void XmlTransform::createHTML(bool base64) { if (loader_->xml_output(xml_file_, true, output_dir_)) diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.hh b/scribo/sandbox/arthur/xml_transform/xml_transform.hh index 172bddb..30d5c6c 100644 --- a/scribo/sandbox/arthur/xml_transform/xml_transform.hh +++ b/scribo/sandbox/arthur/xml_transform/xml_transform.hh @@ -42,6 +42,7 @@ class XmlTransform : public QObject void createHTML(bool base64); void createPDF(bool crop, bool base64); + void createSVG(); void toBase64(bool crop); void fromBase64(); -- 1.5.6.5

14 years, 1 month

last-svn-commit-568-g58691e5 Fix Segfault bug in Qt interface.

by Arthur Crepin-Leblond

* demo/viewer/viewer.cc: Clean vectors when load new picture. --- scribo/ChangeLog | 6 ++++++ scribo/demo/viewer/viewer.cc | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1462eb2..69d6306 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,11 @@ 2010-07-21 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> + Fix Segfault bug in Qt interface. + + * demo/viewer/viewer.cc: Clean vectors when load new picture. + +2010-07-21 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> + Small changes in xml_transform. * scribo/sandbox/arthur/xml_transform/README diff --git a/scribo/demo/viewer/viewer.cc b/scribo/demo/viewer/viewer.cc index 10c1a43..36b8d82 100644 --- a/scribo/demo/viewer/viewer.cc +++ b/scribo/demo/viewer/viewer.cc @@ -331,18 +331,17 @@ Viewer::add_region(QDomNode father, QString attr_id) void Viewer::load_xml(QString filename) { - text_vector_.clear(); - image_vector_.clear(); - app_->setOverrideCursor(QCursor(Qt::WaitCursor)); emit fill_xml(filename); if (image_ && image_->scene() && image_->scene() == scene_) scene_->removeItem(image_); + text_vector_.clear(); + image_vector_.clear(); scene_->clear(); - if (!base64_ && use_image_) + if (!base64_ && use_image_ && image_) scene_->addItem(image_); scene_->update(); @@ -470,7 +469,7 @@ Viewer::load_xml(QString filename) region = region.nextSibling(); } - emit updated(); + //emit updated(); scene_->update(); key_wgt_->update_all(); @@ -483,8 +482,11 @@ Viewer::load(QString filename, bool b) app_->setOverrideCursor(QCursor(Qt::WaitCursor)); scene_->clear(); + text_vector_.clear(); + image_vector_.clear(); scene_->update(); image_ = 0; + xml_file_ = QString::Null(); // Load the image in a pixmap that is directly shown on screen. // This is very slow when used with the normal rendering system. -- 1.5.6.5

14 years, 1 month

last-svn-commit-567-g99635db Small changes in xml_transform.

by Arthur Crepin-Leblond

* scribo/sandbox/arthur/xml_transform/README * scribo/sandbox/arthur/xml_transform/image_crop.cc: Delete verbose mode. * scribo/sandbox/arthur/xml_transform/main.cc: Small fix. --- scribo/ChangeLog | 9 +++++++++ scribo/sandbox/arthur/xml_transform/README | 7 ++++++- scribo/sandbox/arthur/xml_transform/image_crop.cc | 8 ++++---- scribo/sandbox/arthur/xml_transform/main.cc | 6 +++--- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index ddd6a10..1462eb2 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2010-07-21 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> + Small changes in xml_transform. + + * scribo/sandbox/arthur/xml_transform/README + + * scribo/sandbox/arthur/xml_transform/image_crop.cc: Delete verbose mode. + * scribo/sandbox/arthur/xml_transform/main.cc: Small fix. + +2010-07-21 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> + Files headers change + base64 data hide in xml tree. * scribo/demo/viewer/README, diff --git a/scribo/sandbox/arthur/xml_transform/README b/scribo/sandbox/arthur/xml_transform/README index 1f358e3..aedf220 100644 --- a/scribo/sandbox/arthur/xml_transform/README +++ b/scribo/sandbox/arthur/xml_transform/README @@ -21,4 +21,9 @@ Base 64 operations: BUILD: -Chnage the environment variable QMAKE_CXXFLAGS to indicate the correct paths to milena and olena in the .pro file then, just type qmake and make. \ No newline at end of file +Chnage the environment variable QMAKE_CXXFLAGS in xml_transfrom.pro then + +mkdir _build +cd _build +qmake ../xml_transfrom.pro +make \ No newline at end of file diff --git a/scribo/sandbox/arthur/xml_transform/image_crop.cc b/scribo/sandbox/arthur/xml_transform/image_crop.cc index 8aafe45..ffe2b44 100644 --- a/scribo/sandbox/arthur/xml_transform/image_crop.cc +++ b/scribo/sandbox/arthur/xml_transform/image_crop.cc @@ -61,10 +61,10 @@ void ImageCrop::save_image(QString file) else filename = file; - std::cout << "Saving " << image_.toStdString() << " to " - << output_dir_.toStdString() << "img/" - << filename.toStdString() << ".png" - << std::endl; + // 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"); } diff --git a/scribo/sandbox/arthur/xml_transform/main.cc b/scribo/sandbox/arthur/xml_transform/main.cc index e097430..c259c76 100644 --- a/scribo/sandbox/arthur/xml_transform/main.cc +++ b/scribo/sandbox/arthur/xml_transform/main.cc @@ -9,15 +9,15 @@ int main(int argc, char **argv) man = "xml_transform\n"; man += "OPTIONS:\n\n"; man += "HTML output:\n"; - man += "\t--html <xml> <ppm> <out_dir> : HTML output with non-text regions croped into many png files.\n"; + man += "\t--html <xml> <ppm> <out_dir> : HTML output with non-text regions cropped into many png files.\n"; man += "\t--html-base64 <xml> <out_dir> : HTML output from a container XML file.\n\n"; man += "PDF output:\n"; - man += "\t--pdf <xml> <ppm> <out_dir> : PDF output with non-text regions croped into many png files.\n"; + man += "\t--pdf <xml> <ppm> <out_dir> : PDF output with non-text regions cropped into many png files.\n"; man += "\t--pdf-no-crop <xml> <ppm> <out_dir>: PDF output with the entire picture displayed over the text.\n"; man += "\t--pdf-base64 <xml> <out_dir> : PDF output from a container XML file.\n"; man += "\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"; man += "Base 64 operations:\n"; - man += "\t--to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting croped pictures into base 64 format.\n"; + man += "\t--to-base64 <xml> <ppm> <out_xml> : Produces a container XML file by converting cropped pictures into base 64 format.\n"; man += "\t--to-base64-no-crop <xml> <ppm> <out_xml> : Same as to-base64 but only the picture is converted in base 64.\n"; man += "\t--from-base64 <xml> <out_dir> : Decodes a XML container file to produce original image files.\n"; -- 1.5.6.5

14 years, 1 month

← Newer
1
...
9
10
11
12
13
14
15
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches November 2010