From a9795c3562397923578c855e0995b6d25541f370 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Thu, 11 Jun 2020 13:11:36 +0200 Subject: [PATCH 01/10] Fix deprecation warnings --- .../demo/Alpha_shapes_2/Alpha_shapes_2.cpp | 2 +- .../Apollonius_graph_2/Apollonius_graph_2.cpp | 2 +- .../Bounding_volumes/Bounding_volumes.cpp | 2 +- .../L1_voronoi_diagram_2.cpp | 2 +- .../Periodic_2_Delaunay_triangulation_2.cpp | 2 +- .../demo/Snap_rounding_2/Snap_rounding_2.cpp | 2 +- .../demo/Stream_lines_2/Stream_lines_2.cpp | 2 +- .../Delaunay_triangulation_2.cpp | 2 +- .../Regular_triangulation_2.cpp | 2 +- .../include/CGAL/Qt/DemosMainWindow.h | 2 +- .../CGAL/Qt/GraphicsViewNavigation_impl.h | 17 ++++---- .../CGAL/Qt/manipulatedCameraFrame_impl.h | 2 +- .../include/CGAL/Qt/manipulatedFrame_impl.h | 2 +- GraphicsView/include/CGAL/Qt/qglviewer.h | 6 +-- Polyhedron/demo/Polyhedron/MainWindow.cpp | 4 ++ .../Plugins/PCA/Basic_generator_plugin.cpp | 39 ++++++++++++++++++- .../Plugins/Surface_mesh/UVProjector.h | 2 +- Polyhedron/demo/Polyhedron/Viewer.cpp | 10 ++++- 18 files changed, 73 insertions(+), 29 deletions(-) diff --git a/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp b/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp index c473c373091..374e297f3cc 100644 --- a/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp +++ b/GraphicsView/demo/Alpha_shapes_2/Alpha_shapes_2.cpp @@ -138,7 +138,7 @@ MainWindow::MainWindow() this->graphicsView->setMouseTracking(true); // Turn the vertical axis upside down - this->graphicsView->matrix().scale(1, -1); + this->graphicsView->transform().scale(1, -1); // The navigation adds zooming and translation functionality to the // QGraphicsView diff --git a/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp b/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp index 2847ac24d9e..8292f28262d 100644 --- a/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp +++ b/GraphicsView/demo/Apollonius_graph_2/Apollonius_graph_2.cpp @@ -125,7 +125,7 @@ MainWindow::MainWindow() this->graphicsView->setMouseTracking(true); // Turn the vertical axis upside down - this->graphicsView->matrix().scale(1, -1); + this->graphicsView->transform().scale(1, -1); // The navigation adds zooming and translation functionality to the // QGraphicsView diff --git a/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp b/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp index fe02e1d0faa..12928ca9897 100644 --- a/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp +++ b/GraphicsView/demo/Bounding_volumes/Bounding_volumes.cpp @@ -208,7 +208,7 @@ MainWindow::MainWindow() this->graphicsView->setMouseTracking(true); // Turn the vertical axis upside down - this->graphicsView->matrix().scale(1, -1); + this->graphicsView->transform().scale(1, -1); // The navigation adds zooming and translation functionality to the // QGraphicsView diff --git a/GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp b/GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp index 40b4601ea8f..621a6f6c6c9 100644 --- a/GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp +++ b/GraphicsView/demo/L1_Voronoi_diagram_2/L1_voronoi_diagram_2.cpp @@ -178,7 +178,7 @@ MainWindow::MainWindow() this->graphicsView->setMouseTracking(true); // Turn the vertical axis upside down - this->graphicsView->matrix().scale(1, -1); + this->graphicsView->transform().scale(1, -1); // The navigation adds zooming and translation functionality to the // QGraphicsView diff --git a/GraphicsView/demo/Periodic_2_triangulation_2/Periodic_2_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Periodic_2_triangulation_2/Periodic_2_Delaunay_triangulation_2.cpp index fca48808325..e956d72a171 100644 --- a/GraphicsView/demo/Periodic_2_triangulation_2/Periodic_2_Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Periodic_2_triangulation_2/Periodic_2_Delaunay_triangulation_2.cpp @@ -181,7 +181,7 @@ MainWindow::MainWindow() this->graphicsView->setMouseTracking(true); // Turn the vertical axis upside down - this->graphicsView->matrix().scale(1, -1); + this->graphicsView->transform().scale(1, -1); // The navigation adds zooming and translation functionality to the // QGraphicsView diff --git a/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp b/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp index f16611b517e..0225624b96e 100644 --- a/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp +++ b/GraphicsView/demo/Snap_rounding_2/Snap_rounding_2.cpp @@ -132,7 +132,7 @@ MainWindow::MainWindow() scene.setItemIndexMethod(QGraphicsScene::NoIndex); this->graphicsView->setScene(&scene); // Turn the vertical axis upside down - this->graphicsView->matrix().scale(1, -1); + this->graphicsView->transform().scale(1, -1); this->graphicsView->setMouseTracking(true); rgi = new CGAL::Qt::RegularGridGraphicsItem(delta, delta); diff --git a/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp b/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp index 0eeb169f07f..b0e1fb852ec 100644 --- a/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp +++ b/GraphicsView/demo/Stream_lines_2/Stream_lines_2.cpp @@ -106,7 +106,7 @@ MainWindow::MainWindow() this->graphicsView->setScene(&scene); // Turn the vertical axis upside down - this->graphicsView->matrix().scale(1, -1); + this->graphicsView->transform().scale(1, -1); // The navigation adds zooming and translation functionality to the // QGraphicsView diff --git a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp index 62ac4d75501..9d810c04398 100644 --- a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp @@ -171,7 +171,7 @@ MainWindow::MainWindow() this->graphicsView->setMouseTracking(true); // Turn the vertical axis upside down - this->graphicsView->matrix().scale(1, -1); + this->graphicsView->transform().scale(1, -1); // The navigation adds zooming and translation functionality to the // QGraphicsView diff --git a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp index fcaf1aba96d..3b5cd7cf76b 100644 --- a/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Regular_triangulation_2.cpp @@ -142,7 +142,7 @@ MainWindow::MainWindow() this->graphicsView->setMouseTracking(true); // Turn the vertical axis upside down - this->graphicsView->matrix().scale(1, -1); + this->graphicsView->transform().scale(1, -1); // The navigation adds zooming and translation functionality to the // QGraphicsView diff --git a/GraphicsView/include/CGAL/Qt/DemosMainWindow.h b/GraphicsView/include/CGAL/Qt/DemosMainWindow.h index 834262cc4c8..856943ad247 100644 --- a/GraphicsView/include/CGAL/Qt/DemosMainWindow.h +++ b/GraphicsView/include/CGAL/Qt/DemosMainWindow.h @@ -72,7 +72,7 @@ private: QMenu* getHelpMenu(); protected: - DemosMainWindow (QWidget * parent = 0, ::Qt::WindowFlags flags = 0 ); + DemosMainWindow (QWidget * parent = 0, ::Qt::WindowFlags flags = ::Qt::WindowFlags(0) ); ~DemosMainWindow(); void setupStatusBar(); void addNavigation(QGraphicsView*); diff --git a/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation_impl.h b/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation_impl.h index 50b4427c131..39863832586 100644 --- a/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation_impl.h +++ b/GraphicsView/include/CGAL/Qt/GraphicsViewNavigation_impl.h @@ -134,15 +134,12 @@ namespace Qt { } // end case KeyRelease case QEvent::Wheel: { QWheelEvent *wheelEvent = static_cast(event); - if(wheelEvent->orientation() != ::Qt::Vertical) { - return false; - } double zoom_ratio = 240.0; if( (wheelEvent->modifiers() & ::Qt::ShiftModifier) || (wheelEvent->modifiers() & ::Qt::ControlModifier) ) { zoom_ratio = 120.0; } - scaleView(v, pow((double)2, -wheelEvent->delta() / zoom_ratio)); + scaleView(v, pow((double)2, -wheelEvent->angleDelta().y() / zoom_ratio)); // display_parameters(); return true; @@ -311,12 +308,12 @@ namespace Qt { boost::format("matrix translation=(%1%, %2%)\n" " rotation=(%3% - %4% )\n" " (%5% - %6% )\n") - % v->matrix().dx() - % v->matrix().dy() - % v->matrix().m11() - % v->matrix().m12() - % v->matrix().m21() - % v->matrix().m22(); + % v->transform().dx() + % v->transform().dy() + % v->transform().m11() + % v->transform().m12() + % v->transform().m21() + % v->transform().m22(); QRect vp_rect = v->viewport()->rect(); QPoint vp_top_left = vp_rect.topLeft(); diff --git a/GraphicsView/include/CGAL/Qt/manipulatedCameraFrame_impl.h b/GraphicsView/include/CGAL/Qt/manipulatedCameraFrame_impl.h index c13808d7320..3dfb1bf5e55 100644 --- a/GraphicsView/include/CGAL/Qt/manipulatedCameraFrame_impl.h +++ b/GraphicsView/include/CGAL/Qt/manipulatedCameraFrame_impl.h @@ -421,7 +421,7 @@ void ManipulatedCameraFrame::wheelEvent(QWheelEvent *const event, case MOVE_BACKWARD: //#CONNECTION# mouseMoveEvent() MOVE_FORWARD case translate( - inverseTransformOf(Vec(0.0, 0.0, 0.2 * flySpeed() * event->delta()))); + inverseTransformOf(Vec(0.0, 0.0, 0.2 * flySpeed() * event->angleDelta().y()))); Q_EMIT manipulated(); break; default: diff --git a/GraphicsView/include/CGAL/Qt/manipulatedFrame_impl.h b/GraphicsView/include/CGAL/Qt/manipulatedFrame_impl.h index 96d03db9adc..11a68ce0c08 100644 --- a/GraphicsView/include/CGAL/Qt/manipulatedFrame_impl.h +++ b/GraphicsView/include/CGAL/Qt/manipulatedFrame_impl.h @@ -295,7 +295,7 @@ qreal ManipulatedFrame::deltaWithPrevPos(QMouseEvent *const event, CGAL_INLINE_FUNCTION qreal ManipulatedFrame::wheelDelta(const QWheelEvent *event) const { static const qreal WHEEL_SENSITIVITY_COEF = 8E-4; - return event->delta() * wheelSensitivity() * WHEEL_SENSITIVITY_COEF; + return event->angleDelta().y() * wheelSensitivity() * WHEEL_SENSITIVITY_COEF; } CGAL_INLINE_FUNCTION diff --git a/GraphicsView/include/CGAL/Qt/qglviewer.h b/GraphicsView/include/CGAL/Qt/qglviewer.h index ed0624ef73b..2db183e6bce 100644 --- a/GraphicsView/include/CGAL/Qt/qglviewer.h +++ b/GraphicsView/include/CGAL/Qt/qglviewer.h @@ -73,11 +73,11 @@ class CGAL_QT_EXPORT QGLViewer : public QOpenGLWidget, public QOpenGLFunctions { public: //todo check if this is used. If not remove it explicit QGLViewer(QGLContext* context, QWidget *parent = 0, - ::Qt::WindowFlags flags = 0); + ::Qt::WindowFlags flags = ::Qt::WindowFlags(0)); explicit QGLViewer(QOpenGLContext* context, QWidget *parent = 0, - ::Qt::WindowFlags flags = 0); + ::Qt::WindowFlags flags = ::Qt::WindowFlags(0)); explicit QGLViewer(QWidget *parent = 0, - ::Qt::WindowFlags flags = 0); + ::Qt::WindowFlags flags = ::Qt::WindowFlags(0)); virtual ~QGLViewer(); diff --git a/Polyhedron/demo/Polyhedron/MainWindow.cpp b/Polyhedron/demo/Polyhedron/MainWindow.cpp index 3951ba10c1c..ae829c69345 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow.cpp +++ b/Polyhedron/demo/Polyhedron/MainWindow.cpp @@ -765,7 +765,11 @@ void MainWindow::loadPlugins() qputenv("PATH", new_path); #endif Q_FOREACH (QString pluginsDir, + #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) env_path.split(separator, QString::SkipEmptyParts)) { + #else + env_path.split(separator, Qt::SkipEmptyParts)) { + #endif QDir dir(pluginsDir); if(dir.isReadable()) plugins_directories << dir; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp index 4215c75421b..89637556188 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp @@ -350,8 +350,11 @@ void Basic_generator_plugin::generateCube() for(int i=0; i<8; ++i) { - +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QStringList list = point_texts[i].split(QRegExp("\\s+"), QString::SkipEmptyParts); +#else + QStringList list = point_texts[i].split(QRegExp("\\s+"), Qt::SkipEmptyParts); +#endif if (list.isEmpty()) return; if (list.size()!=3){ QMessageBox *msgBox = new QMessageBox; @@ -392,7 +395,11 @@ void Basic_generator_plugin::generateCube() else { QString text = dock_widget->extremaEdit->text(); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QStringList list = text.split(QRegExp("\\s+"), QString::SkipEmptyParts); +#else + QStringList list = text.split(QRegExp("\\s+"), Qt::SkipEmptyParts); +#endif if (list.isEmpty()) return; if (list.size()!=6){ QMessageBox *msgBox = new QMessageBox; @@ -443,7 +450,11 @@ void Basic_generator_plugin::generatePrism() bool is_closed = dock_widget->prismCheckBox->isChecked(); QString text = dock_widget->prism_lineEdit->text(); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QStringList list = text.split(QRegExp("\\s+"), QString::SkipEmptyParts); +#else + QStringList list = text.split(QRegExp("\\s+"), Qt::SkipEmptyParts); +#endif if (list.isEmpty()) return; if (list.size()!=3){ QMessageBox *msgBox = new QMessageBox; @@ -490,7 +501,11 @@ void Basic_generator_plugin::generatePyramid() bool is_closed = dock_widget->pyramidCheckBox->isChecked(); QString text = dock_widget->pyramid_lineEdit->text(); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QStringList list = text.split(QRegExp("\\s+"), QString::SkipEmptyParts); +#else + QStringList list = text.split(QRegExp("\\s+"), Qt::SkipEmptyParts); +#endif if (list.isEmpty()) return; if (list.size()!=3){ QMessageBox *msgBox = new QMessageBox; @@ -533,7 +548,11 @@ void Basic_generator_plugin::generateSphere() { int precision = dock_widget->SphereSpinBox->value(); QString text = dock_widget->center_radius_lineEdit->text(); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QStringList list = text.split(QRegExp("\\s+"), QString::SkipEmptyParts); +#else + QStringList list = text.split(QRegExp("\\s+"), Qt::SkipEmptyParts); +#endif if (list.isEmpty()) return; if (list.size()!=4){ QMessageBox *msgBox = new QMessageBox; @@ -582,8 +601,11 @@ void Basic_generator_plugin::generateTetrahedron() for(int i=0; i<4; ++i) { - +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QStringList list = point_texts[i].split(QRegExp("\\s+"), QString::SkipEmptyParts); +#else + QStringList list = point_texts[i].split(QRegExp("\\s+"), Qt::SkipEmptyParts); +#endif if (list.isEmpty()) return; if (list.size()!=3){ QMessageBox *msgBox = new QMessageBox; @@ -624,7 +646,11 @@ void Basic_generator_plugin::generatePoints() { QString text = dock_widget->point_textEdit->toPlainText(); Scene_points_with_normal_item* item = new Scene_points_with_normal_item(); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QStringList list = text.split(QRegExp("\\s+"), QString::SkipEmptyParts); +#else + QStringList list = text.split(QRegExp("\\s+"), Qt::SkipEmptyParts); +#endif int counter = 0; double coord[3]; bool ok = true; @@ -682,7 +708,12 @@ void Basic_generator_plugin::generateLines() polylines.resize(polylines.size()+1); std::vector& polyline = *(polylines.rbegin()); QStringList polylines_metadata; + +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QStringList list = text.split(QRegExp("\\s+"), QString::SkipEmptyParts); +#else + QStringList list = text.split(QRegExp("\\s+"), Qt::SkipEmptyParts); +#endif int counter = 0; double coord[3]; bool ok = true; @@ -782,7 +813,11 @@ void Basic_generator_plugin::generateGrid() bool triangulated = dock_widget->grid_checkBox->isChecked(); points_text= dock_widget->grid_lineEdit->text(); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QStringList list = points_text.split(QRegExp("\\s+"), QString::SkipEmptyParts); +#else + QStringList list = points_text.split(QRegExp("\\s+"), Qt::SkipEmptyParts); +#endif if (list.isEmpty()) return; if (list.size()!=6){ QMessageBox *msgBox = new QMessageBox; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/UVProjector.h b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/UVProjector.h index dd54dad556d..6a726c8db90 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/UVProjector.h +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/UVProjector.h @@ -108,7 +108,7 @@ protected: } void wheelEvent(QWheelEvent *event) { - if(event->delta() >0) + if(event->angleDelta().y() >0) translation[2] *= 1.2; else translation[2] /= 1.2; diff --git a/Polyhedron/demo/Polyhedron/Viewer.cpp b/Polyhedron/demo/Polyhedron/Viewer.cpp index 57ed3f9d84f..0a41f43ea04 100644 --- a/Polyhedron/demo/Polyhedron/Viewer.cpp +++ b/Polyhedron/demo/Polyhedron/Viewer.cpp @@ -852,7 +852,11 @@ void Viewer::postSelection(const QPoint& pixel) } bool CGAL::Three::Viewer_interface::readFrame(QString s, CGAL::qglviewer::Frame& frame) { +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QStringList list = s.split(" ", QString::SkipEmptyParts); +#else + QStringList list = s.split(" ", ::Qt::SkipEmptyParts); +#endif if(list.size() != 7) return false; float vec[3]; @@ -1422,7 +1426,7 @@ void Viewer::wheelEvent(QWheelEvent* e) { if(e->modifiers().testFlag(Qt::ShiftModifier)) { - double delta = e->delta(); + double delta = e->angleDelta().y(); if(delta>0) { switch(camera()->type()) @@ -1781,7 +1785,11 @@ void Viewer::setLighting() connect(dialog->position_lineEdit, &QLineEdit::editingFinished, [this, dialog]() { +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QStringList list = dialog->position_lineEdit->text().split(QRegExp(","), QString::SkipEmptyParts); +#else + QStringList list = dialog->position_lineEdit->text().split(QRegExp(","), Qt::SkipEmptyParts); +#endif if (list.isEmpty()) return; if (list.size()!=3){ QMessageBox *msgBox = new QMessageBox; From 624e8e803af285db1fa110bfbb03c0a7373c5540 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 12 Jun 2020 10:34:48 +0200 Subject: [PATCH 02/10] Fix flag fix --- GraphicsView/include/CGAL/Qt/DemosMainWindow.h | 2 +- GraphicsView/include/CGAL/Qt/qglviewer.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/GraphicsView/include/CGAL/Qt/DemosMainWindow.h b/GraphicsView/include/CGAL/Qt/DemosMainWindow.h index 856943ad247..34dab58fbfc 100644 --- a/GraphicsView/include/CGAL/Qt/DemosMainWindow.h +++ b/GraphicsView/include/CGAL/Qt/DemosMainWindow.h @@ -72,7 +72,7 @@ private: QMenu* getHelpMenu(); protected: - DemosMainWindow (QWidget * parent = 0, ::Qt::WindowFlags flags = ::Qt::WindowFlags(0) ); + DemosMainWindow (QWidget * parent = 0, ::Qt::WindowFlags flags = ::Qt::WindowType(0) ); ~DemosMainWindow(); void setupStatusBar(); void addNavigation(QGraphicsView*); diff --git a/GraphicsView/include/CGAL/Qt/qglviewer.h b/GraphicsView/include/CGAL/Qt/qglviewer.h index 2db183e6bce..8b3ff179e9c 100644 --- a/GraphicsView/include/CGAL/Qt/qglviewer.h +++ b/GraphicsView/include/CGAL/Qt/qglviewer.h @@ -73,11 +73,11 @@ class CGAL_QT_EXPORT QGLViewer : public QOpenGLWidget, public QOpenGLFunctions { public: //todo check if this is used. If not remove it explicit QGLViewer(QGLContext* context, QWidget *parent = 0, - ::Qt::WindowFlags flags = ::Qt::WindowFlags(0)); + ::Qt::WindowFlags flags = ::Qt::WindowType(0)); explicit QGLViewer(QOpenGLContext* context, QWidget *parent = 0, - ::Qt::WindowFlags flags = ::Qt::WindowFlags(0)); + ::Qt::WindowFlags flags = ::Qt::WindowType(0)); explicit QGLViewer(QWidget *parent = 0, - ::Qt::WindowFlags flags = ::Qt::WindowFlags(0)); + ::Qt::WindowFlags flags = ::Qt::WindowType(0)); virtual ~QGLViewer(); From 77af45afc11d72f077b3078e71d7e8c805087f65 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 12 Jun 2020 16:13:16 +0200 Subject: [PATCH 03/10] Fix remainings warnings, use #define for split and fix error in filterOperations --- Polyhedron/demo/Polyhedron/MainWindow.cpp | 20 ++++--- .../Plugins/PCA/Basic_generator_plugin.cpp | 55 ++++--------------- .../Plugins/PMP/Engrave_text_plugin.cpp | 2 +- .../Polyhedron/Plugins/PMP/Extrude_plugin.cpp | 2 +- .../Point_set/Point_set_selection_plugin.cpp | 2 +- .../Surface_mesh/Parameterization_plugin.cpp | 2 +- .../Scene_edit_polyhedron_item.cpp | 2 +- Polyhedron/demo/Polyhedron/Viewer.cpp | 12 +--- Three/include/CGAL/Three/Three.h | 7 +++ 9 files changed, 35 insertions(+), 69 deletions(-) diff --git a/Polyhedron/demo/Polyhedron/MainWindow.cpp b/Polyhedron/demo/Polyhedron/MainWindow.cpp index ae829c69345..5a5ed733a40 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow.cpp +++ b/Polyhedron/demo/Polyhedron/MainWindow.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -401,6 +402,7 @@ MainWindow::MainWindow(const QStringList &keywords, bool verbose, QWidget* paren objectValue); } } + filterOperations(true); // debugger->action(QScriptEngineDebugger::InterruptAction)->trigger(); #endif } @@ -413,10 +415,14 @@ void addActionToMenu(QAction* action, QMenu* menu) QString atxt = action->text().remove("&"), btxt = it->text().remove("&"); int i = 0; - while(atxt[i] == btxt[i] - && i < atxt.size() - && i < btxt.size()) + if(atxt.isEmpty() || btxt.isEmpty()) + continue; + while(i < atxt.size() + && i < btxt.size() + && atxt[i] == btxt[i]) ++i; + if(i == atxt.size() || i == btxt.size()) + continue; bool res = (atxt[i] < btxt[i]); if (res) { @@ -490,12 +496,12 @@ void MainWindow::filterOperations(bool) menu->removeAction(action); } } + Q_FOREACH(QAction* action, action_menu_map.keys()) { QMenu* menu = action_menu_map[action]; addActionToMenu(action, menu); } - QString filter=operationSearchBar.text(); Q_FOREACH(const PluginNamePair& p, plugins) { Q_FOREACH(QAction* action, p.first->actions()) { @@ -765,11 +771,7 @@ void MainWindow::loadPlugins() qputenv("PATH", new_path); #endif Q_FOREACH (QString pluginsDir, - #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - env_path.split(separator, QString::SkipEmptyParts)) { - #else - env_path.split(separator, Qt::SkipEmptyParts)) { - #endif + env_path.split(separator, SkipEmptyParts)) { QDir dir(pluginsDir); if(dir.isReadable()) plugins_directories << dir; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp index 89637556188..02648fed359 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp @@ -15,6 +15,7 @@ #include "Scene_polylines_item.h" #include #include +#include #include "ui_Basic_generator_widget.h" class GeneratorWidget : @@ -350,11 +351,7 @@ void Basic_generator_plugin::generateCube() for(int i=0; i<8; ++i) { -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QStringList list = point_texts[i].split(QRegExp("\\s+"), QString::SkipEmptyParts); -#else - QStringList list = point_texts[i].split(QRegExp("\\s+"), Qt::SkipEmptyParts); -#endif + QStringList list = point_texts[i].split(QRegExp("\\s+"), SkipEmptyParts); if (list.isEmpty()) return; if (list.size()!=3){ QMessageBox *msgBox = new QMessageBox; @@ -395,11 +392,7 @@ void Basic_generator_plugin::generateCube() else { QString text = dock_widget->extremaEdit->text(); -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QStringList list = text.split(QRegExp("\\s+"), QString::SkipEmptyParts); -#else - QStringList list = text.split(QRegExp("\\s+"), Qt::SkipEmptyParts); -#endif + QStringList list = text.split(QRegExp("\\s+"), SkipEmptyParts); if (list.isEmpty()) return; if (list.size()!=6){ QMessageBox *msgBox = new QMessageBox; @@ -450,11 +443,7 @@ void Basic_generator_plugin::generatePrism() bool is_closed = dock_widget->prismCheckBox->isChecked(); QString text = dock_widget->prism_lineEdit->text(); -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QStringList list = text.split(QRegExp("\\s+"), QString::SkipEmptyParts); -#else - QStringList list = text.split(QRegExp("\\s+"), Qt::SkipEmptyParts); -#endif + QStringList list = text.split(QRegExp("\\s+"), SkipEmptyParts); if (list.isEmpty()) return; if (list.size()!=3){ QMessageBox *msgBox = new QMessageBox; @@ -501,11 +490,7 @@ void Basic_generator_plugin::generatePyramid() bool is_closed = dock_widget->pyramidCheckBox->isChecked(); QString text = dock_widget->pyramid_lineEdit->text(); -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QStringList list = text.split(QRegExp("\\s+"), QString::SkipEmptyParts); -#else - QStringList list = text.split(QRegExp("\\s+"), Qt::SkipEmptyParts); -#endif + QStringList list = text.split(QRegExp("\\s+"), SkipEmptyParts); if (list.isEmpty()) return; if (list.size()!=3){ QMessageBox *msgBox = new QMessageBox; @@ -548,11 +533,7 @@ void Basic_generator_plugin::generateSphere() { int precision = dock_widget->SphereSpinBox->value(); QString text = dock_widget->center_radius_lineEdit->text(); -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QStringList list = text.split(QRegExp("\\s+"), QString::SkipEmptyParts); -#else - QStringList list = text.split(QRegExp("\\s+"), Qt::SkipEmptyParts); -#endif + QStringList list = text.split(QRegExp("\\s+"), SkipEmptyParts); if (list.isEmpty()) return; if (list.size()!=4){ QMessageBox *msgBox = new QMessageBox; @@ -601,11 +582,7 @@ void Basic_generator_plugin::generateTetrahedron() for(int i=0; i<4; ++i) { -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QStringList list = point_texts[i].split(QRegExp("\\s+"), QString::SkipEmptyParts); -#else - QStringList list = point_texts[i].split(QRegExp("\\s+"), Qt::SkipEmptyParts); -#endif + QStringList list = point_texts[i].split(QRegExp("\\s+"), SkipEmptyParts); if (list.isEmpty()) return; if (list.size()!=3){ QMessageBox *msgBox = new QMessageBox; @@ -646,11 +623,7 @@ void Basic_generator_plugin::generatePoints() { QString text = dock_widget->point_textEdit->toPlainText(); Scene_points_with_normal_item* item = new Scene_points_with_normal_item(); -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QStringList list = text.split(QRegExp("\\s+"), QString::SkipEmptyParts); -#else - QStringList list = text.split(QRegExp("\\s+"), Qt::SkipEmptyParts); -#endif + QStringList list = text.split(QRegExp("\\s+"), SkipEmptyParts); int counter = 0; double coord[3]; bool ok = true; @@ -709,11 +682,7 @@ void Basic_generator_plugin::generateLines() std::vector& polyline = *(polylines.rbegin()); QStringList polylines_metadata; -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QStringList list = text.split(QRegExp("\\s+"), QString::SkipEmptyParts); -#else - QStringList list = text.split(QRegExp("\\s+"), Qt::SkipEmptyParts); -#endif + QStringList list = text.split(QRegExp("\\s+"), SkipEmptyParts); int counter = 0; double coord[3]; bool ok = true; @@ -813,11 +782,7 @@ void Basic_generator_plugin::generateGrid() bool triangulated = dock_widget->grid_checkBox->isChecked(); points_text= dock_widget->grid_lineEdit->text(); -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QStringList list = points_text.split(QRegExp("\\s+"), QString::SkipEmptyParts); -#else - QStringList list = points_text.split(QRegExp("\\s+"), Qt::SkipEmptyParts); -#endif + QStringList list = points_text.split(QRegExp("\\s+"), SkipEmptyParts); if (list.isEmpty()) return; if (list.size()!=6){ QMessageBox *msgBox = new QMessageBox; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp index dc8eff3084c..bfb6d3c4311 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp @@ -250,7 +250,7 @@ protected: case QEvent::Wheel: { QWheelEvent* event = static_cast(ev); QPointF old_pos = v->mapToScene(event->pos()); - if(event->delta() <0) + if(event->angleDelta().y() <0) v->scale(1.2, 1.2); else v->scale(0.8, 0.8); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Extrude_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Extrude_plugin.cpp index 1cb943cf4d6..308bd503d95 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Extrude_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Extrude_plugin.cpp @@ -116,7 +116,7 @@ public : if(event->type() == QEvent::Wheel && ctrl_pressing) { QWheelEvent *mouseEvent = static_cast(event); - int steps = mouseEvent->delta() / 120; + int steps = mouseEvent->angleDelta().y() / 120; if (steps > 0) length_+=tick; else diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_selection_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_selection_plugin.cpp index 7c81fbd6e23..59c7c2c9224 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_selection_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_selection_plugin.cpp @@ -708,7 +708,7 @@ protected: { QApplication::setOverrideCursor(Qt::WaitCursor); QWheelEvent *mouseEvent = static_cast(event); - int steps = mouseEvent->delta() / 120; + int steps = mouseEvent->angleDelta().y() / 120; if (steps > 0) neighborhood.point_set (point_set_item).expand(); else diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp index ba2a234e0fa..9883c1d376a 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp @@ -144,7 +144,7 @@ protected: case QEvent::Wheel: { QWheelEvent* event = static_cast(ev); QPointF old_pos = v->mapToScene(event->pos()); - if(event->delta() <0) + if(event->angleDelta().y() <0) v->scale(1.2, 1.2); else v->scale(0.8, 0.8); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.cpp b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.cpp index 48d85e15612..c6ab13f76f6 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Scene_edit_polyhedron_item.cpp @@ -885,7 +885,7 @@ bool Scene_edit_polyhedron_item::eventFilter(QObject* /*target*/, QEvent *event) &&d->state.shift_pressing) { QWheelEvent *w_event = static_cast(event); - int steps = w_event->delta() / 120; + int steps = w_event->angleDelta().y() / 120; d->expand_or_reduce(steps, d->sm_item->polyhedron()); } if(event->type() == QEvent::MouseButtonPress || event->type() == QEvent::MouseButtonRelease) diff --git a/Polyhedron/demo/Polyhedron/Viewer.cpp b/Polyhedron/demo/Polyhedron/Viewer.cpp index 0a41f43ea04..3b483fb9723 100644 --- a/Polyhedron/demo/Polyhedron/Viewer.cpp +++ b/Polyhedron/demo/Polyhedron/Viewer.cpp @@ -852,11 +852,7 @@ void Viewer::postSelection(const QPoint& pixel) } bool CGAL::Three::Viewer_interface::readFrame(QString s, CGAL::qglviewer::Frame& frame) { -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QStringList list = s.split(" ", QString::SkipEmptyParts); -#else - QStringList list = s.split(" ", ::Qt::SkipEmptyParts); -#endif + QStringList list = s.split(" ", SkipEmptyParts); if(list.size() != 7) return false; float vec[3]; @@ -1785,11 +1781,7 @@ void Viewer::setLighting() connect(dialog->position_lineEdit, &QLineEdit::editingFinished, [this, dialog]() { -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QStringList list = dialog->position_lineEdit->text().split(QRegExp(","), QString::SkipEmptyParts); -#else - QStringList list = dialog->position_lineEdit->text().split(QRegExp(","), Qt::SkipEmptyParts); -#endif + QStringList list = dialog->position_lineEdit->text().split(QRegExp(","), SkipEmptyParts); if (list.isEmpty()) return; if (list.size()!=3){ QMessageBox *msgBox = new QMessageBox; diff --git a/Three/include/CGAL/Three/Three.h b/Three/include/CGAL/Three/Three.h index 38b2ac8ea7d..70c040edffd 100644 --- a/Three/include/CGAL/Three/Three.h +++ b/Three/include/CGAL/Three/Three.h @@ -29,8 +29,15 @@ # define THREE_EXPORT Q_DECL_IMPORT #endif +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) +#define SkipEmptyParts QString::SkipEmptyParts +#else +#define SkipEmptyParts ::Qt::SkipEmptyParts +#endif + namespace CGAL{ namespace Three{ +//define enum depending on Qt version class Polyhedron_demo_plugin_interface; class THREE_EXPORT Three{ public: From b4bba7f034c6dffb2d5336550de051d22cc883f0 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Mon, 15 Jun 2020 08:58:13 +0200 Subject: [PATCH 04/10] rename maccro --- Polyhedron/demo/Polyhedron/MainWindow.cpp | 2 +- .../Plugins/PCA/Basic_generator_plugin.cpp | 18 +++++++++--------- Polyhedron/demo/Polyhedron/Viewer.cpp | 4 ++-- Three/include/CGAL/Three/Three.h | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Polyhedron/demo/Polyhedron/MainWindow.cpp b/Polyhedron/demo/Polyhedron/MainWindow.cpp index 5a5ed733a40..ea61d6dc810 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow.cpp +++ b/Polyhedron/demo/Polyhedron/MainWindow.cpp @@ -771,7 +771,7 @@ void MainWindow::loadPlugins() qputenv("PATH", new_path); #endif Q_FOREACH (QString pluginsDir, - env_path.split(separator, SkipEmptyParts)) { + env_path.split(separator, CGAL_QT_SKIP_EMPTY_PARTS)) { QDir dir(pluginsDir); if(dir.isReadable()) plugins_directories << dir; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp index 02648fed359..672e4fb0f7a 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp @@ -351,7 +351,7 @@ void Basic_generator_plugin::generateCube() for(int i=0; i<8; ++i) { - QStringList list = point_texts[i].split(QRegExp("\\s+"), SkipEmptyParts); + QStringList list = point_texts[i].split(QRegExp("\\s+"), CGAL_QT_SKIP_EMPTY_PARTS); if (list.isEmpty()) return; if (list.size()!=3){ QMessageBox *msgBox = new QMessageBox; @@ -392,7 +392,7 @@ void Basic_generator_plugin::generateCube() else { QString text = dock_widget->extremaEdit->text(); - QStringList list = text.split(QRegExp("\\s+"), SkipEmptyParts); + QStringList list = text.split(QRegExp("\\s+"), CGAL_QT_SKIP_EMPTY_PARTS); if (list.isEmpty()) return; if (list.size()!=6){ QMessageBox *msgBox = new QMessageBox; @@ -443,7 +443,7 @@ void Basic_generator_plugin::generatePrism() bool is_closed = dock_widget->prismCheckBox->isChecked(); QString text = dock_widget->prism_lineEdit->text(); - QStringList list = text.split(QRegExp("\\s+"), SkipEmptyParts); + QStringList list = text.split(QRegExp("\\s+"), CGAL_QT_SKIP_EMPTY_PARTS); if (list.isEmpty()) return; if (list.size()!=3){ QMessageBox *msgBox = new QMessageBox; @@ -490,7 +490,7 @@ void Basic_generator_plugin::generatePyramid() bool is_closed = dock_widget->pyramidCheckBox->isChecked(); QString text = dock_widget->pyramid_lineEdit->text(); - QStringList list = text.split(QRegExp("\\s+"), SkipEmptyParts); + QStringList list = text.split(QRegExp("\\s+"), CGAL_QT_SKIP_EMPTY_PARTS); if (list.isEmpty()) return; if (list.size()!=3){ QMessageBox *msgBox = new QMessageBox; @@ -533,7 +533,7 @@ void Basic_generator_plugin::generateSphere() { int precision = dock_widget->SphereSpinBox->value(); QString text = dock_widget->center_radius_lineEdit->text(); - QStringList list = text.split(QRegExp("\\s+"), SkipEmptyParts); + QStringList list = text.split(QRegExp("\\s+"), CGAL_QT_SKIP_EMPTY_PARTS); if (list.isEmpty()) return; if (list.size()!=4){ QMessageBox *msgBox = new QMessageBox; @@ -582,7 +582,7 @@ void Basic_generator_plugin::generateTetrahedron() for(int i=0; i<4; ++i) { - QStringList list = point_texts[i].split(QRegExp("\\s+"), SkipEmptyParts); + QStringList list = point_texts[i].split(QRegExp("\\s+"), CGAL_QT_SKIP_EMPTY_PARTS); if (list.isEmpty()) return; if (list.size()!=3){ QMessageBox *msgBox = new QMessageBox; @@ -623,7 +623,7 @@ void Basic_generator_plugin::generatePoints() { QString text = dock_widget->point_textEdit->toPlainText(); Scene_points_with_normal_item* item = new Scene_points_with_normal_item(); - QStringList list = text.split(QRegExp("\\s+"), SkipEmptyParts); + QStringList list = text.split(QRegExp("\\s+"), CGAL_QT_SKIP_EMPTY_PARTS); int counter = 0; double coord[3]; bool ok = true; @@ -682,7 +682,7 @@ void Basic_generator_plugin::generateLines() std::vector& polyline = *(polylines.rbegin()); QStringList polylines_metadata; - QStringList list = text.split(QRegExp("\\s+"), SkipEmptyParts); + QStringList list = text.split(QRegExp("\\s+"), CGAL_QT_SKIP_EMPTY_PARTS); int counter = 0; double coord[3]; bool ok = true; @@ -782,7 +782,7 @@ void Basic_generator_plugin::generateGrid() bool triangulated = dock_widget->grid_checkBox->isChecked(); points_text= dock_widget->grid_lineEdit->text(); - QStringList list = points_text.split(QRegExp("\\s+"), SkipEmptyParts); + QStringList list = points_text.split(QRegExp("\\s+"), CGAL_QT_SKIP_EMPTY_PARTS); if (list.isEmpty()) return; if (list.size()!=6){ QMessageBox *msgBox = new QMessageBox; diff --git a/Polyhedron/demo/Polyhedron/Viewer.cpp b/Polyhedron/demo/Polyhedron/Viewer.cpp index 3b483fb9723..8c53251c18c 100644 --- a/Polyhedron/demo/Polyhedron/Viewer.cpp +++ b/Polyhedron/demo/Polyhedron/Viewer.cpp @@ -852,7 +852,7 @@ void Viewer::postSelection(const QPoint& pixel) } bool CGAL::Three::Viewer_interface::readFrame(QString s, CGAL::qglviewer::Frame& frame) { - QStringList list = s.split(" ", SkipEmptyParts); + QStringList list = s.split(" ", CGAL_QT_SKIP_EMPTY_PARTS); if(list.size() != 7) return false; float vec[3]; @@ -1781,7 +1781,7 @@ void Viewer::setLighting() connect(dialog->position_lineEdit, &QLineEdit::editingFinished, [this, dialog]() { - QStringList list = dialog->position_lineEdit->text().split(QRegExp(","), SkipEmptyParts); + QStringList list = dialog->position_lineEdit->text().split(QRegExp(","), CGAL_QT_SKIP_EMPTY_PARTS); if (list.isEmpty()) return; if (list.size()!=3){ QMessageBox *msgBox = new QMessageBox; diff --git a/Three/include/CGAL/Three/Three.h b/Three/include/CGAL/Three/Three.h index 70c040edffd..c62b32e13ca 100644 --- a/Three/include/CGAL/Three/Three.h +++ b/Three/include/CGAL/Three/Three.h @@ -30,9 +30,9 @@ #endif #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) -#define SkipEmptyParts QString::SkipEmptyParts +#define CGAL_QT_SKIP_EMPTY_PARTS QString::SkipEmptyParts #else -#define SkipEmptyParts ::Qt::SkipEmptyParts +#define CGAL_QT_SKIP_EMPTY_PARTS ::Qt::SkipEmptyParts #endif namespace CGAL{ From 08ce5f17a8823ff4c2d8710094d1e917fb6c036a Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Mon, 15 Jun 2020 10:37:58 +0200 Subject: [PATCH 05/10] Fix more warnings --- .../Optimal_transportation_reconstruction_2/glviewer.cpp | 2 +- .../demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp | 9 +++++++-- .../Plugins/Surface_mesh/Parameterization_plugin.cpp | 9 +++++++-- Surface_mesher/demo/Surface_mesher/values_list.cpp | 8 ++++++++ Triangulation_3/demo/Triangulation_3/Viewer.cpp | 6 +++--- 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/glviewer.cpp b/Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/glviewer.cpp index 64834832676..b459255eb2c 100644 --- a/Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/glviewer.cpp +++ b/Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/glviewer.cpp @@ -87,7 +87,7 @@ void GlViewer::paintGL() void GlViewer::wheelEvent(QWheelEvent *event) { if (!m_scene) return; - m_scale += 0.05 * (event->delta() / 120); + m_scale += 0.05 * (event->angleDelta().y() / 120); if (m_scale <= 0.0) m_scale = 0.0; update(); } diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp index bfb6d3c4311..757c72b6cc1 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Engrave_text_plugin.cpp @@ -249,12 +249,17 @@ protected: } case QEvent::Wheel: { QWheelEvent* event = static_cast(ev); - QPointF old_pos = v->mapToScene(event->pos()); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + QPoint pos = event->pos(); +#else + QPointF pos = event->position(); +#endif + QPointF old_pos = v->mapToScene(pos.x(), pos.y()); if(event->angleDelta().y() <0) v->scale(1.2, 1.2); else v->scale(0.8, 0.8); - QPointF new_pos = v->mapToScene(event->pos()); + QPointF new_pos = v->mapToScene(pos.x(), pos.y()); QPointF delta = new_pos - old_pos; v->translate(delta.x(), delta.y()); v->update(); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp index 9883c1d376a..eab69bce277 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp @@ -143,12 +143,17 @@ protected: } case QEvent::Wheel: { QWheelEvent* event = static_cast(ev); - QPointF old_pos = v->mapToScene(event->pos()); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + QPoint pos = event->pos(); +#else + QPointF pos = event->position(); +#endif + QPointF old_pos = v->mapToScene(pos.x(), pos.y()); if(event->angleDelta().y() <0) v->scale(1.2, 1.2); else v->scale(0.8, 0.8); - QPointF new_pos = v->mapToScene(event->pos()); + QPointF new_pos = v->mapToScene(pos.x(), pos.y()); QPointF delta = new_pos - old_pos; v->translate(delta.x(), delta.y()); v->update(); diff --git a/Surface_mesher/demo/Surface_mesher/values_list.cpp b/Surface_mesher/demo/Surface_mesher/values_list.cpp index f7b1805f18d..b2e8a41e86f 100644 --- a/Surface_mesher/demo/Surface_mesher/values_list.cpp +++ b/Surface_mesher/demo/Surface_mesher/values_list.cpp @@ -20,6 +20,9 @@ #include #include #include +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) +#include +#endif Values_delegate::Values_delegate(QWidget* parent) : QItemDelegate(parent) {} void Values_delegate::paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const @@ -240,7 +243,12 @@ void Values_list::addValue(const double i) newItem->setData(Value, Qt::CheckStateRole, Qt::Checked); newItem->setData(Value, Qt::DisplayRole, i); QStringList colors = QColor::colorNames(); +#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0) const int color_index = qrand() % colors.size(); +#else +const int color_index = QRandomGenerator::global()->generate() % colors.size(); +#endif + QColor color = QColor(colors[color_index]); newItem->setData(Color, Qt::DisplayRole, color); newItem->setData(Name, Qt::DisplayRole, ""); diff --git a/Triangulation_3/demo/Triangulation_3/Viewer.cpp b/Triangulation_3/demo/Triangulation_3/Viewer.cpp index b12a9304031..097aa3c2546 100644 --- a/Triangulation_3/demo/Triangulation_3/Viewer.cpp +++ b/Triangulation_3/demo/Triangulation_3/Viewer.cpp @@ -2151,7 +2151,7 @@ void Viewer::wheelEvent(QWheelEvent *event) // note: most mouse types work in steps of 15 degrees // positive value: rotate forwards away from the user; // negative value: rotate backwards toward the user. - m_fRadius += (event->delta()*1.f / m_iStep ); // inc-/decrease by 0.1 per step + m_fRadius += (event->angleDelta().y()*1.f / m_iStep ); // inc-/decrease by 0.1 per step if( m_fRadius < 0.1f ) m_fRadius = 0.1f; @@ -2166,7 +2166,7 @@ void Viewer::wheelEvent(QWheelEvent *event) // positive value: rotate forwards away from the user; // negative value: rotate backwards toward the user. float origR = m_fRadius; - m_fRadius += (event->delta()*1.f / m_iStep ); // inc-/decrease by 0.1 per step + m_fRadius += (event->angleDelta().y()*1.f / m_iStep ); // inc-/decrease by 0.1 per step if( m_fRadius < 0.1f ) m_fRadius = 0.1f; // update the new point and its conflict region @@ -2185,7 +2185,7 @@ void Viewer::wheelEvent(QWheelEvent *event) // resize the trackball when moving a point else if( m_curMode == MOVE && modifiers == Qt::SHIFT && m_isMoving ) { float origR = m_fRadius; - m_fRadius += (event->delta()*1.f / m_iStep ); // inc-/decrease by 0.1 per step + m_fRadius += (event->angleDelta().y()*1.f / m_iStep ); // inc-/decrease by 0.1 per step if( m_fRadius < 0.1f ) m_fRadius = 0.1f; origR = m_fRadius / origR; From 39d41664e6a188b4dcf4bace0bfd344924cec92d Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Mon, 15 Jun 2020 11:56:00 +0200 Subject: [PATCH 06/10] Fix addActionToMenu --- Polyhedron/demo/Polyhedron/MainWindow.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Polyhedron/demo/Polyhedron/MainWindow.cpp b/Polyhedron/demo/Polyhedron/MainWindow.cpp index ea61d6dc810..27d4717f955 100644 --- a/Polyhedron/demo/Polyhedron/MainWindow.cpp +++ b/Polyhedron/demo/Polyhedron/MainWindow.cpp @@ -410,20 +410,22 @@ MainWindow::MainWindow(const QStringList &keywords, bool verbose, QWidget* paren void addActionToMenu(QAction* action, QMenu* menu) { bool added = false; + QString atxt = action->text().remove("&"); + if(atxt.isEmpty()) + return; for(QAction* it : menu->actions()) { - QString atxt = action->text().remove("&"), - btxt = it->text().remove("&"); + QString btxt = it->text().remove("&"); int i = 0; - if(atxt.isEmpty() || btxt.isEmpty()) + if(btxt.isEmpty()) + { continue; + } while(i < atxt.size() && i < btxt.size() && atxt[i] == btxt[i]) ++i; - if(i == atxt.size() || i == btxt.size()) - continue; - bool res = (atxt[i] < btxt[i]); + bool res = (i == atxt.size() || i == btxt.size() || atxt[i] < btxt[i]); if (res) { menu->insertAction(it, action); From 722fa939274568e93f96cf0530fec42fd54efdf9 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Mon, 15 Jun 2020 16:05:49 +0200 Subject: [PATCH 07/10] More fixes --- .../demo/Arrangement_on_surface_2/NewTabDialog.cpp | 2 +- .../demo/Hyperbolic_triangulation_2/HDT2.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.cpp index cf40a748f04..189db51f5d5 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.cpp @@ -14,7 +14,7 @@ #include "ui_NewTabDialog.h" #include -NewTabDialog::NewTabDialog( QWidget* parent, Qt::WindowFlags f ) : +NewTabDialog::NewTabDialog( QWidget* parent, Qt::WindowFlags f = Qt::WindowType(0) ) : QDialog( parent, f ), ui( new Ui::NewTabDialog ), buttonGroup( new QButtonGroup ) diff --git a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/HDT2.cpp b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/HDT2.cpp index ccfb1d72a8e..9fbb9e6d730 100644 --- a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/HDT2.cpp +++ b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/HDT2.cpp @@ -207,7 +207,7 @@ MainWindow::MainWindow() this->graphicsView->shear(230, 230); // Turn the vertical axis upside down - this->graphicsView->matrix().scale(1, -1); + this->graphicsView->transform().scale(1, -1); // The navigation adds zooming and translation functionality to the // QGraphicsView From 5976ee98e9bbc99798478fc1e286388400524b4a Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Tue, 16 Jun 2020 09:06:34 +0200 Subject: [PATCH 08/10] Fix Arrangement_2_demo --- .../demo/Arrangement_on_surface_2/NewTabDialog.cpp | 2 +- .../demo/Arrangement_on_surface_2/NewTabDialog.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.cpp index 189db51f5d5..f0daef178fc 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.cpp @@ -14,7 +14,7 @@ #include "ui_NewTabDialog.h" #include -NewTabDialog::NewTabDialog( QWidget* parent, Qt::WindowFlags f = Qt::WindowType(0) ) : +NewTabDialog::NewTabDialog( QWidget* parent, Qt::WindowFlags f) : QDialog( parent, f ), ui( new Ui::NewTabDialog ), buttonGroup( new QButtonGroup ) diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.h index 2121d5daac2..679f30a7887 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/NewTabDialog.h @@ -23,7 +23,7 @@ namespace Ui class NewTabDialog : public QDialog { public: - NewTabDialog( QWidget* parent = 0, Qt::WindowFlags f = 0 ); + NewTabDialog( QWidget* parent = 0, Qt::WindowFlags f = Qt::WindowType(0) ); int checkedId( ) const; protected: From 3003fb308f8e7ce335f67df842d6213e77661f50 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Thu, 18 Jun 2020 13:35:40 +0200 Subject: [PATCH 09/10] More flags warnings --- .../Arrangement_on_surface_2/ArrangementDemoPropertiesDialog.h | 2 +- .../demo/Arrangement_on_surface_2/OverlayDialog.h | 2 +- Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/UVProjector.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoPropertiesDialog.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoPropertiesDialog.h index 4e20f9c7835..dd6158edd48 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoPropertiesDialog.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoPropertiesDialog.h @@ -43,7 +43,7 @@ class ArrangementDemoPropertiesDialog : public QDialog }; ArrangementDemoPropertiesDialog( ArrangementDemoWindow* parent_ = 0, - Qt::WindowFlags f = 0 ); + Qt::WindowFlags f = Qt::WindowType(0)); QVariant property( int index ); protected: diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/OverlayDialog.h b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/OverlayDialog.h index fc80dc35336..fb1c45ea1bb 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/OverlayDialog.h +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/OverlayDialog.h @@ -29,7 +29,7 @@ class OverlayDialog : public QDialog ARRANGEMENT = 32 } OverlayDialogRole; - OverlayDialog( ArrangementDemoWindow* parent, Qt::WindowFlags f = 0 ); + OverlayDialog( ArrangementDemoWindow* parent, Qt::WindowFlags f = Qt::WindowType(0) ); std::vector< CGAL::Object > selectedArrangements( ) const; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/UVProjector.h b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/UVProjector.h index 6a726c8db90..45bb627538c 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/UVProjector.h +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/UVProjector.h @@ -23,7 +23,7 @@ struct State{ class UVProjector:public QWidget { public: - UVProjector(QWidget* parent = 0, Qt::WindowFlags flags =0) + UVProjector(QWidget* parent = 0, Qt::WindowFlags flags = Qt::WindowType(0)) :QWidget(parent,flags) { setMouseTracking(true); From cfc907e6a320e621fc6ff611a30f960884da205c Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 19 Jun 2020 15:14:21 +0200 Subject: [PATCH 10/10] More fixes --- .../Arrangement_on_surface_2/ArrangementDemoGraphicsView.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoGraphicsView.cpp b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoGraphicsView.cpp index 050a97e81df..cc08513c55b 100644 --- a/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoGraphicsView.cpp +++ b/Arrangement_on_surface_2/demo/Arrangement_on_surface_2/ArrangementDemoGraphicsView.cpp @@ -22,8 +22,8 @@ ArrangementDemoGraphicsView::ArrangementDemoGraphicsView( QWidget* parent ) : gridColor( ::Qt::black ), backgroundColor( ::Qt::white ) { - QMatrix m( 1.0, 0.0, 0.0, -1.0, 0.0, 0.0 ); - this->setMatrix( m ); + QTransform m( 1.0, 0.0, 0.0, -1.0, 0.0, 0.0 ); + this->setTransform( m ); this->setBackgroundBrush( QBrush( backgroundColor ) ); }