songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove the "Use OpenGL" option from 2D demos

This commit is contained in:
Laurent Rineau 2023-09-13 14:59:10 +02:00
parent cf1b5fd46a
commit 4b3279e665
2 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GraphicsView/include/CGAL/Qt/DemosMainWindow.h
View File

@ -89,7 +89,6 @@ protected:
protected Q_SLOTS: protected Q_SLOTS:
void setUseAntialiasing(bool checked); void setUseAntialiasing(bool checked);
void setUseOpenGL(bool checked);
void popupAboutCGAL(); void popupAboutCGAL();
void popupAboutDemo(); void popupAboutDemo();
@ -108,7 +107,6 @@ protected:
GraphicsViewNavigation* navigation; GraphicsViewNavigation* navigation;
QLabel* xycoord ; QLabel* xycoord ;
QAction *actionUse_OpenGL;
QAction *actionUse_Antialiasing; QAction *actionUse_Antialiasing;
QAction *actionAbout; QAction *actionAbout;
QAction *actionAboutCGAL; QAction *actionAboutCGAL;

40
GraphicsView/include/CGAL/Qt/DemosMainWindow_impl.h
View File

@ -32,7 +32,6 @@
#include <QMessageBox> #include <QMessageBox>
#include <QStatusBar> #include <QStatusBar>
#include <QGraphicsView> #include <QGraphicsView>
#include <QOpenGLWidget>
#include <QTextStream> #include <QTextStream>
#include <QSettings> #include <QSettings>
#include <QUrl> #include <QUrl>
@ -41,7 +40,6 @@
# include <QSvgGenerator> # include <QSvgGenerator>
#endif #endif
#include <QtCore> #include <QtCore>
#include <QtOpenGL>
#include <CGAL/config.h> // needed to get CGAL_VERSION_STR #include <CGAL/config.h> // needed to get CGAL_VERSION_STR
#include <CGAL/Qt/DemosMainWindow.h> #include <CGAL/Qt/DemosMainWindow.h>
@ -62,13 +60,6 @@ DemosMainWindow::DemosMainWindow(QWidget * parent, ::Qt::WindowFlags flags)
xycoord->setMinimumSize(xycoord->sizeHint()); xycoord->setMinimumSize(xycoord->sizeHint());
xycoord->clear(); 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 = new QAction(this);
actionUse_Antialiasing->setObjectName("actionUse_Antialiasing"); actionUse_Antialiasing->setObjectName("actionUse_Antialiasing");
actionUse_Antialiasing->setCheckable(true); actionUse_Antialiasing->setCheckable(true);
@ -151,12 +142,9 @@ DemosMainWindow::setupOptionsMenu(QMenu* menuOptions)
if(!menuOptions->isEmpty()) { if(!menuOptions->isEmpty()) {
menuOptions->addSeparator(); menuOptions->addSeparator();
} }
menuOptions->addAction(actionUse_OpenGL);
menuOptions->addAction(actionUse_Antialiasing); menuOptions->addAction(actionUse_Antialiasing);
connect(actionUse_Antialiasing, SIGNAL(toggled(bool)), connect(actionUse_Antialiasing, SIGNAL(toggled(bool)),
this, SLOT(setUseAntialiasing(bool))); this, SLOT(setUseAntialiasing(bool)));
connect(actionUse_OpenGL, SIGNAL(toggled(bool)),
this, SLOT(setUseOpenGL(bool)));
actionUse_Antialiasing->setChecked(true); actionUse_Antialiasing->setChecked(true);
} }
@ -203,34 +191,6 @@ DemosMainWindow::setUseAntialiasing(bool checked)
1000); 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 CGAL_INLINE_FUNCTION
QMenu* QMenu*
DemosMainWindow::getMenu(QString objectName, QString title) DemosMainWindow::getMenu(QString objectName, QString title)