diff Applications/Samples/SimpleViewer/SimpleViewerApplication.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 56b2e47d3c0c
children a8b5cf760473
line wrap: on
line diff
--- a/Applications/Samples/SimpleViewer/SimpleViewerApplication.h	Wed Oct 31 11:06:25 2018 +0100
+++ b/Applications/Samples/SimpleViewer/SimpleViewerApplication.h	Wed Oct 31 18:10:29 2018 +0100
@@ -40,6 +40,7 @@
 #include "Qt/SimpleViewerMainWindow.h"
 #endif
 
+#include <Core/Images/Font.h>
 #include <Core/Logging.h>
 
 #include "ThumbnailInteractor.h"
@@ -94,7 +95,7 @@
     LayoutWidget*                   thumbnailsLayout_;
     LayerWidget*                    mainWidget_;
     std::vector<LayerWidget*>       thumbnails_;
-    std::map<std::string, std::vector<std::string>> instancesIdsPerSeriesId_;
+    std::map<std::string, std::vector<std::string> > instancesIdsPerSeriesId_;
     std::map<std::string, Json::Value> seriesTags_;
     BaseCommandBuilder              commandBuilder_;
 
@@ -106,6 +107,8 @@
     std::unique_ptr<SmartLoader>    smartLoader_;
     std::unique_ptr<OrthancApiClient>      orthancApiClient_;
 
+    Orthanc::Font                   font_;
+
   public:
     SimpleViewerApplication(MessageBroker& broker) :
       IObserver(broker),
@@ -116,6 +119,7 @@
       wasmViewport1_(NULL),
       wasmViewport2_(NULL)
     {
+      font_.LoadFromResource(Orthanc::EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16);
     }
 
     virtual void Finalize() {}
@@ -141,7 +145,16 @@
     void SelectSeriesInMainViewport(const std::string& seriesId);
 
     void SelectTool(Tools tool);
-    Tools GetCurrentTool() const {return currentTool_;}
+    
+    Tools GetCurrentTool() const
+    {
+      return currentTool_;
+    }
+
+    const Orthanc::Font& GetFont() const
+    {
+      return font_;
+    }
 
     void ExecuteAction(Actions action);