- Olena-patches

last-svn-commit-757-g9e5a4bf demo/viewer/runner.cc: Clear arguments on new process.
by Guillaume Lazzara 18 Feb '11

18 Feb '11

--- scribo/ChangeLog | 4 ++++ scribo/demo/viewer/runner.cc | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b19115d..be2e395 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2011-02-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/viewer/runner.cc: Clear arguments on new process. + 2011-01-28 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/unit_test/unit-tests.mk: Regen. diff --git a/scribo/demo/viewer/runner.cc b/scribo/demo/viewer/runner.cc index 085ef39..86ff5dc 100644 --- a/scribo/demo/viewer/runner.cc +++ b/scribo/demo/viewer/runner.cc @@ -94,6 +94,7 @@ void runner::stop() void runner::start_demat(const QString& filename) { + args_.clear(); args_ << filename; mode_ = Demat; @@ -191,6 +192,7 @@ void runner::process(const image2d<value::rgb8>& original_ima, void runner::start_export(const QString& imgfile, const QString& xmlfile, const QString& outfile) { + args_.clear(); args_ << imgfile << xmlfile << outfile; mode_ = Export; -- 1.5.6.5

1 0

last-svn-commit-539-g742ddd1 configure.ac: Make Boost dependency optional.
by Guillaume Lazzara 16 Feb '11

16 Feb '11

--- ChangeLog | 4 ++++ configure.ac | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b63a9a3..2c3ec15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-01-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Make Boost dependency optional. + 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> Honor `--without-qt' in configure. diff --git a/configure.ac b/configure.ac index 1febf2c..1146d9b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2006, 2007, 2008, 2009, 2010 EPITA Research and +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 EPITA Research and # Development Laboratory (LRDE). # # This file is part of Olena. @@ -194,6 +194,9 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) # Boost. # # ------- # +# Check if Boost is available, if not just print a warning, otherwise +# look for boost:tuple. +BOOST_REQUIRE(1.3, [AC_DEFINE([HAVE_BOOST], [0])]) BOOST_TUPLE AM_CONDITIONAL([HAVE_BOOST_TUPLE], [test "x$ac_cv_header_boost_tuple_tuple_hpp" = xyes]) -- 1.5.6.5

1 0

branch next updated: last-svn-commit-539-g742ddd1
by lazzara＠lrde.epita.fr 16 Feb '11

16 Feb '11

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 has been updated via 742ddd1264342667c087c0d6cb17e7bd0203dc95 (commit) from 2f44565f67f0ef414e59ad84967397cce6167bfd (commit) 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 ----------------------------------------------------------------- 742ddd1 configure.ac: Make Boost dependency optional. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ configure.ac | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-761-gf54c0a6 demo/viewer/xml_widget.cc: Fix data tracking of selected objects.
by Guillaume Lazzara 05 Feb '11

05 Feb '11

--- scribo/ChangeLog | 5 ++ scribo/demo/viewer/xml_widget.cc | 117 ++++++++++++++++++-------------------- 2 files changed, 60 insertions(+), 62 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 03705c9..4c39daf 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2011-02-05 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/viewer/xml_widget.cc: Fix data tracking of selected + objects. + +2011-02-05 Guillaume Lazzara <z(a)lrde.epita.fr> + Display baseline and meanline in Scribo viewer. * demo/viewer/common.hh: Add new enums. diff --git a/scribo/demo/viewer/xml_widget.cc b/scribo/demo/viewer/xml_widget.cc index c45177b..1f2bc83 100644 --- a/scribo/demo/viewer/xml_widget.cc +++ b/scribo/demo/viewer/xml_widget.cc @@ -50,21 +50,14 @@ XmlWidget::select(QString id, QString name) { QDomNode n = node_map_[item_map_[id]]; - if (name.contains("Text line")) - { - n = n.firstChild(); - while (!n.isNull() && !n.toElement().tagName().contains("line")) - n = n.nextSibling(); - } - if (!n.isNull()) - { - QTreeWidgetItem* item = node_map_.key(n); + { + QTreeWidgetItem* item = node_map_.key(n); - tree_->setCurrentItem(item, 0); - item->setExpanded(true); - check_item(item); - } + tree_->setCurrentItem(item, 0); + item->setExpanded(true); + check_item(item); + } } void @@ -73,17 +66,17 @@ XmlWidget::check_item (QTreeWidgetItem* item) QDomNode node = node_map_[item]; if (node.hasAttributes()) + { + property_->clear(); + QDomNamedNodeMap attributes = node.toElement().attributes(); + + for (int i = 0; i < attributes.count(); ++i) { - property_->clear(); - QDomNamedNodeMap attributes = node.toElement().attributes(); - - for (int i = 0; i < attributes.count(); ++i) - { - QStringList values; - values << attributes.item(i).toAttr().name() << attributes.item(i).toAttr().value(); - property_->addTopLevelItem(new QTreeWidgetItem(values)); - } + QStringList values; + values << attributes.item(i).toAttr().name() << attributes.item(i).toAttr().value(); + property_->addTopLevelItem(new QTreeWidgetItem(values)); } + } property_->resizeColumnToContents(0); } @@ -91,42 +84,42 @@ XmlWidget::check_item (QTreeWidgetItem* item) void XmlWidget::NFS(QDomNode node, QTreeWidgetItem* item) { if (!node.isNull()) + { + QString append; + if (node.toElement().tagName().contains("point")) + { + QString x = node.toElement().attribute("x", "0"); + QString y = node.toElement().attribute("y", "0"); + append.append(" = (" + x + ", " + y + ")"); + } + + QTreeWidgetItem* child = + new QTreeWidgetItem(QStringList(node.toElement().tagName() + node.nodeValue() + append)); + + if (node.hasAttributes()) + { + QString id = node.toElement().attribute("id", "none"); + item_map_[id] = child; + } + + node_map_[child] = node; + item->addChild(child); + + QDomNode sibling = node.firstChild(); + while (!sibling.isNull()) { - QString append; - if (node.toElement().tagName().contains("point")) - { - QString x = node.toElement().attribute("x", "0"); - QString y = node.toElement().attribute("y", "0"); - append.append(" = (" + x + ", " + y + ")"); - } - - QTreeWidgetItem* child = - new QTreeWidgetItem(QStringList(node.toElement().tagName() + node.nodeValue() + append)); - - if (node.hasAttributes()) - { - QString id = node.toElement().attribute("id", "none"); - item_map_[id] = child; - } - - node_map_[child] = node; - item->addChild(child); - - QDomNode sibling = node.firstChild(); - while (!sibling.isNull()) - { - if (!sibling.toElement().tagName().contains("data")) - NFS(sibling, child); - else - { - QTreeWidgetItem* child_son = - new QTreeWidgetItem(QStringList("data = base64-encoded")); - - child->addChild(child_son); - } - sibling = sibling.nextSibling(); - } + if (!sibling.toElement().tagName().contains("data")) + NFS(sibling, child); + else + { + QTreeWidgetItem* child_son = + new QTreeWidgetItem(QStringList("data = base64-encoded")); + + child->addChild(child_son); + } + sibling = sibling.nextSibling(); } + } } void XmlWidget::fill_widget(QString xml) @@ -147,17 +140,17 @@ void XmlWidget::fill_widget(QString xml) QDomElement root = doc.documentElement(); QTreeWidgetItem* root_item= - new QTreeWidgetItem(QStringList(root.tagName())); + new QTreeWidgetItem(QStringList(root.tagName())); tree_->addTopLevelItem(root_item); root = root.firstChild().toElement(); while (!root.isNull()) - { - ++i; - NFS(root, root_item); - root = root.nextSibling().toElement(); - } + { + ++i; + NFS(root, root_item); + root = root.nextSibling().toElement(); + } } void -- 1.5.6.5

1 0

last-svn-commit-760-ge01df8b Display baseline and meanline in Scribo viewer.
by Guillaume Lazzara 05 Feb '11

05 Feb '11

* demo/viewer/common.hh: Add new enums. * demo/viewer/key_widget.cc, * demo/viewer/key_widget.hh: Revamp code and add support for more region types. * demo/viewer/viewer.cc, * demo/viewer/viewer.hh: Insert line blocks. --- scribo/ChangeLog | 13 ++++ scribo/demo/viewer/common.hh | 11 ++++ scribo/demo/viewer/key_widget.cc | 123 ++++++++++++++++++------------------- scribo/demo/viewer/key_widget.hh | 4 +- scribo/demo/viewer/viewer.cc | 106 +++++++++++++++++++++++++++++++- scribo/demo/viewer/viewer.hh | 1 + 6 files changed, 190 insertions(+), 68 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 52006a7..03705c9 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,16 @@ +2011-02-05 Guillaume Lazzara <z(a)lrde.epita.fr> + + Display baseline and meanline in Scribo viewer. + + * demo/viewer/common.hh: Add new enums. + + * demo/viewer/key_widget.cc, + * demo/viewer/key_widget.hh: Revamp code and add support for more + region types. + + * demo/viewer/viewer.cc, + * demo/viewer/viewer.hh: Insert line blocks. + 2011-02-04 Guillaume Lazzara <z(a)lrde.epita.fr> Add printing support in Scribo viewer. diff --git a/scribo/demo/viewer/common.hh b/scribo/demo/viewer/common.hh index b2d8f7e..46f20c1 100644 --- a/scribo/demo/viewer/common.hh +++ b/scribo/demo/viewer/common.hh @@ -26,6 +26,9 @@ namespace region { Text = 0, Line, + + EndOfTextRegion, + Image, Noise, Separator, @@ -34,6 +37,14 @@ namespace region Graphic, Chart, Maths, + + EndOfMiscRegion, + + Baseline, + Meanline, + + EndOfTypoRegion, + RegionIdCount }; } diff --git a/scribo/demo/viewer/key_widget.cc b/scribo/demo/viewer/key_widget.cc index 3a4b47b..cc10308 100644 --- a/scribo/demo/viewer/key_widget.cc +++ b/scribo/demo/viewer/key_widget.cc @@ -19,29 +19,31 @@ #include "common.hh" KeyWidget::KeyWidget(const region::KeyMap& key_map) - : items_(new QTreeWidget()), - text_(new QTreeWidgetItem(QStringList("Text"))), - regions_(new QTreeWidgetItem(QStringList("Regions"))) + : items_(new QTreeWidget()) { + item_list_.append(new QTreeWidgetItem(QStringList("Text"))); + item_list_.append(new QTreeWidgetItem(QStringList("Regions"))); + item_list_.append(new QTreeWidgetItem(QStringList("Typographical Lines"))); + QLabel* title = new QLabel(tr("Key")); title->setAlignment(Qt::AlignHCenter); - items_->addTopLevelItem(text_); - items_->addTopLevelItem(regions_); + foreach(QTreeWidgetItem* item, item_list_) + { + items_->addTopLevelItem(item); + item->setCheckState(0, Qt::Checked); + item->setExpanded(true); + } items_->setHeaderHidden(true); - text_->setCheckState(0, Qt::Checked); - text_->setExpanded(true); - - regions_->setCheckState(0, Qt::Checked); - regions_->setExpanded(true); + base_id_.append(0); + base_id_.append(region::EndOfTextRegion + 1); + base_id_.append(region::EndOfMiscRegion + 1); + base_id_.append(region::EndOfTypoRegion + 1); - for (int i = 0; i < 2; ++i) - add_item_(key_map.at(i).first, key_map.at(i).second, - i == region::Line, text_); - - for (int i = 2; i < key_map.size(); ++i) - add_item_(key_map.at(i).first, key_map.at(i).second, false, regions_); + for (int j = 0; j < base_id_.size() - 1; ++j) + for (int i = base_id_.at(j); i < base_id_.at(j + 1) - 1; ++i) + add_item_(key_map.at(i).first, key_map.at(i).second, false, item_list_.at(j)); QVBoxLayout* layout = new QVBoxLayout; layout->addWidget(title); @@ -55,11 +57,9 @@ KeyWidget::KeyWidget(const region::KeyMap& key_map) void KeyWidget::update_all() { - for (int i = 0; i < text_->childCount(); ++i) - update(text_->child(i)); - - for (int i = 0; i < regions_->childCount(); ++i) - update(regions_->child(i)); + foreach(QTreeWidgetItem* item, item_list_) + for (int i = 0; i < item->childCount(); ++i) + update(item->child(i)); } void KeyWidget::setAll(bool b) @@ -70,8 +70,8 @@ void KeyWidget::setAll(bool b) else state = Qt::Unchecked; - text_->setCheckState(0, state); - regions_->setCheckState(0, state); + foreach(QTreeWidgetItem* item, item_list_) + item->setCheckState(0, state); } void KeyWidget::setAllCheck(QTreeWidgetItem* parent) @@ -89,20 +89,8 @@ void KeyWidget::setAllCheck(QTreeWidgetItem* parent) void KeyWidget::change_mode(bool b) { - int id_line = region::Line; - - if (b) - { - //text_->child(id_region)->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_line)->setCheckState(0, Qt::Unchecked); - text_->child(id_line)->setHidden(true); - } + item_list_.at(0)->child(region::Line)->setHidden(!b); + // FIXME: we may like to hide also typographical objects. } void @@ -118,43 +106,52 @@ KeyWidget::add_item_(QString text, QColor color, bool b, QTreeWidgetItem* parent item->setHidden(b); } - bool +bool KeyWidget::isChecked(region::RegionId id) { - QTreeWidgetItem* item = text_->child(id); - if (item) - return item->checkState(0) == Qt::Checked; - else - { - item = regions_->child(id); - if(item) - return item->checkState(0) == Qt::Checked; - else - return false; - } + QTreeWidgetItem* current_item = 0; + + foreach(QTreeWidgetItem* item, item_list_) + { + current_item = item->child(id); + if (item) + break; + else + current_item = 0; + } + + if (!current_item) + return false; + + return current_item->checkState(0) == Qt::Checked; } void -KeyWidget::update(QTreeWidgetItem* item) +KeyWidget::update(QTreeWidgetItem* item_up) { int id = -1; - if (item == text_ || item == regions_) - { - setAllCheck(item); - } - else + + foreach(QTreeWidgetItem* item, item_list_) + if (item_up == item) + { + setAllCheck(item); + return; + } + + + int i = 0; + foreach(QTreeWidgetItem* item, item_list_) { - id = text_->indexOfChild(item); - if (id == -1) + id = item->indexOfChild(item_up); + if (id != -1) { - // +2 since image region id starts from 0 to the number of - // region type without considering categories. There are 2 - // elements in text category and the rest is in the region's - // one. - id = regions_->indexOfChild(item) + 2; + id += base_id_.at(i); + break; } - emit updated(id, item->checkState(0) == Qt::Checked); + ++i; } + + emit updated(id, item_up->checkState(0) == Qt::Checked); } KeyWidget::~KeyWidget() diff --git a/scribo/demo/viewer/key_widget.hh b/scribo/demo/viewer/key_widget.hh index fd0b514..1a3518e 100644 --- a/scribo/demo/viewer/key_widget.hh +++ b/scribo/demo/viewer/key_widget.hh @@ -48,8 +48,8 @@ private: void add_item_(QString text, QColor color, bool b, QTreeWidgetItem* parent); QTreeWidget* items_; - QTreeWidgetItem* text_; - QTreeWidgetItem* regions_; + QVector<QTreeWidgetItem*> item_list_; + QVector<int> base_id_; }; #endif // ! SCRIBO_DEMO_VIEWER_KEY_WIDGET_HH diff --git a/scribo/demo/viewer/viewer.cc b/scribo/demo/viewer/viewer.cc index 57a67c2..1d48b1a 100644 --- a/scribo/demo/viewer/viewer.cc +++ b/scribo/demo/viewer/viewer.cc @@ -65,6 +65,9 @@ Viewer::Viewer(int &argc, char** argv) key_map_[region::Chart] = qMakePair(tr("Chart"), QColor(0, 204, 255)); key_map_[region::Maths] = qMakePair(tr("Maths"), QColor(170, 0, 255)); + key_map_[region::Baseline] = qMakePair(tr("Baseline"), QColor(128, 0, 255)); + key_map_[region::Meanline] = qMakePair(tr("Meanline"), QColor(128, 0, 255)); + // Region ids region_ids_["text_region"] = region::Text; @@ -78,7 +81,6 @@ Viewer::Viewer(int &argc, char** argv) region_ids_["chart_region"] = region::Chart; region_ids_["maths_region"] = region::Maths; - win_->resize(1152, 864); win_->statusBar(); @@ -154,7 +156,7 @@ Viewer::Viewer(int &argc, char** argv) precise_action_ = create_action("Precise outline", view_menu, "1px outline relative to the image " "(1px relative to the view if off).", - "Ctrl+p"); + "Shift+Ctrl+p"); precise_action_->setCheckable(true); precise_action_->setChecked(false); connect(precise_action_, SIGNAL(toggled(bool)), @@ -432,6 +434,100 @@ Viewer::add_region(QDomNode father, QString attr_id) scene_->addItem(r); } + +void +Viewer::add_typo_lines(QDomNode father, QString attr_id) +{ + // Retrieve typographical information + int baseline = father.toElement().attribute("baseline").toInt(); + int meanline = father.toElement().attribute("meanline").toInt(); + + QRect bbox; + + // Looking for bbox coordinates. + { + QDomNode coords = father.firstChild(); + while (!coords.isNull() && !coords.toElement().tagName().contains("coords")) + coords = coords.nextSibling(); + + if (coords.isNull()) + return; + + + QDomNode point = coords.firstChild(); + QVector<QPoint> points; + + while (!point.isNull()) + { + int x = point.toElement().attribute("x", "0").toInt(); + int y = point.toElement().attribute("y", "0").toInt(); + + points << QPoint(x, y); + point = point.nextSibling(); + } + + QPolygon polygon(points); + bbox = polygon.boundingRect(); + } + + // Creating blocks + + // Baseline + { + QVector<QPoint> points; + points.append(QPoint(bbox.topLeft().x(), baseline)); + points.append(QPoint(bbox.topRight().x(), baseline)); + + ImageRegion* r = new ImageRegion(region::Baseline, + key_map_[region::Baseline].first, + key_map_[region::Baseline].second, + attr_id, points, + outline_action_->isChecked(), + fill_action_->isChecked(), + precise_action_->isChecked(), + key_wgt_->isChecked(region::Baseline)); + + connect(this, SIGNAL(key_updated(int, bool)), + r, SLOT(setDrawIfSameId(int, bool))); + connect(this, SIGNAL(setOutline(bool)), + r, SLOT(setOutline(bool))); + connect(this, SIGNAL(setPrecise(bool)), + r, SLOT(setPrecise(bool))); + connect(this, SIGNAL(setFill(bool)), + r, SLOT(setFill(bool))); + + scene_->addItem(r); + } + + // Meanline + { + QVector<QPoint> points; + points.append(QPoint(bbox.topLeft().x(), meanline)); + points.append(QPoint(bbox.topRight().x(), meanline)); + + ImageRegion* r = new ImageRegion(region::Meanline, + key_map_[region::Meanline].first, + key_map_[region::Meanline].second, + attr_id, points, + outline_action_->isChecked(), + fill_action_->isChecked(), + precise_action_->isChecked(), + key_wgt_->isChecked(region::Meanline)); + + connect(this, SIGNAL(key_updated(int, bool)), + r, SLOT(setDrawIfSameId(int, bool))); + connect(this, SIGNAL(setOutline(bool)), + r, SLOT(setOutline(bool))); + connect(this, SIGNAL(setPrecise(bool)), + r, SLOT(setPrecise(bool))); + connect(this, SIGNAL(setFill(bool)), + r, SLOT(setFill(bool))); + + scene_->addItem(r); + } +} + + void Viewer::load_xml(QString filename) { @@ -557,7 +653,11 @@ Viewer::load_xml(QString filename) if (!line.isNull()) { if (extended_mode_) - add_region(line, attr_id); + { + QString line_id = line.toElement().attribute("id", "none"); + add_region(line, line_id); + add_typo_lines(line, line_id); + } add_text(line); } } diff --git a/scribo/demo/viewer/viewer.hh b/scribo/demo/viewer/viewer.hh index c4b99e8..c68dd02 100644 --- a/scribo/demo/viewer/viewer.hh +++ b/scribo/demo/viewer/viewer.hh @@ -84,6 +84,7 @@ private: QPixmap load_base64(QString xml); void add_region(QDomNode father, QString attr_id); void add_text(QDomNode line); + void add_typo_lines(QDomNode father, QString attr_id); QAction *create_action(QString name, QMenu* menu, QString status, QString shortcut); void reset_progress_dialog(); void configure_printer(QPrinter& printer); -- 1.5.6.5

1 0

last-svn-commit-759-ge026707 Add printing support in Scribo viewer.
by Guillaume Lazzara 04 Feb '11

04 Feb '11

* demo/viewer/image_scene.cc, * demo/viewer/image_scene.hh: Accept a parent widget. * demo/viewer/image_widget.cc, * demo/viewer/image_widget.hh: Add an accessor to the underlying view. * demo/viewer/viewer.cc, * demo/viewer/viewer.hh: Add print and print preview menu entries --- scribo/ChangeLog | 14 +++++ scribo/demo/viewer/image_scene.cc | 7 ++- scribo/demo/viewer/image_scene.hh | 2 +- scribo/demo/viewer/image_widget.cc | 15 +++++- scribo/demo/viewer/image_widget.hh | 6 ++- scribo/demo/viewer/viewer.cc | 95 ++++++++++++++++++++++++++++++++++-- scribo/demo/viewer/viewer.hh | 9 +++- 7 files changed, 135 insertions(+), 13 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 620dcfb..52006a7 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,17 @@ +2011-02-04 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add printing support in Scribo viewer. + + * demo/viewer/image_scene.cc, + * demo/viewer/image_scene.hh: Accept a parent widget. + + * demo/viewer/image_widget.cc, + * demo/viewer/image_widget.hh: Add an accessor to the underlying + view. + + * demo/viewer/viewer.cc, + * demo/viewer/viewer.hh: Add print and print preview menu entries. + 2011-02-18 Guillaume Lazzara <z(a)lrde.epita.fr> Improve about dialog in scribo viewer. diff --git a/scribo/demo/viewer/image_scene.cc b/scribo/demo/viewer/image_scene.cc index 2c56113..a800896 100644 --- a/scribo/demo/viewer/image_scene.cc +++ b/scribo/demo/viewer/image_scene.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -18,8 +19,8 @@ #include "image_scene.hh" #include "image_region.hh" -ImageScene::ImageScene() - : selected_(0) +ImageScene::ImageScene(QObject *parent) + : QGraphicsScene(parent), selected_(0) { } diff --git a/scribo/demo/viewer/image_scene.hh b/scribo/demo/viewer/image_scene.hh index 136f1a2..b141478 100644 --- a/scribo/demo/viewer/image_scene.hh +++ b/scribo/demo/viewer/image_scene.hh @@ -27,7 +27,7 @@ class ImageScene Q_OBJECT public: - ImageScene(); + ImageScene(QObject *parent = 0); ~ImageScene(); void mousePressEvent(QGraphicsSceneMouseEvent* event); diff --git a/scribo/demo/viewer/image_widget.cc b/scribo/demo/viewer/image_widget.cc index e9e5e79..f86ff1d 100644 --- a/scribo/demo/viewer/image_widget.cc +++ b/scribo/demo/viewer/image_widget.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -20,6 +21,8 @@ ImageWidget::ImageWidget(QGraphicsScene* scene) : view_ (new ImageView(scene)) { + scene->setParent(view_); + QLabel* title = new QLabel(tr("Layout")); title->setAlignment(Qt::AlignHCenter); @@ -38,6 +41,12 @@ ImageWidget::ImageWidget(QGraphicsScene* scene) setLayout(layout); } + +ImageWidget::~ImageWidget() +{ +} + + void ImageWidget::update() { @@ -45,6 +54,8 @@ ImageWidget::update() view_->scaleUpdate(); } -ImageWidget::~ImageWidget() +ImageView * +ImageWidget::view() const { + return view_; } diff --git a/scribo/demo/viewer/image_widget.hh b/scribo/demo/viewer/image_widget.hh index 826b873..79dd672 100644 --- a/scribo/demo/viewer/image_widget.hh +++ b/scribo/demo/viewer/image_widget.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -18,6 +19,7 @@ # define SCRIBO_DEMO_VIEWER_IMAGE_WIDGET_HH # include <QtGui> +# include "image_view.hh" class ImageView; @@ -30,6 +32,8 @@ public: ImageWidget(QGraphicsScene* scene); ~ImageWidget(); + ImageView * view() const; + public slots: void update(); diff --git a/scribo/demo/viewer/viewer.cc b/scribo/demo/viewer/viewer.cc index 46172ce..57a67c2 100644 --- a/scribo/demo/viewer/viewer.cc +++ b/scribo/demo/viewer/viewer.cc @@ -22,10 +22,10 @@ #include "viewer.hh" #include "key_widget.hh" #include "browser_widget.hh" -#include "image_widget.hh" #include "xml_widget.hh" #include "step_widget.hh" #include "image_scene.hh" +#include "image_view.hh" #include "image_region.hh" #include "help_dialog.hh" #include "preferences_dialog.hh" @@ -107,6 +107,23 @@ Viewer::Viewer(int &argc, char** argv) file_menu->addSeparator(); + QAction *preview_print_action = create_action("Printing preview", file_menu, + "Printint preview", "Ctrl+P"); + connect(preview_print_action, SIGNAL(triggered()), + this, SLOT(preview_print())); + file_menu->addAction(preview_print_action); + preview_print_action->setEnabled(false); + + + QAction *print_action = create_action("Print", file_menu, + "Print", "Ctrl+P"); + connect(print_action, SIGNAL(triggered()), + this, SLOT(print())); + file_menu->addAction(print_action); + print_action->setEnabled(false); + + file_menu->addSeparator(); + QAction* quit_action = create_action("Quit", file_menu, "Exit the program.", "Ctrl+q"); @@ -220,10 +237,14 @@ Viewer::Viewer(int &argc, char** argv) step_widget_ = new StepWidget(); XmlWidget* xml_wgt = new XmlWidget(); browser_wgt_ = new BrowserWidget(files_, argc != 2 ? QString() : argv[1]); - ImageWidget* image_wgt = new ImageWidget(scene_); + image_wgt_ = new ImageWidget(scene_); connect(step_widget_, SIGNAL(step_selected(bool)), export_action_, SLOT(setEnabled(bool))); + connect(step_widget_, SIGNAL(step_selected(bool)), + print_action, SLOT(setEnabled(bool))); + connect(step_widget_, SIGNAL(step_selected(bool)), + preview_print_action, SLOT(setEnabled(bool))); scene_->setBackgroundBrush(scene_->palette().window()); @@ -231,7 +252,7 @@ Viewer::Viewer(int &argc, char** argv) v_splitter->addWidget(key_wgt_); v_splitter->addWidget(browser_wgt_); - v_splitter2->addWidget(image_wgt); + v_splitter2->addWidget(image_wgt_); v_splitter2->addWidget(xml_wgt); h_splitter->addWidget(v_splitter); @@ -264,7 +285,7 @@ Viewer::Viewer(int &argc, char** argv) connect(this, SIGNAL(mode_changed(bool)), key_wgt_, SLOT(change_mode(bool))); connect(this, SIGNAL(updated()), - image_wgt, SLOT(update())); + image_wgt_, SLOT(update())); connect(this, SIGNAL(fill_xml(QString)), xml_wgt, SLOT(fill_widget(QString))); @@ -276,7 +297,7 @@ Viewer::Viewer(int &argc, char** argv) connect(scene_, SIGNAL(deselected()), xml_wgt, SLOT(deselect())); - connect(image_wgt, SIGNAL(scaleUpdated(qreal)), + connect(image_wgt_, SIGNAL(scaleUpdated(qreal)), this, SLOT(maybeChangeCacheMode(qreal))); @@ -808,3 +829,67 @@ Viewer::reset_progress_dialog() pdialog_.setLabelText(""); pdialog_.show(); } + + +void +Viewer::print() +{ + QPrinter printer(QPrinter::HighResolution); + configure_printer(printer); + + QPrintDialog dialog(&printer); + dialog.setWindowTitle(tr("Print Document")); + if (dialog.exec() != QDialog::Accepted) + return; + + do_print(&printer); +} + +void +Viewer::preview_print() +{ + QPrinter printer(QPrinter::HighResolution); + configure_printer(printer); + + QPrintPreviewDialog preview(&printer); + connect(&preview, SIGNAL(paintRequested(QPrinter *)), + this, SLOT(do_print(QPrinter *))); + + preview.exec(); +} + +void Viewer::do_print(QPrinter * printer) +{ + QList<QGraphicsItem *> items = image_wgt_->view()->items(); + + QPainter painter(printer); + + QGraphicsItem *item; + QStyleOptionGraphicsItem options; + + // Painting backward objects first. + for (int i = items.size() - 1; i >= 0; --i) + { + item = items.at(i); + + if (item != image_) + { + QRect vport = image_->mapRectFromItem(item, + item->boundingRect()).toRect(); + + painter.translate(std::abs(item->boundingRect().x() - vport.x()), + std::abs(item->boundingRect().y() - vport.y())); + } + + + item->paint(&painter, &options); + painter.resetTransform(); + } +} + +void +Viewer::configure_printer(QPrinter& printer) +{ + printer.setPageSize(QPrinter::A4); + printer.setResolution(300); +} diff --git a/scribo/demo/viewer/viewer.hh b/scribo/demo/viewer/viewer.hh index 3aefaf6..c4b99e8 100644 --- a/scribo/demo/viewer/viewer.hh +++ b/scribo/demo/viewer/viewer.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -21,6 +22,7 @@ # include <QDomNode> # include "common.hh" # include "runner.hh" +# include "image_widget.hh" class ImageScene; class DomModel; @@ -61,6 +63,9 @@ private slots: void run_progress(); void on_xml_saved(const QString& filename); void export_as(); + void print(); + void preview_print(); + void do_print(QPrinter * printer); signals: void updated(); @@ -81,6 +86,7 @@ private: void add_text(QDomNode line); QAction *create_action(QString name, QMenu* menu, QString status, QString shortcut); void reset_progress_dialog(); + void configure_printer(QPrinter& printer); QApplication* app_; QMainWindow* win_; @@ -90,6 +96,7 @@ private: QGraphicsPixmapItem* image_; ImageScene* scene_; + ImageWidget* image_wgt_; QDirModel* files_; DomModel* doc_layout_; -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-756-gaa2987c
by lazzara＠lrde.epita.fr 28 Jan '11

28 Jan '11

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 via aa2987c992651c0e83baafe445f1555f93ae08ca (commit) from 845cc75f5894ef4a88d1b8b4a8bdc5c57f463c0d (commit) 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 ----------------------------------------------------------------- aa2987c tests/unit_test/unit-tests.mk: Regen. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 4 ++++ scribo/tests/unit_test/unit-tests.mk | 24 ++++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-756-gaa2987c tests/unit_test/unit-tests.mk: Regen.
by Guillaume Lazzara 28 Jan '11

28 Jan '11

--- scribo/ChangeLog | 4 ++++ scribo/tests/unit_test/unit-tests.mk | 24 ++++++++++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d6a4b3d..b19115d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-01-28 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/unit-tests.mk: Regen. + +2011-01-28 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes * scribo/binarization/sauvola_ms.hh: Add comments. diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 7da6e5c..6a8f29d 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -3,6 +3,20 @@ check_PROGRAMS = # Starting a conditional unit test list. +if HAVE_MAGICKXX +if HAVE_TESSERACT +if HAVE_TIFF +check_PROGRAMS += \ +scribo_toolchain_internal_content_in_doc_functor + +scribo_toolchain_internal_content_in_doc_functor_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${MAGICKXX_CPPFLAGS} ${AM_CPPFLAGS} +scribo_toolchain_internal_content_in_doc_functor_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${MAGICKXX_LDFLAGS} ${AM_LDFLAGS} +scribo_toolchain_internal_content_in_doc_functor_SOURCES = scribo_toolchain_internal_content_in_doc_functor.cc +endif HAVE_TIFF +endif HAVE_TESSERACT +endif HAVE_MAGICKXX + +# Starting a conditional unit test list. if HAVE_QT check_PROGRAMS += \ scribo_convert_from_qimage @@ -31,19 +45,19 @@ if HAVE_TESSERACT if HAVE_TIFF check_PROGRAMS += \ scribo_text_recognition \ -scribo_toolchain_internal_content_in_doc_functor \ scribo_toolchain_internal_text_in_doc_functor \ +scribo_toolchain_content_in_doc \ scribo_toolchain_text_in_doc scribo_text_recognition_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${AM_CPPFLAGS} scribo_text_recognition_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} scribo_text_recognition_SOURCES = scribo_text_recognition.cc -scribo_toolchain_internal_content_in_doc_functor_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${AM_CPPFLAGS} -scribo_toolchain_internal_content_in_doc_functor_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} -scribo_toolchain_internal_content_in_doc_functor_SOURCES = scribo_toolchain_internal_content_in_doc_functor.cc scribo_toolchain_internal_text_in_doc_functor_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${AM_CPPFLAGS} scribo_toolchain_internal_text_in_doc_functor_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} scribo_toolchain_internal_text_in_doc_functor_SOURCES = scribo_toolchain_internal_text_in_doc_functor.cc +scribo_toolchain_content_in_doc_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${AM_CPPFLAGS} +scribo_toolchain_content_in_doc_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} +scribo_toolchain_content_in_doc_SOURCES = scribo_toolchain_content_in_doc.cc scribo_toolchain_text_in_doc_CPPFLAGS= ${TIFF_CPPFLAGS} ${TESSERACT_CPPFLAGS} ${AM_CPPFLAGS} scribo_toolchain_text_in_doc_LDFLAGS= ${TIFF_LDFLAGS} ${TESSERACT_LDFLAGS} ${AM_LDFLAGS} scribo_toolchain_text_in_doc_SOURCES = scribo_toolchain_text_in_doc.cc @@ -252,7 +266,6 @@ scribo_text_extract_lines \ scribo_text_link_lines \ scribo_text_look_like_text_lines \ scribo_text_merging \ -scribo_toolchain_content_in_doc \ scribo_toolchain_internal_text_in_doc_preprocess_functor \ scribo_toolchain_internal_toolchain_functor \ scribo_toolchain_text_in_doc_preprocess \ @@ -460,7 +473,6 @@ scribo_text_extract_lines_SOURCES = scribo_text_extract_lines.cc scribo_text_link_lines_SOURCES = scribo_text_link_lines.cc scribo_text_look_like_text_lines_SOURCES = scribo_text_look_like_text_lines.cc scribo_text_merging_SOURCES = scribo_text_merging.cc -scribo_toolchain_content_in_doc_SOURCES = scribo_toolchain_content_in_doc.cc scribo_toolchain_internal_text_in_doc_preprocess_functor_SOURCES = scribo_toolchain_internal_text_in_doc_preprocess_functor.cc scribo_toolchain_internal_toolchain_functor_SOURCES = scribo_toolchain_internal_toolchain_functor.cc scribo_toolchain_text_in_doc_preprocess_SOURCES = scribo_toolchain_text_in_doc_preprocess.cc -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-755-g845cc75
by lazzara＠lrde.epita.fr 28 Jan '11

28 Jan '11

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 via 845cc75f5894ef4a88d1b8b4a8bdc5c57f463c0d (commit) from 1929a06cb69ed407a22cab24f255597724cd1b15 (commit) 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 ----------------------------------------------------------------- 845cc75 Small fixes ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 17 +++++++++++++++++ scribo/scribo/binarization/sauvola_ms.hh | 6 ++++-- .../toolchain/internal/content_in_doc_functor.hh | 7 +++++-- scribo/src/content_in_doc.cc | 10 ++++++++-- scribo/src/pbm_text_in_doc.cc | 20 ++++++++++++-------- scribo/tests/unit_test/Makefile.am | 7 ++++--- .../unit_test/cond_tests_magickxx_tesseract_tiff | 1 + scribo/tests/unit_test/cond_tests_tesseract_tiff | 1 - 8 files changed, 51 insertions(+), 18 deletions(-) create mode 100644 scribo/tests/unit_test/cond_tests_magickxx_tesseract_tiff hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-755-g845cc75 Small fixes
by Guillaume Lazzara 28 Jan '11

28 Jan '11

* scribo/binarization/sauvola_ms.hh: Add comments. * scribo/toolchain/internal/content_in_doc_functor.hh: Initialize a local variable. * src/content_in_doc.cc, * src/pbm_text_in_doc.cc: Fix option processing. * tests/unit_test/Makefile.am, * tests/unit_test/cond_tests_magickxx_tesseract_tiff, * tests/unit_test/cond_tests_tesseract_tiff: Change test condition. --- scribo/ChangeLog | 17 +++++++++++++++++ scribo/scribo/binarization/sauvola_ms.hh | 6 ++++-- .../toolchain/internal/content_in_doc_functor.hh | 7 +++++-- scribo/src/content_in_doc.cc | 10 ++++++++-- scribo/src/pbm_text_in_doc.cc | 20 ++++++++++++-------- scribo/tests/unit_test/Makefile.am | 7 ++++--- .../unit_test/cond_tests_magickxx_tesseract_tiff | 1 + scribo/tests/unit_test/cond_tests_tesseract_tiff | 1 - 8 files changed, 51 insertions(+), 18 deletions(-) create mode 100644 scribo/tests/unit_test/cond_tests_magickxx_tesseract_tiff diff --git a/scribo/ChangeLog b/scribo/ChangeLog index eba5cb3..d6a4b3d 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,22 @@ 2011-01-28 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes + + * scribo/binarization/sauvola_ms.hh: Add comments. + + * scribo/toolchain/internal/content_in_doc_functor.hh: Initialize + a local variable. + + * src/content_in_doc.cc, + * src/pbm_text_in_doc.cc: Fix option processing. + + * tests/unit_test/Makefile.am, + * tests/unit_test/cond_tests_magickxx_tesseract_tiff, + * tests/unit_test/cond_tests_tesseract_tiff: Change test + condition. + +2011-01-28 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/scribo-cli.in: Add content_in_doc entry. 2011-01-27 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 1233d1c..e8eb2c2 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -280,6 +280,8 @@ namespace scribo typedef const mln_value(K)* ptr_type; + // Warning: if there are pixels with value different from 2, 3 + // or 4 in e2, it will crash because of that array... ptr_type ptr_t[5]; ptr_t[2] = & t_ima[2].at_(0, 0); ptr_t[3] = & t_ima[3].at_(0, 0); @@ -301,8 +303,8 @@ namespace scribo more_offset = 0; // No offset needed. const int - nrows4 = t_ima[4].nrows(), ncols4 = t_ima[4].ncols(), - + nrows4 = t_ima[4].nrows(), + ncols4 = t_ima[4].ncols(), delta1 = in.delta_index(dpoint2d(+1, -(s - 1))), delta1b = in.delta_index(dpoint2d(+1, -(s + s - 1))), diff --git a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh b/scribo/scribo/toolchain/internal/content_in_doc_functor.hh index 7c665e5..fb7cd7c 100644 --- a/scribo/scribo/toolchain/internal/content_in_doc_functor.hh +++ b/scribo/scribo/toolchain/internal/content_in_doc_functor.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -162,7 +163,9 @@ namespace scribo doc.set_image(exact(original_image)); // Remove separators - mln_ch_value(I,bool) separators, input_cleaned; + mln_ch_value(I,bool) + separators, + input_cleaned = exact(processed_image); if (enable_line_seps) { on_new_progress_label("Find vertical separators..."); diff --git a/scribo/src/content_in_doc.cc b/scribo/src/content_in_doc.cc index 8cd262b..9748b28 100644 --- a/scribo/src/content_in_doc.cc +++ b/scribo/src/content_in_doc.cc @@ -100,7 +100,7 @@ int main(int argc, char* argv[]) image2d<bool> input_preproc; { double K = 0.34; - if (argc == 8 || argc == 12 || argc >= 12) + if (argc == 8 || argc >= 12) { if (argc == 8) K = atof(argv[7]); @@ -140,14 +140,20 @@ int main(int argc, char* argv[]) std::string language = "eng"; if (argc >= 5 && argc < 13) language = argv[4]; + else if (argc >= 12) + language = argv[8]; bool find_line_seps = true; if (argc >= 6 && argc < 13) find_line_seps = (atoi(argv[5]) != 0); + else if (argc >= 12) + find_line_seps = (atoi(argv[9]) != 0); bool find_whitespace_seps = true; if (argc >= 7 && argc < 13) - find_line_seps = (atoi(argv[6]) != 0); + find_whitespace_seps = (atoi(argv[6]) != 0); + else if (argc >= 12) + find_whitespace_seps = (atoi(argv[10]) != 0); std::cout << "Running with the following options :" << " ocr_language = " << language diff --git a/scribo/src/pbm_text_in_doc.cc b/scribo/src/pbm_text_in_doc.cc index 721ff47..2726ead 100644 --- a/scribo/src/pbm_text_in_doc.cc +++ b/scribo/src/pbm_text_in_doc.cc @@ -101,7 +101,7 @@ int main(int argc, char* argv[]) // Optional Cropping point2d crop_shift = literal::origin; - if (argc >= 12) + if (argc >= 9) { mln::def::coord minr = atoi(argv[4]), @@ -109,6 +109,9 @@ int main(int argc, char* argv[]) maxr = atoi(argv[6]), maxc = atoi(argv[7]); + std::cout << "> Image cropped from (" << minr << "," << minc << ")" + << " to (" << maxr << "," << maxc << ")" << std::endl; + box2d roi = mln::make::box2d(minr, minc, maxr, maxc); input = preprocessing::crop_without_localization(input, roi); crop_shift = point2d(minr, minc); @@ -121,26 +124,27 @@ int main(int argc, char* argv[]) bool denoise = (argc > 3 && atoi(argv[3]) != 0); std::string language = "eng"; - if (argc > 4 && argc < 12) + if (argc > 4 && argc < 10) language = argv[4]; - else if (argc == 12) + else if (argc >= 9) language = argv[8]; bool find_line_seps = true; - if (argc > 5 && argc < 12) + if (argc > 5 && argc < 10) find_line_seps = (atoi(argv[5]) != 0); - else if (argc == 12) + else if (argc >= 10) find_line_seps = (atoi(argv[9]) != 0); bool find_whitespace_seps = true; - if (argc > 6 && argc < 12) + if (argc > 6 && argc < 10) find_whitespace_seps = (atoi(argv[6]) != 0); - else if (argc == 12) + else if (argc >= 11) find_whitespace_seps = (atoi(argv[10]) != 0); std::cout << "Running with the following options :" - << "find_lines_seps = " << find_line_seps + << " ocr language = " << language + << " | find_lines_seps = " << find_line_seps << " | find_whitespace_seps = " << find_whitespace_seps << " | debug = " << debug << std::endl; diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am index b150824..c88f553 100644 --- a/scribo/tests/unit_test/Makefile.am +++ b/scribo/tests/unit_test/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -# (LRDE). +# Copyright (C) 2009, 2010, 2011 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -17,7 +17,8 @@ include $(top_srcdir)/scribo/tests/tests.mk -COND_TESTS = cond_tests_qt \ +COND_TESTS = cond_tests_magickxx_tesseract_tiff \ + cond_tests_qt \ cond_tests_qt_tesseract_tiff \ cond_tests_tesseract_tiff diff --git a/scribo/tests/unit_test/cond_tests_magickxx_tesseract_tiff b/scribo/tests/unit_test/cond_tests_magickxx_tesseract_tiff new file mode 100644 index 0000000..3f1c2fb --- /dev/null +++ b/scribo/tests/unit_test/cond_tests_magickxx_tesseract_tiff @@ -0,0 +1 @@ +scribo/toolchain/internal/content_in_doc_functor.hh diff --git a/scribo/tests/unit_test/cond_tests_tesseract_tiff b/scribo/tests/unit_test/cond_tests_tesseract_tiff index 1324f06..ee10868 100644 --- a/scribo/tests/unit_test/cond_tests_tesseract_tiff +++ b/scribo/tests/unit_test/cond_tests_tesseract_tiff @@ -1,5 +1,4 @@ scribo/text/recognition.hh -scribo/toolchain/internal/content_in_doc_functor.hh scribo/toolchain/internal/text_in_doc_functor.hh scribo/toolchain/content_in_doc.hh scribo/toolchain/text_in_doc.hh -- 1.5.6.5

1 0