Major re-jigging of the Scale Grid (part deux)

- Added option to turn on/off minor scale grid lines. - Added font size option. 7 preset font sizes availble. - Added a SG reset option to set everything back to SPIERSview defaults. - Updated SPV file version from 10 to 11, which now saves all SG options and restores them on load (including whether the SG was turned on/off at time of save). I've run on of ideas for how to improve this feature now! It now does everything I wnat it too, and a bit more, hopefully all these new option will allow enough customization to make the SG useful at all scales and in all situations.
palaeoware · Nov 8, 2018 · 3fd02ce · 3fd02ce
1 parent e6c2ca7
commit 3fd02ce
Show file tree

Hide file tree

Showing 15 changed files with 1,092 additions and 601 deletions.
diff --git a/SPIERSview/SPIERSview.pro b/SPIERSview/SPIERSview.pro
@@ -262,7 +262,8 @@ SOURCES += src/main.cpp \
     src/spvwriter.cpp \
     src/staticfunctions.cpp \
     src/drawglscalegrid.cpp \
-    src/drawglscaleball.cpp
+    src/drawglscaleball.cpp \
+    src/gridfontsizedialog.cpp
 
 HEADERS += src/mainwindow.h \
     ../SPIERScommon/src/darkstyletheme.h \
@@ -291,9 +292,11 @@ HEADERS += src/mainwindow.h \
     src/spvwriter.h \
     src/staticfunctions.h \
     src/drawglscalegrid.h \
-    src/drawglscaleball.h
+    src/drawglscaleball.h \
+    src/gridfontsizedialog.h
 
 FORMS += ui/mainwindow.ui \
     ui/movetogroup.ui \
     ui/quickhelpbox.ui \
-    ui/aboutdialog.ui
+    ui/aboutdialog.ui \
+    ui/gridfontsizedialog.ui
diff --git a/SPIERSview/src/drawglscalegrid.cpp b/SPIERSview/src/drawglscalegrid.cpp
diff --git a/SPIERSview/src/drawglscalegrid.h b/SPIERSview/src/drawglscalegrid.h
@@ -19,10 +19,13 @@ class DrawGLScaleGrid
 
 private:
     int numOccVertices;
+    int currentFontScale;
+
+    // We need a set of these for each of the 6 font sizes available
+    GLfloat CharacterWidths[7][15] ; //widths of these characters
+    GLfloat CharacterLineCounts[7][15] ; //widths of these characters
+    QOpenGLBuffer VBOcharacters[7][15] ; //0-9 are digits 0-9, 10 is -, 11 is ., 12 is m, 13 is u, 14 = c
 
-    GLfloat CharacterWidths[15]; //widths of these characters
-    GLfloat CharacterLineCounts[15]; //widths of these characters
-    QOpenGLBuffer VBOcharacters[15]; //0-9 are digits 0-9, 10 is -, 11 is ., 12 is m, 13 is u
     QOpenGLBuffer VBOline;
     QOpenGLBuffer occBuffer;
     QMatrix4x4 scaleMatrix; //Manipulations to scale ball

diff --git a/SPIERSview/src/gl3widget.cpp b/SPIERSview/src/gl3widget.cpp
@@ -180,6 +180,11 @@ void GlWidget::DrawObjects(bool rightview, bool halfsize)
             glfunctions->glDisable(GL_BLEND);
         }
         for (int i = 0; i < SVObjects.count(); i++)
+        {
+
+            // We must have a file load by this point so set the global to true.
+            isFileLoaded = true;
+
             if (!(SVObjects[i]->IsGroup))
                 if (CanISee(i))
                 {
@@ -313,6 +318,7 @@ void GlWidget::DrawObjects(bool rightview, bool halfsize)
                         useshader->release();
                     }
                 }
+        }
     }
     glfunctions->glDepthMask(true);
 

diff --git a/SPIERSview/src/globals.cpp b/SPIERSview/src/globals.cpp
@@ -10,7 +10,10 @@ bool containsPresurfaced = false;
 bool containsNonPresurfaced = false;
 bool isFirstObject;
 bool isVaxmlMode;
+bool showScaleGrid = false;
 bool showMinorGridValues = false;
+bool showMinorGridLines = true;
+bool isFileLoaded = false;
 
 double applicationScaleX;
 double applicationScaleY;
@@ -47,6 +50,7 @@ int modelKTr;
 int nextActualDlist = 1;
 int totalTriangles = 0;
 int scaleBallColour[3]; //info stuff
+int fontSizeGrid = 3;
 
 QList<QScreen *> availableScreens;
 QOpenGLBuffer cubeBuffer;

diff --git a/SPIERSview/src/globals.h b/SPIERSview/src/globals.h
@@ -37,11 +37,12 @@ class MainWindow;
 #define SENSITIVITY 5
 #define SPINTIMERINTERVAL 10
 #define SPINRATE .02
