diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp index c647cb43de4..46daee420f3 100644 --- a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp @@ -296,7 +296,7 @@ MainWindow::MainWindow() // // Manual handling of actions // - QObject::connect(this->actionExit, SIGNAL(triggered()), + QObject::connect(this->actionQuit, SIGNAL(triggered()), this, SLOT(close())); // We put mutually exclusive actions in an QActionGroup @@ -329,7 +329,7 @@ MainWindow::MainWindow() this->addAboutDemo(":/cgal/help/about_Constrained_Delaunay_triangulation_2.html"); this->addAboutCGAL(); - this->addRecentFiles(this->menuFile, this->actionExit); + this->addRecentFiles(this->menuFile, this->actionQuit); connect(this, SIGNAL(openRecentFile(QString)), this, SLOT(open(QString))); } diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui index beb54231f14..87ebd189d61 100644 --- a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui +++ b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui @@ -78,7 +78,7 @@ 0 0 800 - 29 + 19 @@ -90,7 +90,7 @@ - + @@ -130,7 +130,7 @@ About &CGAL - + &Quit diff --git a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp index d4fee1bea72..eff6a8e492a 100644 --- a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp @@ -82,6 +82,7 @@ public slots: void on_actionRecenter_triggered(); + void open(const QString& fileName); signals: void changed(); @@ -140,7 +141,8 @@ MainWindow::MainWindow() // // Manual handling of actions // - QObject::connect(this->actionExit, SIGNAL(triggered()), + + QObject::connect(this->actionQuit, SIGNAL(triggered()), this, SLOT(close())); // We put mutually exclusive actions in an QActionGroup @@ -173,6 +175,10 @@ MainWindow::MainWindow() this->setupOptionsMenu(); this->addAboutDemo(":/cgal/help/about_Delaunay_triangulation_2.html"); this->addAboutCGAL(); + + this->addRecentFiles(this->menuFile, this->actionQuit); + connect(this, SIGNAL(openRecentFile(QString)), + this, SLOT(open(QString))); } @@ -310,21 +316,33 @@ MainWindow::on_actionLoadPoints_triggered() tr("Open Points file"), "."); if(! fileName.isEmpty()){ - std::ifstream ifs(qPrintable(fileName)); - - K::Point_2 p; - std::vector points; - while(ifs >> p) { - points.push_back(p); - } - dt.insert(points.begin(), points.end()); - - actionRecenter->trigger(); - emit(changed()); + open(fileName); } } +void +MainWindow::open(const QString& fileName) +{ + // wait cursor + QApplication::setOverrideCursor(Qt::WaitCursor); + std::ifstream ifs(qPrintable(fileName)); + + K::Point_2 p; + std::vector points; + while(ifs >> p) { + points.push_back(p); + } + dt.insert(points.begin(), points.end()); + + // default cursor + QApplication::restoreOverrideCursor(); + this->addToRecentFiles(fileName); + actionRecenter->trigger(); + emit(changed()); + +} + void MainWindow::on_actionSavePoints_triggered() { @@ -358,6 +376,10 @@ int main(int argc, char **argv) { QApplication app(argc, argv); + app.setOrganizationDomain("geometryfactory.com"); + app.setOrganizationName("GeometryFactory"); + app.setApplicationName("Delaunay_triangulation_2 demo"); + // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE Q_INIT_RESOURCE(File); diff --git a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.ui b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.ui index dcea8dae60a..cb3aae5b83d 100644 --- a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.ui +++ b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.ui @@ -78,7 +78,7 @@ 0 0 800 - 29 + 19 @@ -90,7 +90,7 @@ - + @@ -126,7 +126,7 @@ About &CGAL - + &Quit diff --git a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp index ba835970970..204f01c9bdd 100644 --- a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp @@ -91,7 +91,7 @@ MainWindow::MainWindow() QObject::connect(this, SIGNAL(changed()), dgi, SLOT(modelChanged())); - dgi->setVerticesPen(QPen(Qt::red, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); + dgi->setVerticesPen(QPen(Qt::red, 0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); scene.addItem(dgi); // Add a GraphicItem for the Powerdiagram diagram @@ -290,6 +290,10 @@ int main(int argc, char **argv) { QApplication app(argc, argv); + app.setOrganizationDomain("geometryfactory.com"); + app.setOrganizationName("GeometryFactory"); + app.setApplicationName("Regular_triangulation_2 demo"); + // Import resources from libCGALQt4. // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE Q_INIT_RESOURCE(File);