[Olena-patches] olena-2.0-386-gc3550ec Several small fixes in viewer.

* demo/viewer/PagesWidget/pageswidget.cc: Rely on signal activated(). * demo/viewer/mainwindow.cc: Fix a segmentation fault with preferences dialog. Do not disable segmentation action if xml file exists. * demo/viewer/mainwindow.hh: Remove preferencesDialog attribute. * demo/viewer/xml.cc, * demo/viewer/xml.hh: Fix getPath() and add makeXmlFilename. --- scribo/ChangeLog | 16 + scribo/demo/viewer/PagesWidget/pageswidget.cc | 2 +- scribo/demo/viewer/mainwindow.cc | 614 +++++++++++++------------ scribo/demo/viewer/mainwindow.hh | 1 - scribo/demo/viewer/xml.cc | 38 ++- scribo/demo/viewer/xml.hh | 1 + 6 files changed, 356 insertions(+), 316 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index cbb30f7..7168bb1 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,19 @@ +2013-03-08 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Several small fixes in viewer. + + * demo/viewer/PagesWidget/pageswidget.cc: Rely on signal + activated(). + + * demo/viewer/mainwindow.cc: Fix a segmentation fault with + preferences dialog. Do not disable segmentation action if xml file + exists. + + * demo/viewer/mainwindow.hh: Remove preferencesDialog attribute. + + * demo/viewer/xml.cc, + * demo/viewer/xml.hh: Fix getPath() and add makeXmlFilename. + 2013-02-27 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; Move new viewer to scribo/demo. diff --git a/scribo/demo/viewer/PagesWidget/pageswidget.cc b/scribo/demo/viewer/PagesWidget/pageswidget.cc index 0355419..f80d3a1 100644 --- a/scribo/demo/viewer/PagesWidget/pageswidget.cc +++ b/scribo/demo/viewer/PagesWidget/pageswidget.cc @@ -33,7 +33,7 @@ PagesWidget::PagesWidget(QWidget *parent): QShortcut *remove = new QShortcut(Qt::Key_Delete, this); connect(remove, SIGNAL(activated()), this, SLOT(removeSelection())); - connect(this, SIGNAL(doubleClicked(QModelIndex)), + connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(getPicture(QModelIndex))); } diff --git a/scribo/demo/viewer/mainwindow.cc b/scribo/demo/viewer/mainwindow.cc index 97cda4e..148595e 100644 --- a/scribo/demo/viewer/mainwindow.cc +++ b/scribo/demo/viewer/mainwindow.cc @@ -21,456 +21,460 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { - ui->setupUi(this); - - setWindowTitle(tr("GScribo")); - showMaximized(); - - initGraphicsRegion(); - initDialogsWidget(); - initXmlWidget(); - initRegionWidget(); - initPageWidget(); - initMenuBar(); - - // Told the left dock widget (here the pages widget and the region - // widget) to fill the bottom left corner. - setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); - // Merge the region and pages widget in one tab (pages widget over - // the region widget). - tabifyDockWidget(&dockRegion_, &dockPages_); - - connectWidgets(); + ui->setupUi(this); + + setWindowTitle(tr("GScribo")); + showMaximized(); + + initGraphicsRegion(); + initDialogsWidget(); + initXmlWidget(); + initRegionWidget(); + initPageWidget(); + initMenuBar(); + + // Told the left dock widget (here the pages widget and the region + // widget) to fill the bottom left corner. + setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); + // Merge the region and pages widget in one tab (pages widget over + // the region widget). + tabifyDockWidget(&dockRegion_, &dockPages_); + + connectWidgets(); } MainWindow::~MainWindow() { - delete preferencesDialog_; - delete aboutDialog_; - delete progressDialog_; - delete ui; + delete aboutDialog_; + delete progressDialog_; + delete ui; } void MainWindow::changeEvent(QEvent *e) { - QMainWindow::changeEvent(e); - switch (e->type()) - { - case QEvent::LanguageChange: - ui->retranslateUi(this); - break; - default: - break; - } + QMainWindow::changeEvent(e); + switch (e->type()) + { + case QEvent::LanguageChange: + ui->retranslateUi(this); + break; + default: + break; + } } void MainWindow::initGraphicsRegion() { - graphicsView_.setViewportUpdateMode(QGraphicsView::SmartViewportUpdate); - graphicsView_.setScene(&scene_); + graphicsView_.setViewportUpdateMode(QGraphicsView::SmartViewportUpdate); + graphicsView_.setScene(&scene_); - setCentralWidget(&graphicsView_); + setCentralWidget(&graphicsView_); } void MainWindow::initDialogsWidget() { - preferencesDialog_ = new PreferencesDialog(this); - aboutDialog_ = new AboutDialog(this); - progressDialog_ = new ProgressDialog(this); + aboutDialog_ = new AboutDialog(this); + progressDialog_ = new ProgressDialog(this); } void MainWindow::initPageWidget() { - dockPages_.setWindowTitle("Pages"); - dockPages_.setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable); - dockPages_.setWidget(&pagesWidget_); - dockPages_.setMinimumWidth(190); + dockPages_.setWindowTitle("Pages"); + dockPages_.setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable); + dockPages_.setWidget(&pagesWidget_); + dockPages_.setMinimumWidth(190); - addDockWidget(Qt::LeftDockWidgetArea, &dockPages_); + addDockWidget(Qt::LeftDockWidgetArea, &dockPages_); } void MainWindow::initRegionWidget() { - dockRegion_.setWindowTitle("Regions"); - dockRegion_.setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable); - dockRegion_.setWidget(&regionWidget_); + dockRegion_.setWindowTitle("Regions"); + dockRegion_.setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable); + dockRegion_.setWidget(&regionWidget_); - addDockWidget(Qt::LeftDockWidgetArea, &dockRegion_); + addDockWidget(Qt::LeftDockWidgetArea, &dockRegion_); } void MainWindow::initXmlWidget() { - dockXml_.setWindowTitle("Xml"); - dockXml_.setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable); - dockXml_.setWidget(&xmlWidget_); + dockXml_.setWindowTitle("Xml"); + dockXml_.setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable); + dockXml_.setWidget(&xmlWidget_); - addDockWidget(Qt::BottomDockWidgetArea, &dockXml_); - dockXml_.setVisible(false); + addDockWidget(Qt::BottomDockWidgetArea, &dockXml_); + dockXml_.setVisible(false); } void MainWindow::initMenuBar() { - QMenu *menuFile = ui->menuBar->addMenu(tr("File")); + QMenu *menuFile = ui->menuBar->addMenu(tr("File")); - menuFile->addAction(tr("&Open"), this, SLOT(onOpen()), - QKeySequence(tr("Ctrl+O"))); + menuFile->addAction(tr("&Open"), this, SLOT(onOpen()), + QKeySequence(tr("Ctrl+O"))); - segment_ = menuFile->addAction(tr("Segment"), this, SLOT(onSegment()), - QKeySequence(tr("Ctrl+S"))); - segment_->setEnabled(false); + segment_ = menuFile->addAction(tr("Segment selected"), + this, SLOT(onSegment()), + QKeySequence(tr("Ctrl+S"))); + segment_->setEnabled(false); - menuFile->addSeparator(); + menuFile->addSeparator(); - previewPrinting_ = menuFile->addAction(tr("Preview Printing"), - this, SLOT(onPreviewPrint()), - QKeySequence(tr("Shift+Ctrl+P"))); - previewPrinting_->setEnabled(false); + previewPrinting_ = menuFile->addAction(tr("Preview Printing"), + this, SLOT(onPreviewPrint()), + QKeySequence(tr("Shift+Ctrl+P"))); + previewPrinting_->setEnabled(false); - print_ = menuFile->addAction(tr("Print"), this, SLOT(onPrint()), - QKeySequence(tr("Ctrl+P"))); - print_->setEnabled(false); + print_ = menuFile->addAction(tr("Print"), this, SLOT(onPrint()), + QKeySequence(tr("Ctrl+P"))); + print_->setEnabled(false); - menuFile->addSeparator(); + menuFile->addSeparator(); - export_ = menuFile->addAction(tr("&Exportation"), - this, SLOT(onExportation()), - QKeySequence(tr("Ctrl+E"))); - export_->setEnabled(false); + export_ = menuFile->addAction(tr("&Exportation"), + this, SLOT(onExportation()), + QKeySequence(tr("Ctrl+E"))); + export_->setEnabled(false); - menuFile->addSeparator(); + menuFile->addSeparator(); - menuFile->addAction(tr("Quit"), this, SLOT(close())); + menuFile->addAction(tr("Quit"), this, SLOT(close())); - ui->menuBar->addAction(tr("Preferences"), - this, SLOT(onPreferences())); + ui->menuBar->addAction(tr("Preferences"), + this, SLOT(onPreferences())); - QMenu *menuAreas = ui->menuBar->addMenu(tr("Window")); + QMenu *menuAreas = ui->menuBar->addMenu(tr("Window")); - next_ = menuAreas->addAction(tr("Next document"), - &pagesWidget_, SLOT(selectNextRow()), - QKeySequence(tr("Space"))); - next_->setEnabled(false); + next_ = menuAreas->addAction(tr("Next document"), + &pagesWidget_, SLOT(selectNextRow()), + QKeySequence(tr("Space"))); + next_->setEnabled(false); - prev_ = menuAreas->addAction(tr("Previous document"), - &pagesWidget_, SLOT(selectPreviousRow()), - QKeySequence(tr("Backspace"))); - prev_->setEnabled(false); + prev_ = menuAreas->addAction(tr("Previous document"), + &pagesWidget_, SLOT(selectPreviousRow()), + QKeySequence(tr("Backspace"))); + prev_->setEnabled(false); - menuAreas->addSeparator(); + menuAreas->addSeparator(); - QAction *page = menuAreas->addAction(tr("Page"), - &dockPages_, SLOT(switchVisibility())); - page->setCheckable(true); - page->setChecked(true); + QAction *page = menuAreas->addAction(tr("Page"), + &dockPages_, SLOT(switchVisibility())); + page->setCheckable(true); + page->setChecked(true); - QAction *region = menuAreas->addAction(tr("Region"), - &dockRegion_, SLOT(switchVisibility())); - region->setCheckable(true); - region->setChecked(true); + QAction *region = menuAreas->addAction(tr("Region"), + &dockRegion_, SLOT(switchVisibility())); + region->setCheckable(true); + region->setChecked(true); - QAction *xml = menuAreas->addAction(tr("Xml"), - &dockXml_, SLOT(switchVisibility())); - xml->setCheckable(true); - xml->setChecked(false); + QAction *xml = menuAreas->addAction(tr("Xml"), + &dockXml_, SLOT(switchVisibility())); + xml->setCheckable(true); + xml->setChecked(false); - ui->menuBar->addAction(tr("&About"), this, SLOT(onAbout())); + ui->menuBar->addAction(tr("&About"), this, SLOT(onAbout())); } void MainWindow::setActionsEnabled(bool isSegmented) { - segment_->setEnabled(!isSegmented); - print_->setEnabled(isSegmented); - previewPrinting_->setEnabled(isSegmented); + // No reason for disabling this action even if this is already segmented. + segment_->setEnabled(isSegmented); + print_->setEnabled(isSegmented); + previewPrinting_->setEnabled(isSegmented); } void MainWindow::disableActions() { - segment_->setEnabled(false); - print_->setEnabled(false); - previewPrinting_->setEnabled(false); - export_->setEnabled(false); + segment_->setEnabled(false); + print_->setEnabled(false); + previewPrinting_->setEnabled(false); + export_->setEnabled(false); } void MainWindow::connectWidgets() { - // Each time the scene rect change (when a new picture is loaded), we fit the scene background rectangle in the view. - connect(&scene_, SIGNAL(sceneRectChanged(QRectF)), - &graphicsView_, SLOT(fitInView(QRectF))); - // When dragging with right click, disable selection. - connect(&graphicsView_, SIGNAL(beginDrag()), - &scene_, SLOT(disableSelection())); - connect(&graphicsView_, SIGNAL(endDrag()), - &scene_, SLOT(enableSelection())); - - // If double click on a picture of the page widget -> draw it on background scene. - connect(&pagesWidget_, SIGNAL(imageSelected(QString)), - this, SLOT(onFileChanged(QString))); - - // Connect the scene to the xml widget and vice versa. - connect(&scene_, SIGNAL(newSelection(QList<RegionItem*>)), - this, SLOT(onRegionSelection(QList<RegionItem*>))); - connect(xmlWidget_.view(), SIGNAL(select(QList<XmlItem*>)), - this, SLOT(onXmlSelect(QList<XmlItem*>))); - connect(xmlWidget_.view(), SIGNAL(unselect(QList<XmlItem*>)), - this, SLOT(onXmlUnselect(QList<XmlItem*>))); - connect(xmlWidget_.view(), SIGNAL(emptySelection()), - &scene_, SLOT(selectBase())); - connect(xmlWidget_.view(), SIGNAL(resetSelection()), - &scene_, SLOT(clearSelection())); - - // Connect the scene with the region widget. - connect(&regionWidget_, SIGNAL(checkStateChanged(GraphicsRegion::Id,bool)), &scene_, SLOT(setVisible(GraphicsRegion::Id,bool))); - - // Connect the xml widget with the region widget. - connect(&regionWidget_, SIGNAL(checkStateChanged(QString)), xmlWidget_.view(), SLOT(setFilterString(QString))); - - connect(&runner_, SIGNAL(progress()), progressDialog_, SLOT(run())); - connect(&runner_, SIGNAL(new_progress_max_value(int)), - progressDialog_, SLOT(setMaximum(int))); - connect(&runner_, SIGNAL(new_progress_label(QString)), - progressDialog_, SLOT(setLabelText(QString))); - connect(&runner_, SIGNAL(finished()), progressDialog_, SLOT(close())); - connect(&runner_, SIGNAL(xml_saved(QString)), - this, SLOT(onXmlSaved(QString))); + // Each time the scene rect change (when a new picture is loaded), we fit the scene background rectangle in the view. + connect(&scene_, SIGNAL(sceneRectChanged(QRectF)), + &graphicsView_, SLOT(fitInView(QRectF))); + // When dragging with right click, disable selection. + connect(&graphicsView_, SIGNAL(beginDrag()), + &scene_, SLOT(disableSelection())); + connect(&graphicsView_, SIGNAL(endDrag()), + &scene_, SLOT(enableSelection())); + + // If double click on a picture of the page widget -> draw it on background scene. + connect(&pagesWidget_, SIGNAL(imageSelected(QString)), + this, SLOT(onFileChanged(QString))); + + // Connect the scene to the xml widget and vice versa. + connect(&scene_, SIGNAL(newSelection(QList<RegionItem*>)), + this, SLOT(onRegionSelection(QList<RegionItem*>))); + connect(xmlWidget_.view(), SIGNAL(select(QList<XmlItem*>)), + this, SLOT(onXmlSelect(QList<XmlItem*>))); + connect(xmlWidget_.view(), SIGNAL(unselect(QList<XmlItem*>)), + this, SLOT(onXmlUnselect(QList<XmlItem*>))); + connect(xmlWidget_.view(), SIGNAL(emptySelection()), + &scene_, SLOT(selectBase())); + connect(xmlWidget_.view(), SIGNAL(resetSelection()), + &scene_, SLOT(clearSelection())); + + // Connect the scene with the region widget. + connect(&regionWidget_, SIGNAL(checkStateChanged(GraphicsRegion::Id,bool)), &scene_, SLOT(setVisible(GraphicsRegion::Id,bool))); + + // Connect the xml widget with the region widget. + connect(&regionWidget_, SIGNAL(checkStateChanged(QString)), xmlWidget_.view(), SLOT(setFilterString(QString))); + + connect(&runner_, SIGNAL(progress()), progressDialog_, SLOT(run())); + connect(&runner_, SIGNAL(new_progress_max_value(int)), + progressDialog_, SLOT(setMaximum(int))); + connect(&runner_, SIGNAL(new_progress_label(QString)), + progressDialog_, SLOT(setLabelText(QString))); + connect(&runner_, SIGNAL(finished()), progressDialog_, SLOT(close())); + connect(&runner_, SIGNAL(xml_saved(QString)), + this, SLOT(onXmlSaved(QString))); } void MainWindow::onOpen() { - QStringList - paths = QFileDialog::getOpenFileNames(this, "Open Image(s)", - QDir::homePath(), - "Images (*.png *.jpg *.ppm *.bmp)"); - setWindowTitle(tr("GScribo")); + QStringList + paths = QFileDialog::getOpenFileNames(this, "Open Image(s)", + QDir::homePath(), + "Images (*.png *.jpg *.ppm *.bmp)"); + setWindowTitle(tr("GScribo")); + + if(paths.count() > 0) + { + QStringList filenames = pagesWidget_.filenames(); + QString path; + + int counter = 0; + bool isContained; + // Check for an image not already added to the page widget. + do + { + path = paths[counter]; + counter++; + isContained = filenames.contains(path); + } while(isContained && counter < paths.count()); - if(paths.count() > 0) + if(!isContained) { - QStringList filenames = pagesWidget_.filenames(); - QString path; - - int counter = 0; - bool isContained; - // Check for an image not already added to the page widget. - do - { - path = paths[counter]; - counter++; - isContained = filenames.contains(path); - } while(isContained && counter < paths.count()); - - if(!isContained) - { - pagesWidget_.addPicture(path, QPixmap(path)); - - // If more than one file, we store it in the page widget. - for(int i = counter; i < paths.count(); i++) - { - // Check if the page widget contains the image. - if(!filenames.contains(paths[i])) - { - path = paths[i]; - pagesWidget_.addPicture(path, QPixmap(path)); - } - } - - pagesWidget_.setCurrentRow(0); - pagesWidget_.scrollToTop(); - } - - // Change current scene. - onFileChanged(path); + pagesWidget_.addPicture(path, QPixmap(path)); + + // If more than one file, we store it in the page widget. + for(int i = counter; i < paths.count(); i++) + { + // Check if the page widget contains the image. + if(!filenames.contains(paths[i])) + { + path = paths[i]; + pagesWidget_.addPicture(path, QPixmap(path)); + } + } + + pagesWidget_.setCurrentRow(0); + pagesWidget_.scrollToTop(); } + + // Change current scene. + onFileChanged(path); + } } void MainWindow::onSegment() { - QStringList filenames; + QStringList filenames; - filenames << scene_.backgroundPath(); + filenames << scene_.backgroundPath(); - // Run segmentation of page(s). - progressDialog_->reset(); - runner_.start_demat(filenames); + // Run segmentation of page(s). + progressDialog_->reset(); + runner_.start_demat(filenames); } void MainWindow::onPreviewPrint() { - QPrinter printer(QPrinter::HighResolution); - printer.setPaperSize(QPrinter::A4); - printer.setResolution(300); + QPrinter printer(QPrinter::HighResolution); + printer.setPaperSize(QPrinter::A4); + printer.setResolution(300); - QPrintPreviewDialog preview(&printer, this); - connect(&preview, SIGNAL(paintRequested(QPrinter*)), - this, SLOT(printScene(QPrinter*))); + QPrintPreviewDialog preview(&printer, this); + connect(&preview, SIGNAL(paintRequested(QPrinter*)), + this, SLOT(printScene(QPrinter*))); - preview.exec(); + preview.exec(); } void MainWindow::onPrint() { - QPrinter printer(QPrinter::HighResolution); - printer.setPaperSize(QPrinter::A4); - printer.setResolution(300); + QPrinter printer(QPrinter::HighResolution); + printer.setPaperSize(QPrinter::A4); + printer.setResolution(300); - QPrintDialog dialog(&printer, this); - dialog.setWindowTitle("Print Document"); + QPrintDialog dialog(&printer, this); + dialog.setWindowTitle("Print Document"); - if(dialog.exec() != QDialog::Accepted) - return; + if(dialog.exec() != QDialog::Accepted) + return; - printScene(&printer); + printScene(&printer); } void MainWindow::printScene(QPrinter *printer) { - QPainter painter(printer); - QStyleOptionGraphicsItem options; + QPainter painter(printer); + QStyleOptionGraphicsItem options; - scene_.backgroundPixmap()->paint(&painter, &options, 0); + scene_.backgroundPixmap()->paint(&painter, &options, 0); - // Paint backwards items first. - printItems(&painter, scene_.root()->childsFrom(GraphicsRegion::TextRegion), - &options); - printItems(&painter, scene_.root()->childsFrom(GraphicsRegion::Image), - &options); + // Paint backwards items first. + printItems(&painter, scene_.root()->childsFrom(GraphicsRegion::TextRegion), + &options); + printItems(&painter, scene_.root()->childsFrom(GraphicsRegion::Image), + &options); - for(int i = GraphicsRegion::Line; i < GraphicsRegion::Image; i++) - printItems(&painter, - scene_.root()->childsFrom(static_cast<GraphicsRegion::Id>(i)), - &options); + for(int i = GraphicsRegion::Line; i < GraphicsRegion::Image; i++) + printItems(&painter, + scene_.root()->childsFrom(static_cast<GraphicsRegion::Id>(i)), + &options); - for(int i = GraphicsRegion::Noise; i <= GraphicsRegion::Meanline; i++) - printItems(&painter, - scene_.root()->childsFrom(static_cast<GraphicsRegion::Id>(i)), - &options); + for(int i = GraphicsRegion::Noise; i <= GraphicsRegion::Meanline; i++) + printItems(&painter, + scene_.root()->childsFrom(static_cast<GraphicsRegion::Id>(i)), + &options); } void MainWindow::printItems(QPainter *painter, const QList<QGraphicsItem *>& items, QStyleOptionGraphicsItem *options) { - foreach(QGraphicsItem *child, items) + foreach(QGraphicsItem *child, items) + { + if(child->isVisible()) { - if(child->isVisible()) - { - QRect - viewport = scene_.backgroundPixmap()->mapRectFromItem(child, child->boundingRect()).toRect(); - painter->translate(abs(child->boundingRect().x() - viewport.x()), - abs(child->boundingRect().y() - viewport.y())); - child->paint(painter, options); - painter->resetTransform(); - } + QRect + viewport = scene_.backgroundPixmap()->mapRectFromItem(child, child->boundingRect()).toRect(); + painter->translate(abs(child->boundingRect().x() - viewport.x()), + abs(child->boundingRect().y() - viewport.y())); + child->paint(painter, options); + painter->resetTransform(); } + } } void MainWindow::onExportation() { - QMessageBox messageBox(this); - messageBox.setWindowTitle("Information"); - messageBox.setText("This feature is not available yet"); - messageBox.exec(); - return; - - QFileInfo fileInfo(scene_.backgroundPath()); - QString outputSuggestion = fileInfo.baseName() + ".pdf"; - QString output = QFileDialog::getSaveFileName(0, tr("Export Document As ..."), outputSuggestion, - tr("PDF (*.pdf);; HTML (*.html *.htm")); - - if(!output.isEmpty()) - { - progressDialog_->reset(); - runner_.start_export(scene_.backgroundPath(), xml_.filename(), output); - } + QMessageBox messageBox(this); + messageBox.setWindowTitle("Information"); + messageBox.setText("This feature is not available yet"); + messageBox.exec(); + return; + + QFileInfo fileInfo(scene_.backgroundPath()); + QString outputSuggestion = fileInfo.baseName() + ".pdf"; + QString output = QFileDialog::getSaveFileName(0, tr("Export Document As ..."), outputSuggestion, + tr("PDF (*.pdf);; HTML (*.html *.htm")); + + if(!output.isEmpty()) + { + progressDialog_->reset(); + runner_.start_export(scene_.backgroundPath(), xml_.filename(), output); + } } void MainWindow::onXmlSaved(const QString& filename) { - xml_.load(filename); - xmlWidget_.changeView(xml_.xmlItem()); - scene_.setRoot(xml_.graphicsItem()); + xml_.load(filename); + xmlWidget_.changeView(xml_.xmlItem()); + scene_.setRoot(xml_.graphicsItem()); - setActionsEnabled(true); - export_->setEnabled(xml_.recognized()); + setActionsEnabled(true); + export_->setEnabled(xml_.recognized()); } void MainWindow::onFileChanged(const QString& filename) { - // If it's not the current scene. - if(scene_.backgroundPath() != filename) + // If it's not the current scene. + if(scene_.backgroundPath() != filename) + { + QString xmlPath = Xml::getPath(filename); + QString + pathToXml = xmlPath + QDir::separator() + + Xml::makeXmlFilename(filename); + + if(filename.isEmpty()) + { + pathToXml = QString(); + disableActions(); + } + // Check if the xml file already exists. + else if(!QFile(pathToXml).exists()) { - QString xmlPath = Xml::getPath(filename); - - if(filename.isEmpty()) - { - xmlPath = QString(); - disableActions(); - } - // Check if the xml file already exists. - else if(!QFile(xmlPath).exists()) - { - xmlPath = QString(); - setActionsEnabled(false); - } - else - setActionsEnabled(true); - - xml_.load(xmlPath); - scene_.changeScene(filename, xml_.graphicsItem()); - xmlWidget_.changeView(xml_.xmlItem()); - export_->setEnabled(xml_.recognized()); - updatePageBrowsing(); + pathToXml = QString(); + setActionsEnabled(false); } + else + setActionsEnabled(true); + + xml_.load(pathToXml); + scene_.changeScene(filename, xml_.graphicsItem()); + xmlWidget_.changeView(xml_.xmlItem()); + export_->setEnabled(xml_.recognized()); + updatePageBrowsing(); + } } void MainWindow::onRegionSelection(QList<RegionItem *> regionItems) { - if(!regionItems.isEmpty()) - xmlWidget_.view()->displayOnly(toXmlItems(regionItems)); - else - { - xmlWidget_.view()->reset(); - xmlWidget_.view()->displayAll(); - xmlWidget_.view()->expandAll(); - } + if(!regionItems.isEmpty()) + xmlWidget_.view()->displayOnly(toXmlItems(regionItems)); + else + { + xmlWidget_.view()->reset(); + xmlWidget_.view()->displayAll(); + xmlWidget_.view()->expandAll(); + } } void MainWindow::onXmlChangeSelection(QList<XmlItem *> xmlItems, bool select) { - QList<RegionItem *> regionItems = toRegionItems(xmlItems); + QList<RegionItem *> regionItems = toRegionItems(xmlItems); - if(!regionItems.isEmpty()) - { - if(select) - scene_.select(regionItems); - else - scene_.unselect(regionItems); - } + if(!regionItems.isEmpty()) + { + if(select) + scene_.select(regionItems); + else + scene_.unselect(regionItems); + } } QList<RegionItem *> MainWindow::toRegionItems(QList<XmlItem *> xmlItems) const { - QList<RegionItem *> regionItems; - XmlItem *child; - foreach(child, xmlItems) - { - if(child->regionItem()) - regionItems << child->regionItem(); - } - - return regionItems; + QList<RegionItem *> regionItems; + XmlItem *child; + foreach(child, xmlItems) + { + if(child->regionItem()) + regionItems << child->regionItem(); + } + + return regionItems; } QList<XmlItem *> MainWindow::toXmlItems(QList<RegionItem *> regionItems) const { - QList<XmlItem *> xmlItems; - RegionItem *child; - foreach(child, regionItems) - xmlItems << child->xmlItem(); + QList<XmlItem *> xmlItems; + RegionItem *child; + foreach(child, regionItems) + xmlItems << child->xmlItem(); - return xmlItems; + return xmlItems; } void MainWindow::onPreferences() { + PreferencesDialog *preferencesDialog_ = new PreferencesDialog(this); preferencesDialog_->show(); } diff --git a/scribo/demo/viewer/mainwindow.hh b/scribo/demo/viewer/mainwindow.hh index 527b612..8f52e09 100644 --- a/scribo/demo/viewer/mainwindow.hh +++ b/scribo/demo/viewer/mainwindow.hh @@ -89,7 +89,6 @@ private: AboutDialog *aboutDialog_; ProgressDialog *progressDialog_; - PreferencesDialog *preferencesDialog_; XmlWidget xmlWidget_; Xml xml_; diff --git a/scribo/demo/viewer/xml.cc b/scribo/demo/viewer/xml.cc index 74c9112..c09ea66 100644 --- a/scribo/demo/viewer/xml.cc +++ b/scribo/demo/viewer/xml.cc @@ -21,19 +21,39 @@ Xml::Xml(const QString& filename) load(filename); } +QString Xml::makeXmlFilename(const QString& filename) +{ + QString xml_file = filename; + + // Get xml filename from image path. + xml_file.remove(0, xml_file.lastIndexOf('/')+1); + int pos = xml_file.lastIndexOf('.'); + xml_file.remove(pos, xml_file.length()-pos); + xml_file += "_gui.xml"; + + return xml_file; +} + QString Xml::getPath(const QString& filename) { Configs *const configs = Configs::getInstance(); - QString xmlPath = filename; - - // Get xml filename from image path. - xmlPath.remove(0, xmlPath.lastIndexOf('/')+1); - int pos = xmlPath.lastIndexOf('.'); - xmlPath.remove(pos, xmlPath.length()-pos); - xmlPath += "_gui.xml"; + // Get directory where XML files are stored. + QFileInfo file(filename); + QString output_dir = QDir::tempPath(); + if (configs->generalSaveXmlEnabled()) + { + if (configs->generalSaveXmlSameDir()) + output_dir = file.absolutePath(); + else if (configs->generalSaveXmlCustomDir()) + output_dir = configs->generalSaveXmlCustomDirPath(); + + QDir dir(output_dir); + if (!dir.exists() && !dir.mkpath(output_dir)) + output_dir = QDir::tempPath(); + } - return configs->generalSaveXmlCustomDirPath() + "/" + xmlPath; + return output_dir; } void Xml::isRecognized(const QDomElement& textElement) diff --git a/scribo/demo/viewer/xml.hh b/scribo/demo/viewer/xml.hh index c5f59d4..608aa7a 100644 --- a/scribo/demo/viewer/xml.hh +++ b/scribo/demo/viewer/xml.hh @@ -67,6 +67,7 @@ public: QString filename() const; bool recognized() const; + static QString makeXmlFilename(const QString& filename); static QString getPath(const QString& filename); void load(const QString& filename); -- 1.7.2.5