remove some unused multisampling code

JamesMcCrae · Dec 15, 2024 · 5f988d1 · 5f988d1
1 parent 4251eca
commit 5f988d1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 30 deletions.
diff --git a/include/mainwindow.h b/include/mainwindow.h
@@ -164,10 +164,7 @@ private slots:
     QAction *viewTemplatesAct;
     QAction *testCyclesAct;
     QAction *testConnectedAct;
-    QAction *testStabilityAct;
-    QAction *multisample0Act;
-    QAction *multisample4Act;
-    QAction *multisample16Act;
+    QAction *testStabilityAct;    
 
     QMenu *generateMenu;
     QAction *generateBranchingSetRootAct;

diff --git a/src/main.cpp b/src/main.cpp
@@ -2,7 +2,10 @@
 #include <QApplication>
 
 int main(int argc, char *argv[])
-{
+{    
+    QApplication a(argc, argv);
+
+    // Setting up Multi-sampling
     int aa_samples = 16;
 
     if (argc > 1) {
@@ -17,9 +20,6 @@ int main(int argc, char *argv[])
         }
     }
 
-    QApplication a(argc, argv);
-
-    // Setting up Multi-sampling
     QGLFormat glf = QGLFormat::defaultFormat();
     glf.setSampleBuffers(aa_samples > 0);
     glf.setSamples(aa_samples);

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -542,28 +542,7 @@ void MainWindow::createActions()
     testStabilityAct->setCheckable(true);
     testStabilityAct->setChecked(glWidget.GetDoStabilityTest());
     connect(testStabilityAct, SIGNAL(triggered()), this,
-            SLOT(ToggleStabilityTest()));
-
-    multisample0Act = new QAction(tr("No Multisamping"), this);
-    multisample0Act->setStatusTip(tr("Show stability of the model."));
-    multisample0Act->setCheckable(true);
-    multisample0Act->setChecked(glWidget.GetDoStabilityTest());
-    connect(multisample0Act, SIGNAL(triggered()), this,
-            SLOT(SetMultisampling0()));
-
-    multisample4Act = new QAction(tr("4x Multisamping"), this);
-    multisample4Act->setStatusTip(tr("Show stability of the model."));
-    multisample4Act->setCheckable(true);
-    multisample4Act->setChecked(glWidget.GetDoStabilityTest());
-    connect(multisample4Act, SIGNAL(triggered()), this,
-            SLOT(SetMultisampling4()));
-
-    multisample16Act = new QAction(tr("16x Multisamping"), this);
-    multisample16Act->setStatusTip(tr("Show stability of the model."));
-    multisample16Act->setCheckable(true);
-    multisample16Act->setChecked(glWidget.GetDoStabilityTest());
-    connect(multisample16Act, SIGNAL(triggered()), this,
-            SLOT(SetMultisampling16()));
+            SLOT(ToggleStabilityTest()));   
 
     // generate menu actions
     generateBranchingSetRootAct =