diff Applications/Samples/SimpleViewerApplicationSingleFile.h @ 365:ef31240a73f6 am-2

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 885f0a5eaa49
children a7de01c8fd29
line wrap: on
line diff
--- a/Applications/Samples/SimpleViewerApplicationSingleFile.h	Wed Oct 31 11:06:25 2018 +0100
+++ b/Applications/Samples/SimpleViewerApplicationSingleFile.h	Wed Oct 31 18:10:29 2018 +0100
@@ -36,6 +36,7 @@
 #include "../../Platforms/Wasm/Defaults.h"
 #endif
 
+#include <Core/Images/Font.h>
 #include <Core/Logging.h>
 
 namespace OrthancStone
@@ -127,7 +128,8 @@
             }
             else if (application_.currentTool_ == Tools_CircleMeasure)
             {
-              return new CircleMeasureTracker(statusBar, dynamic_cast<LayerWidget&>(widget).GetSlice(), x, y, 255, 0, 0, 10);
+              return new CircleMeasureTracker(statusBar, dynamic_cast<LayerWidget&>(widget).GetSlice(),
+                                              x, y, 255, 0, 0, application_.GetFont());
             }
           }
           return NULL;
@@ -234,6 +236,8 @@
       std::auto_ptr<SmartLoader>           smartLoader_;
       std::auto_ptr<OrthancApiClient>      orthancApiClient_;
 
+      Orthanc::Font                        font_;
+
     public:
       SimpleViewerApplication(MessageBroker& broker) :
         IObserver(broker),
@@ -243,6 +247,7 @@
         wasmViewport1_(NULL),
         wasmViewport2_(NULL)
       {
+        font_.LoadFromResource(Orthanc::EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16);
 //        DeclareIgnoredMessage(MessageType_Widget_ContentChanged);
       }
 
@@ -390,6 +395,11 @@
         smartLoader_->SetFrameInWidget(widget, 0, instancesIdsPerSeriesId_[seriesId][0], 0);
       }
 
+      const Orthanc::Font& GetFont() const
+      {
+        return font_;
+      }
+      
       virtual void OnPushButton1Clicked() {}
       virtual void OnPushButton2Clicked() {}
       virtual void OnTool1Clicked() { currentTool_ = Tools_LineMeasure;}