-#define SPVFILEVERSION 10
+#define SPVFILEVERSION 11
 #define GL_MAJOR 2
 #define GL_MINOR 1
 #define STEREO_SEPARATION_MODIFIER 15.0
 #define SHININESS 0.0
+#define FONT_SCALE_FACTOR 24.0 // Eqates to roughtly the same font size as the default used by the QT GUI
 
 // SPIERSview extrerns
 extern MainWindow *mainWindow;
@@ -54,7 +55,10 @@ extern bool containsPresurfaced;
 extern bool containsNonPresurfaced;
 extern bool isVaxmlMode;
 extern bool isFirstObject;
+extern bool showScaleGrid;
 extern bool showMinorGridValues;
+extern bool showMinorGridLines;
+extern bool isFileLoaded;
 
 extern double applicationScaleX;
 extern double applicationScaleY;
@@ -91,6 +95,7 @@ extern int colorGridMinorGreen;
 extern int colorGridMinorBlue;
 extern int scaleBallColour[3];
 extern int modelKTr;
+extern int fontSizeGrid;
 
 extern QList<QScreen *> availableScreens;
 extern QMatrix4x4 globalMatrix;

diff --git a/SPIERSview/src/gridfontsizedialog.cpp b/SPIERSview/src/gridfontsizedialog.cpp
@@ -0,0 +1,41 @@
+#include "gridfontsizedialog.h"
+#include "ui_gridfontsizedialog.h"
+
+/**
+ * @brief GridFontSizeDialog::GridFontSizeDialog
+ * @param parent
+ */
+GridFontSizeDialog::GridFontSizeDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::GridFontSizeDialog)
+{
+    ui->setupUi(this);
+
+    ui->comboBox->setCurrentIndex(fontSizeGrid);
+}
+
+/**
+ * @brief GridFontSizeDialog::~GridFontSizeDialog
+ */
+GridFontSizeDialog::~GridFontSizeDialog()
+{
+    delete ui;
+}
+
+/**
+ * @brief GridFontSizeDialog::on_buttonBox_accepted
+ */
+void GridFontSizeDialog::on_buttonBox_accepted()
+{
+    fontSizeGrid = ui->comboBox->currentIndex();
+
+    mainWindow->UpdateGL();
+}
+
+/**
+ * @brief GridFontSizeDialog::on_buttonBox_rejected
+ */
+void GridFontSizeDialog::on_buttonBox_rejected()
+{
+    return;
+}
diff --git a/SPIERSview/src/gridfontsizedialog.h b/SPIERSview/src/gridfontsizedialog.h
@@ -0,0 +1,28 @@
+#ifndef GRIDFONTSIZEDIALOG_H
+#define GRIDFONTSIZEDIALOG_H
+
+#include <QDialog>
+#include "mainwindow.h"
+
+namespace Ui {
+class GridFontSizeDialog;
+}
+
+class GridFontSizeDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit GridFontSizeDialog(QWidget *parent = nullptr);
+    ~GridFontSizeDialog();
+
+private slots:
+    void on_buttonBox_accepted();
+
+    void on_buttonBox_rejected();
+
+private:
+    Ui::GridFontSizeDialog *ui;
+};
+
+#endif // GRIDFONTSIZEDIALOG_H
diff --git a/SPIERSview/src/mainwindow.cpp b/SPIERSview/src/mainwindow.cpp
@@ -37,6 +37,7 @@
 #include "../SPIERScommon/src/netmodule.h"
 #include <vtkProperty2D.h>
 #include "movetogroup.h"
