comparison 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
comparison
equal deleted inserted replaced
364:aad2f9293089 365:ef31240a73f6
38 38
39 #if ORTHANC_ENABLE_QT==1 39 #if ORTHANC_ENABLE_QT==1
40 #include "Qt/SimpleViewerMainWindow.h" 40 #include "Qt/SimpleViewerMainWindow.h"
41 #endif 41 #endif
42 42
43 #include <Core/Images/Font.h>
43 #include <Core/Logging.h> 44 #include <Core/Logging.h>
44 45
45 #include "ThumbnailInteractor.h" 46 #include "ThumbnailInteractor.h"
46 #include "MainWidgetInteractor.h" 47 #include "MainWidgetInteractor.h"
47 #include "AppStatus.h" 48 #include "AppStatus.h"
92 std::unique_ptr<ThumbnailInteractor> thumbnailInteractor_; 93 std::unique_ptr<ThumbnailInteractor> thumbnailInteractor_;
93 LayoutWidget* mainLayout_; 94 LayoutWidget* mainLayout_;
94 LayoutWidget* thumbnailsLayout_; 95 LayoutWidget* thumbnailsLayout_;
95 LayerWidget* mainWidget_; 96 LayerWidget* mainWidget_;
96 std::vector<LayerWidget*> thumbnails_; 97 std::vector<LayerWidget*> thumbnails_;
97 std::map<std::string, std::vector<std::string>> instancesIdsPerSeriesId_; 98 std::map<std::string, std::vector<std::string> > instancesIdsPerSeriesId_;
98 std::map<std::string, Json::Value> seriesTags_; 99 std::map<std::string, Json::Value> seriesTags_;
99 BaseCommandBuilder commandBuilder_; 100 BaseCommandBuilder commandBuilder_;
100 101
101 unsigned int currentInstanceIndex_; 102 unsigned int currentInstanceIndex_;
102 OrthancStone::WidgetViewport* wasmViewport1_; 103 OrthancStone::WidgetViewport* wasmViewport1_;
104 105
105 IStatusBar* statusBar_; 106 IStatusBar* statusBar_;
106 std::unique_ptr<SmartLoader> smartLoader_; 107 std::unique_ptr<SmartLoader> smartLoader_;
107 std::unique_ptr<OrthancApiClient> orthancApiClient_; 108 std::unique_ptr<OrthancApiClient> orthancApiClient_;
108 109
110 Orthanc::Font font_;
111
109 public: 112 public:
110 SimpleViewerApplication(MessageBroker& broker) : 113 SimpleViewerApplication(MessageBroker& broker) :
111 IObserver(broker), 114 IObserver(broker),
112 IObservable(broker), 115 IObservable(broker),
113 currentTool_(Tools_LineMeasure), 116 currentTool_(Tools_LineMeasure),
114 mainLayout_(NULL), 117 mainLayout_(NULL),
115 currentInstanceIndex_(0), 118 currentInstanceIndex_(0),
116 wasmViewport1_(NULL), 119 wasmViewport1_(NULL),
117 wasmViewport2_(NULL) 120 wasmViewport2_(NULL)
118 { 121 {
122 font_.LoadFromResource(Orthanc::EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16);
119 } 123 }
120 124
121 virtual void Finalize() {} 125 virtual void Finalize() {}
122 virtual IWidget* GetCentralWidget() {return mainLayout_;} 126 virtual IWidget* GetCentralWidget() {return mainLayout_;}
123 127
139 void OnWidgetGeometryChanged(const LayerWidget::GeometryChangedMessage& message); 143 void OnWidgetGeometryChanged(const LayerWidget::GeometryChangedMessage& message);
140 144
141 void SelectSeriesInMainViewport(const std::string& seriesId); 145 void SelectSeriesInMainViewport(const std::string& seriesId);
142 146
143 void SelectTool(Tools tool); 147 void SelectTool(Tools tool);
144 Tools GetCurrentTool() const {return currentTool_;} 148
149 Tools GetCurrentTool() const
150 {
151 return currentTool_;
152 }
153
154 const Orthanc::Font& GetFont() const
155 {
156 return font_;
157 }
145 158
146 void ExecuteAction(Actions action); 159 void ExecuteAction(Actions action);
147 160
148 virtual std::string GetTitle() const {return "SimpleViewer";} 161 virtual std::string GetTitle() const {return "SimpleViewer";}
149 virtual void ExecuteCommand(ICommand& command); 162 virtual void ExecuteCommand(ICommand& command);