Mercurial > hg > orthanc-stone

diff Framework/Layers/CircleMeasureTracker.h @ 365:ef31240a73f6 am-2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
no automatic call to moc and uic, CircleMeasureTracker using Orthanc fonts
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 31 Oct 2018 18:10:29 +0100
parents 50e5ec1bdd46
children b70e9be013e4
line wrap: on
line diff
--- a/Framework/Layers/CircleMeasureTracker.h	Wed Oct 31 11:06:25 2018 +0100
+++ b/Framework/Layers/CircleMeasureTracker.h	Wed Oct 31 18:10:29 2018 +0100
@@ -26,19 +26,21 @@
 #include "../Viewport/IStatusBar.h"
 #include "../Toolbox/CoordinateSystem3D.h"
 
+#include <Core/Images/Font.h>
+
 namespace OrthancStone
 {
   class CircleMeasureTracker : public IWorldSceneMouseTracker
   {
   private:
-    IStatusBar*         statusBar_;
-    CoordinateSystem3D  slice_;
-    double              x1_;
-    double              y1_;
-    double              x2_;
-    double              y2_;
-    uint8_t             color_[3];
-    unsigned int        fontSize_;
+    IStatusBar*           statusBar_;
+    CoordinateSystem3D    slice_;
+    double                x1_;
+    double                y1_;
+    double                x2_;
+    double                y2_;
+    uint8_t               color_[3];
+    const Orthanc::Font&  font_;
 
   public:
     CircleMeasureTracker(IStatusBar* statusBar,
@@ -48,7 +50,7 @@
                          uint8_t red,
                          uint8_t green,
                          uint8_t blue,
-                         unsigned int fontSize);
+                         const Orthanc::Font& font);
     
     virtual bool HasRender() const
     {