diff --git a/.gitattributes b/.gitattributes index 0fd892b8c42..d662a9867bd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1417,10 +1417,7 @@ GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.ui -text GraphicsView/demo/Alpha_shapes_2/about_Alpha_shapes_2.html svneol=native#text/html GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.qrc -text GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.ui -text -GraphicsView/demo/Apollonius_graph_2/Stream_lines_2.qrc -text -GraphicsView/demo/Apollonius_graph_2/Stream_lines_2.ui -text GraphicsView/demo/Apollonius_graph_2/about_Apollonius_graph_2.html svneol=native#text/html -GraphicsView/demo/Apollonius_graph_2/about_Stream_lines_2.html svneol=native#text/html GraphicsView/demo/Bounding_volumes/Bounding_volumes.qrc -text GraphicsView/demo/Bounding_volumes/Bounding_volumes.ui -text GraphicsView/demo/Bounding_volumes/about_Bounding_volumes.html svneol=native#text/html diff --git a/GraphicsView/demo/Apollonius_graph_2/Stream_lines_2.cpp b/GraphicsView/demo/Apollonius_graph_2/Stream_lines_2.cpp deleted file mode 100644 index 8a8421c9315..00000000000 --- a/GraphicsView/demo/Apollonius_graph_2/Stream_lines_2.cpp +++ /dev/null @@ -1,246 +0,0 @@ -#include - -// CGAL headers -#include -#include -#include -#include - - -// Qt headers -#include -#include -#include -#include -#include - -// GraphicsView items and event filters (input classes) -#include - -// for viewportsBbox -#include - -// the two base classes -#include "ui_Stream_lines_2.h" -#include - -typedef CGAL::Exact_predicates_inexact_constructions_kernel K; - -typedef CGAL::Regular_grid_2 Regular_grid; -typedef CGAL::Runge_kutta_integrator_2 Runge_kutta_integrator; -typedef CGAL::Stream_lines_2 Stream_lines; -typedef CGAL::Stream_lines_2::Stream_line_iterator_2 Stream_line_iterator; -typedef CGAL::Stream_lines_2::Point_iterator_2 Point_iterator; -typedef CGAL::Stream_lines_2::Point_2 Point_2; -typedef CGAL::Stream_lines_2::Vector_2 Vector; - -typedef K::Iso_rectangle_2 Iso_rectangle_2; - - - -class MainWindow : - public CGAL::Qt::DemosMainWindow, - public Ui::Stream_lines_2 -{ - Q_OBJECT - -private: - Stream_lines * stream_lines; - Runge_kutta_integrator * runge_kutta_integrator; - Regular_grid * regular_grid; - double density; - double ratio; - double integrating; - int sampling; - QGraphicsScene scene; - - CGAL::Qt::StreamLinesGraphicsItem * sli; - -public: - MainWindow(); - -public slots: - - void on_actionLoadPoints_triggered(); - - void on_actionClear_triggered(); - - void on_actionSavePoints_triggered(); - - void on_actionGenerate_triggered(); - - void on_actionRecenter_triggered(); - - virtual void open(QString fileName); - -signals: - void changed(); -}; - - -MainWindow::MainWindow() - : DemosMainWindow(), density(12.0), ratio(1.6), integrating(1.0), sampling(1) -{ - setupUi(this); - - this->graphicsView->setAcceptDrops(false); - - - // Manual handling of actions - // - - QObject::connect(this->actionQuit, SIGNAL(triggered()), - this, SLOT(close())); - - // - // Setup the scene and the view - // - scene.setItemIndexMethod(QGraphicsScene::NoIndex); - scene.setSceneRect(-100, -100, 100, 100); - this->graphicsView->setScene(&scene); - - // Turn the vertical axis upside down - this->graphicsView->matrix().scale(1, -1); - - // The navigation adds zooming and translation functionality to the - // QGraphicsView - this->addNavigation(this->graphicsView); - - this->setupStatusBar(); - this->setupOptionsMenu(); - this->addAboutDemo(":/cgal/help/about_Stream_lines_2.html"); - this->addAboutCGAL(); - - this->addRecentFiles(this->menuFile, this->actionQuit); - connect(this, SIGNAL(openRecentFile(QString)), - this, SLOT(open(QString))); -} - - - -/* - * Qt Automatic Connections - * http://doc.trolltech.com/4.4/designer-using-a-component.html#automatic-connections - * - * setupUi(this) generates connections to the slots named - * "on__" - */ - - -void -MainWindow::on_actionClear_triggered() -{ - emit(changed()); -} - - -void -MainWindow::on_actionGenerate_triggered() -{ - stream_lines = new Stream_lines(*regular_grid, *runge_kutta_integrator, density, ratio, sampling); - - sli = new CGAL::Qt::StreamLinesGraphicsItem(stream_lines); - - QObject::connect(this, SIGNAL(changed()), - sli, SLOT(modelChanged())); - - //sli->setVerticesPen(QPen(Qt::red, 3, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); - sli->setEdgesPen(QPen(Qt::blue, 0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); - scene.addItem(sli); - - emit(changed()); -} - - - -void -MainWindow::on_actionLoadPoints_triggered() -{ - QString fileName = QFileDialog::getOpenFileName(this, - tr("Open grid file"), - "."); - if(! fileName.isEmpty()){ - open(fileName); - } -} - - -void -MainWindow::open(QString fileName) -{ - // wait cursor - QApplication::setOverrideCursor(Qt::WaitCursor); - std::ifstream ifs(qPrintable(fileName)); - - runge_kutta_integrator = new Runge_kutta_integrator(integrating); - double iXSize, iYSize; - iXSize = iYSize = 512; - unsigned int x_samples, y_samples; - ifs >> x_samples; - ifs >> y_samples; - regular_grid = new Regular_grid(x_samples, y_samples, iXSize, iYSize); - std::cerr << "fill grid" << std::endl; - /*fill the grid with the appropreate values*/ - for (unsigned int i=0;i> xval; - ifs >> yval; - regular_grid->set_field(i, j, Vector(xval, yval)); - } - ifs.close(); - std::cerr << "close the stream" << std::endl; - // default cursor - QApplication::restoreOverrideCursor(); - this->addToRecentFiles(fileName); - // actionRecenter->trigger(); - on_actionGenerate_triggered(); - emit(changed()); - -} - -void -MainWindow::on_actionSavePoints_triggered() -{ - /* - QString fileName = QFileDialog::getSaveFileName(this, - tr("Save points"), - "."); - if(! fileName.isEmpty()){ - std::ofstream ofs(qPrintable(fileName)); - - } - */ -} - - -void -MainWindow::on_actionRecenter_triggered() -{ - this->graphicsView->setSceneRect(sli->boundingRect()); - this->graphicsView->fitInView(sli->boundingRect(), Qt::KeepAspectRatio); -} - - -#include "Stream_lines_2.moc" - -int main(int argc, char **argv) -{ - QApplication app(argc, argv); - - app.setOrganizationDomain("geometryfactory.com"); - app.setOrganizationName("GeometryFactory"); - app.setApplicationName("Stream_lines_2 demo"); - - // Import resources from libCGALQt4. - // See http://doc.trolltech.com/4.4/qdir.html#Q_INIT_RESOURCE - Q_INIT_RESOURCE(File); - Q_INIT_RESOURCE(Stream_lines_2); - Q_INIT_RESOURCE(Input); - Q_INIT_RESOURCE(CGAL); - - MainWindow mainWindow; - mainWindow.show(); - return app.exec(); -} diff --git a/GraphicsView/demo/Apollonius_graph_2/Stream_lines_2.qrc b/GraphicsView/demo/Apollonius_graph_2/Stream_lines_2.qrc deleted file mode 100644 index 57cb0fa9186..00000000000 --- a/GraphicsView/demo/Apollonius_graph_2/Stream_lines_2.qrc +++ /dev/null @@ -1,8 +0,0 @@ - - - - - ../resources/about_CGAL.html - about_Stream_lines_2.html - - diff --git a/GraphicsView/demo/Apollonius_graph_2/Stream_lines_2.ui b/GraphicsView/demo/Apollonius_graph_2/Stream_lines_2.ui deleted file mode 100644 index 392a7f60ac4..00000000000 --- a/GraphicsView/demo/Apollonius_graph_2/Stream_lines_2.ui +++ /dev/null @@ -1,213 +0,0 @@ - - GeometryFactory - Stream_lines_2 - - - - 0 - 0 - 800 - 600 - - - - CGAL Streamlines - - - - :/cgal/logos/cgal_icon:/cgal/logos/cgal_icon - - - - - - - Qt::StrongFocus - - - Qt::ScrollBarAlwaysOn - - - Qt::ScrollBarAlwaysOn - - - QGraphicsView::NoAnchor - - - - - - - - - File Tools - - - TopToolBarArea - - - false - - - - - - - - Visualization Tools - - - TopToolBarArea - - - false - - - - - - - - 0 - 0 - 800 - 19 - - - - - &File - - - - - - - - - - - &Edit - - - - - - &Tools - - - - - - - - - - - - &About - - - - - About &CGAL - - - - - &Quit - - - Ctrl+Q - - - - - &Insert random points - - - Ctrl+I - - - - - - true - - - false - - - - :/cgal/Input/inputPoint.png:/cgal/Input/inputPoint.png - - - &Insert Point - - - Insert Point - - - Left: Insert vtx - - - - - - :/cgal/fileToolbar/fileNew.png:/cgal/fileToolbar/fileNew.png - - - &Clear - - - Ctrl+C - - - - - - - :/cgal/fileToolbar/fileOpen.png:/cgal/fileToolbar/fileOpen.png - - - &Load Points... - - - Ctrl+L - - - - - - :/cgal/fileToolbar/fileSave.png:/cgal/fileToolbar/fileSave.png - - - &Save Points... - - - Ctrl+S - - - - - - - :/cgal/Input/zoom-best-fit:/cgal/Input/zoom-best-fit - - - Re&center the viewport - - - Ctrl+R - - - - - - - - - - - - diff --git a/GraphicsView/demo/Apollonius_graph_2/about_Stream_lines_2.html b/GraphicsView/demo/Apollonius_graph_2/about_Stream_lines_2.html deleted file mode 100644 index febbb883260..00000000000 --- a/GraphicsView/demo/Apollonius_graph_2/about_Stream_lines_2.html +++ /dev/null @@ -1,9 +0,0 @@ - - -

Apollonius Graph

-

Copyright © 2010 GeometryFactory

-

This application illustrates the 2D Apollonius graph.

-

See also the online - manual.

- -