+#include "gridfontsizedialog.h"
 
 /**
  * @brief MainWindow::MainWindow
@@ -425,39 +426,56 @@ void MainWindow::SpinTimer_fired()
     Framenumbs.append(millisecs);
     if (Framenumbs.count() > 10)
     {
-        double tot = 0;
-        for (int i = 0; i < 10; i++)
-        {
-            tot += static_cast<double>(Framenumbs[i]);
-        }
-        tot /= 10; //tot is average ms
-        tot += 1;
-        int framerate = static_cast<int>(1000.0 / tot);
         QString message;
         QTextStream string(&message);
 
-        QString XrotS = DegConvert(rotationX);
-        QString YrotS = DegConvert(rotationY);
-        QString ZrotS = DegConvert(rotationZ);
+        // If there is a model loaded in the GL widget...
+        if (isFileLoaded)
+        {
+            double tot = 0;
+            for (int i = 0; i < 10; i++)
+            {
+                tot += static_cast<double>(Framenumbs[i]);
+            }
+            tot /= 10; //tot is average ms
+            tot += 1;
+            int framerate = static_cast<int>(1000.0 / tot);
 
-        QString XtransS = TransConvert(transformX);
-        QString YtransS = TransConvert(transformY);
-        QString ZtransS = TransConvert(transformZ);
 
-        string << "Frame rate: " << framerate;
-        string << "  Rotations: X = " << XrotS;
-        string << " Y = " << YrotS;
-        string << " Z = " << ZrotS;
-        string << "  Translations: X = " << XtransS;
-        string << " Y = " << YtransS;
-        string << " Z = " << ZtransS;
-        string << " FOV: " << gl3widget->getFOV() << "mm";
+            QString XrotS = DegConvert(rotationX);
+            QString YrotS = DegConvert(rotationY);
+            QString ZrotS = DegConvert(rotationZ);
+
+            QString XtransS = TransConvert(transformX);
+            QString YtransS = TransConvert(transformY);
+            QString ZtransS = TransConvert(transformZ);
+
+            string << "Frame rate: " << framerate;
+            string << "  Rotations: X = " << XrotS;
+            string << " Y = " << YrotS;
+            string << " Z = " << ZrotS;
+            string << "  Translations: X = " << XtransS;
+            string << " Y = " << YtransS;
+            string << " Z = " << ZtransS;
+            string << " FOV: " << gl3widget->getFOV() << "mm";
+        }
+        else
+        {
+            string << "Frame rate: 0";
+            string << "  Rotations: X = 000.0";
+            string << " Y = 000.0";
+            string << " Z = 000.0" ;
+            string << "  Translations: X = 00.0";
+            string << " Y = 00.0";
+            string << " Z = 00.0";
+            string << " FOV: 0.0mm";
+        }
 
         ui->statusBar->showMessage(message);//should be m
         Framenumbs.clear();
     }
 
-    //also a good place to recalc the width of output
+    // Also a good place to recalc the width of output
     int wheight = gl3widget->height();
     int wwidth = gl3widget->width();
 
@@ -527,14 +545,6 @@ void MainWindow::SpinTimer_fired()
     ktrlabel->setText(mess);
 }
 
-/**
- * @brief MainWindow::on_actionShow_Scale_Grid_triggered
- */
-void MainWindow::on_actionShow_Scale_Grid_triggered()
-{
-    UpdateGL();
-}
-
 /**
  * @brief MainWindow::on_ClipStart_valueChanged
  * @param clip
@@ -3972,6 +3982,23 @@ void MainWindow::on_actionFull_Screen_triggered()
     }
 }
 
+/**
+ * @brief MainWindow::on_actionShow_Scale_Grid_triggered
+ */
+void MainWindow::on_actionShow_Scale_Grid_triggered()
+{
+    if (ui->actionShow_Scale_Grid->isChecked())
+    {
+        showScaleGrid = true;
+    }
+    else
+    {
+        showScaleGrid = false;
+    }
+
+    UpdateGL();
+}
+
 /**
  * @brief MainWindow::on_actionShow_Minor_Values_triggered
  */
@@ -3988,3 +4015,58 @@ void MainWindow::on_actionShow_Minor_Values_triggered()
 
     UpdateGL();
 }
+
+/**
+ * @brief MainWindow::on_actionScale_Grid_Font_Size_triggered
+ */
+void MainWindow::on_actionScale_Grid_Font_Size_triggered()
+{
+    GridFontSizeDialog gridFontSizeDialog;
+    FilterKeys = false;
+    gridFontSizeDialog.exec();
+    FilterKeys = true;
+}
+
+/**
+ * @brief MainWindow::on_actionShow_Minor_Scale_Lines_triggered
+ */
+void MainWindow::on_actionShow_Minor_Scale_Lines_triggered()
+{
+    if (ui->actionShow_Minor_Scale_Lines->isChecked())
+    {
+        showMinorGridLines = true;
+    }
+    else
+    {
+        showMinorGridLines = false;
+    }
+
+    UpdateGL();
+}
+
+/**
+ * @brief MainWindow::on_actionReset_Scale_Grid_to_Defaults_triggered
+ */
+void MainWindow::on_actionReset_Scale_Grid_to_Defaults_triggered()
+{
+    // Reset minor gridline values show status
+    ui->actionShow_Minor_Values->setChecked(false);
+    showMinorGridValues = false;
+
+    // Reset minor gridline show status
+    ui->actionShow_Minor_Scale_Lines->setChecked(true);
+    showMinorGridLines = true;
+
+    // Reset gridline colors
+    colorGridRed = 255;
+    colorGridGreen = 255;
+    colorGridBlue = 255;
+    colorGridMinorRed = 168;
+    colorGridMinorGreen = 181;
+    colorGridMinorBlue = 212;
+
+    // Reset grid font size
+    fontSizeGrid = 3;
+
+    UpdateGL();
+}