Revert "Some minor cleaning up."

This reverts commit 499dc2d.
opencor · Aug 12, 2020 · 5fab065 · 5fab065
1 parent 50e244c
commit 5fab065
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/plugins/simulation/PendulumWindow/src/pendulumwindowwindow.cpp b/src/plugins/simulation/PendulumWindow/src/pendulumwindowwindow.cpp
@@ -66,6 +66,7 @@ PendulumWindowWindow::PendulumWindowWindow(QWidget *pParent) :
     mGui(new Ui::PendulumWindowWindow),
     mZincContext(nullptr),
     mZincSceneViewerDescription(nullptr),
+    mAxesFontPointSize(0),
     mInitialiseZincScene(true),
     mCurrentDataSize(0),
     mTimeValues(nullptr),
@@ -85,6 +86,8 @@ PendulumWindowWindow::PendulumWindowWindow(QWidget *pParent) :
             this, &PendulumWindowWindow::createAndSetZincContext);
     connect(mZincWidget, &ZincWidget::ZincWidget::graphicsInitialized,
             this, &PendulumWindowWindow::graphicsInitialized);
+    connect(mZincWidget, &ZincWidget::ZincWidget::devicePixelRatioChanged,
+            this, &PendulumWindowWindow::devicePixelRatioChanged);
 
     mGui->layout->addWidget(new Core::BorderedWidget(mZincWidget,
                                                      true, true, true, true));
@@ -538,6 +541,19 @@ void PendulumWindowWindow::graphicsInitialized()
 
 //==============================================================================
 
+void PendulumWindowWindow::devicePixelRatioChanged(int pDevicePixelRatio)
+{
+    // Update our scene using the given devide pixel ratio
+
+    OpenCMISS::Zinc::Scene scene = mZincContext->getDefaultRegion().getScene();
+
+    scene.beginChange();
+        scene.createGraphicsPoints().getGraphicspointattributes().getFont().setPointSize(pDevicePixelRatio*mAxesFontPointSize);
+    scene.endChange();
+}
+
+//==============================================================================
+
 void PendulumWindowWindow::timeSliderValueChanged(int pTime)
 {
     // Update our scene

diff --git a/src/plugins/simulation/PendulumWindow/src/pendulumwindowwindow.h b/src/plugins/simulation/PendulumWindow/src/pendulumwindowwindow.h
@@ -125,6 +125,7 @@ class PENDULUMWINDOW_EXPORT PendulumWindowWindow : public Core::WindowWidget
 private slots:
     void createAndSetZincContext();
     void graphicsInitialized();
+    void devicePixelRatioChanged(int pDevicePixelRatio);
 
     void timeSliderValueChanged(int pTime);
     void timerTimeOut();

diff --git a/src/plugins/test/ZincWindow/src/zincwindowwindow.h b/src/plugins/test/ZincWindow/src/zincwindowwindow.h
@@ -75,6 +75,8 @@ class ZincWindowWindow : public Core::WindowWidget
 
     char *mZincSceneViewerDescription = nullptr;
 
+    int mAxesFontPointSize = 0;
+
 private slots:
     void createAndSetZincContext();
     void graphicsInitialized();