diff --git a/GraphicsView/include/CGAL/Qt/DemosMainWindow.h b/GraphicsView/include/CGAL/Qt/DemosMainWindow.h index d28d98b3718..8f71f6bf117 100644 --- a/GraphicsView/include/CGAL/Qt/DemosMainWindow.h +++ b/GraphicsView/include/CGAL/Qt/DemosMainWindow.h @@ -89,7 +89,6 @@ protected: protected Q_SLOTS: void setUseAntialiasing(bool checked); - void setUseOpenGL(bool checked); void popupAboutCGAL(); void popupAboutDemo(); @@ -108,7 +107,6 @@ protected: GraphicsViewNavigation* navigation; QLabel* xycoord ; - QAction *actionUse_OpenGL; QAction *actionUse_Antialiasing; QAction *actionAbout; QAction *actionAboutCGAL; diff --git a/GraphicsView/include/CGAL/Qt/DemosMainWindow_impl.h b/GraphicsView/include/CGAL/Qt/DemosMainWindow_impl.h index 8b6cb174703..5f8c85c1d7f 100644 --- a/GraphicsView/include/CGAL/Qt/DemosMainWindow_impl.h +++ b/GraphicsView/include/CGAL/Qt/DemosMainWindow_impl.h @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -41,7 +40,6 @@ # include #endif #include -#include #include // needed to get CGAL_VERSION_STR #include @@ -62,13 +60,6 @@ DemosMainWindow::DemosMainWindow(QWidget * parent, ::Qt::WindowFlags flags) xycoord->setMinimumSize(xycoord->sizeHint()); xycoord->clear(); - actionUse_OpenGL = new QAction(this); - actionUse_OpenGL->setObjectName("actionUse_OpenGL"); - actionUse_OpenGL->setCheckable(true); - actionUse_OpenGL->setText(tr("Use &OpenGL")); - actionUse_OpenGL->setStatusTip(tr("Make Qt use OpenGL to display the graphical items, instead of its native painting system.")); - actionUse_OpenGL->setShortcut(tr("Ctrl+G")); - actionUse_Antialiasing = new QAction(this); actionUse_Antialiasing->setObjectName("actionUse_Antialiasing"); actionUse_Antialiasing->setCheckable(true); @@ -151,12 +142,9 @@ DemosMainWindow::setupOptionsMenu(QMenu* menuOptions) if(!menuOptions->isEmpty()) { menuOptions->addSeparator(); } - menuOptions->addAction(actionUse_OpenGL); menuOptions->addAction(actionUse_Antialiasing); connect(actionUse_Antialiasing, SIGNAL(toggled(bool)), this, SLOT(setUseAntialiasing(bool))); - connect(actionUse_OpenGL, SIGNAL(toggled(bool)), - this, SLOT(setUseOpenGL(bool))); actionUse_Antialiasing->setChecked(true); } @@ -203,34 +191,6 @@ DemosMainWindow::setUseAntialiasing(bool checked) 1000); } -CGAL_INLINE_FUNCTION -void -DemosMainWindow::setUseOpenGL(bool checked) -{ - if(checked) { - QOpenGLWidget* new_viewport = new QOpenGLWidget(this); - new_viewport->setUpdateBehavior(QOpenGLWidget::NoPartialUpdate); - - // Setup the format to allow antialiasing with OpenGL: - // one need to activate the SampleBuffers, if the graphic driver allows - // this. - auto glformat = new_viewport->format(); - glformat.setSamples(4); - new_viewport->setFormat(glformat); - - view->setViewport(new_viewport); - view->setViewportUpdateMode(QGraphicsView::FullViewportUpdate); - } - else { - view->setViewport(new QWidget(this)); - view->setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate); - } - statusBar()->showMessage(tr("OpenGL %1activated").arg(checked?"":"de-"), - 1000); - view->viewport()->installEventFilter(navigation); - view->setFocus(); -} - CGAL_INLINE_FUNCTION QMenu* DemosMainWindow::getMenu(QString objectName, QString title)