Mercurial > hg > orthanc-stone
comparison Applications/Samples/SimpleViewerApplicationSingleFile.h @ 527:b1377625e4ba bgo-commands-codegen
Removed ICommand and friends + fixed warnings + added missing header files in
solution (in CMakeLists.txt file)
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Sun, 17 Mar 2019 20:14:20 +0100 |
parents | 700aa66f2f29 |
children | 79bb0a02d1cc |
comparison
equal
deleted
inserted
replaced
522:700aa66f2f29 | 527:b1377625e4ba |
---|---|
125 IStatusBar* statusBar, | 125 IStatusBar* statusBar, |
126 const std::vector<Touch>& displayTouches) | 126 const std::vector<Touch>& displayTouches) |
127 { | 127 { |
128 if (button == MouseButton_Left) | 128 if (button == MouseButton_Left) |
129 { | 129 { |
130 if (application_.currentTool_ == Tools_LineMeasure) | 130 if (application_.currentTool_ == Tool_LineMeasure) |
131 { | 131 { |
132 return new LineMeasureTracker(statusBar, dynamic_cast<SliceViewerWidget&>(widget).GetSlice(), | 132 return new LineMeasureTracker(statusBar, dynamic_cast<SliceViewerWidget&>(widget).GetSlice(), |
133 x, y, 255, 0, 0, application_.GetFont()); | 133 x, y, 255, 0, 0, application_.GetFont()); |
134 } | 134 } |
135 else if (application_.currentTool_ == Tools_CircleMeasure) | 135 else if (application_.currentTool_ == Tool_CircleMeasure) |
136 { | 136 { |
137 return new CircleMeasureTracker(statusBar, dynamic_cast<SliceViewerWidget&>(widget).GetSlice(), | 137 return new CircleMeasureTracker(statusBar, dynamic_cast<SliceViewerWidget&>(widget).GetSlice(), |
138 x, y, 255, 0, 0, application_.GetFont()); | 138 x, y, 255, 0, 0, application_.GetFont()); |
139 } | 139 } |
140 } | 140 } |
177 case 's': | 177 case 's': |
178 widget.FitContent(); | 178 widget.FitContent(); |
179 break; | 179 break; |
180 | 180 |
181 case 'l': | 181 case 'l': |
182 application_.currentTool_ = Tools_LineMeasure; | 182 application_.currentTool_ = Tool_LineMeasure; |
183 break; | 183 break; |
184 | 184 |
185 case 'c': | 185 case 'c': |
186 application_.currentTool_ = Tools_CircleMeasure; | 186 application_.currentTool_ = Tool_CircleMeasure; |
187 break; | 187 break; |
188 | 188 |
189 default: | 189 default: |
190 break; | 190 break; |
191 } | 191 } |
212 | 212 |
213 virtual void HandleCommandFromWeb(std::string& output, const std::string& input) | 213 virtual void HandleCommandFromWeb(std::string& output, const std::string& input) |
214 { | 214 { |
215 if (input == "select-tool:line-measure") | 215 if (input == "select-tool:line-measure") |
216 { | 216 { |
217 viewerApplication_.currentTool_ = Tools_LineMeasure; | 217 viewerApplication_.currentTool_ = Tool_LineMeasure; |
218 NotifyStatusUpdateFromCppToWebWithString("currentTool=line-measure"); | 218 NotifyStatusUpdateFromCppToWebWithString("currentTool=line-measure"); |
219 } | 219 } |
220 else if (input == "select-tool:circle-measure") | 220 else if (input == "select-tool:circle-measure") |
221 { | 221 { |
222 viewerApplication_.currentTool_ = Tools_CircleMeasure; | 222 viewerApplication_.currentTool_ = Tool_CircleMeasure; |
223 NotifyStatusUpdateFromCppToWebWithString("currentTool=circle-measure"); | 223 NotifyStatusUpdateFromCppToWebWithString("currentTool=circle-measure"); |
224 } | 224 } |
225 | 225 |
226 output = "ok"; | 226 output = "ok"; |
227 } | 227 } |
236 UpdateStoneApplicationStatusFromCppWithString(statusUpdateMessage.c_str()); | 236 UpdateStoneApplicationStatusFromCppWithString(statusUpdateMessage.c_str()); |
237 } | 237 } |
238 | 238 |
239 }; | 239 }; |
240 #endif | 240 #endif |
241 enum Tools { | 241 enum Tool { |
242 Tools_LineMeasure, | 242 Tool_LineMeasure, |
243 Tools_CircleMeasure | 243 Tool_CircleMeasure |
244 }; | 244 }; |
245 | 245 |
246 Tools currentTool_; | 246 Tool currentTool_; |
247 std::auto_ptr<MainWidgetInteractor> mainWidgetInteractor_; | 247 std::auto_ptr<MainWidgetInteractor> mainWidgetInteractor_; |
248 std::auto_ptr<ThumbnailInteractor> thumbnailInteractor_; | 248 std::auto_ptr<ThumbnailInteractor> thumbnailInteractor_; |
249 LayoutWidget* mainLayout_; | 249 LayoutWidget* mainLayout_; |
250 LayoutWidget* thumbnailsLayout_; | 250 LayoutWidget* thumbnailsLayout_; |
251 std::vector<SliceViewerWidget*> thumbnails_; | 251 std::vector<SliceViewerWidget*> thumbnails_; |
263 Orthanc::Font font_; | 263 Orthanc::Font font_; |
264 | 264 |
265 public: | 265 public: |
266 SimpleViewerApplication(MessageBroker& broker) : | 266 SimpleViewerApplication(MessageBroker& broker) : |
267 IObserver(broker), | 267 IObserver(broker), |
268 currentTool_(Tools_LineMeasure), | 268 currentTool_(Tool_LineMeasure), |
269 mainLayout_(NULL), | 269 mainLayout_(NULL), |
270 currentInstanceIndex_(0), | 270 currentInstanceIndex_(0), |
271 wasmViewport1_(NULL), | 271 wasmViewport1_(NULL), |
272 wasmViewport2_(NULL) | 272 wasmViewport2_(NULL) |
273 { | 273 { |
436 return font_; | 436 return font_; |
437 } | 437 } |
438 | 438 |
439 virtual void OnPushButton1Clicked() {} | 439 virtual void OnPushButton1Clicked() {} |
440 virtual void OnPushButton2Clicked() {} | 440 virtual void OnPushButton2Clicked() {} |
441 virtual void OnTool1Clicked() { currentTool_ = Tools_LineMeasure;} | 441 virtual void OnTool1Clicked() { currentTool_ = Tool_LineMeasure;} |
442 virtual void OnTool2Clicked() { currentTool_ = Tools_CircleMeasure;} | 442 virtual void OnTool2Clicked() { currentTool_ = Tool_CircleMeasure;} |
443 | 443 |
444 virtual void GetButtonNames(std::string& pushButton1, | 444 virtual void GetButtonNames(std::string& pushButton1, |
445 std::string& pushButton2, | 445 std::string& pushButton2, |
446 std::string& tool1, | 446 std::string& tool1, |
447 std::string& tool2) | 447 std::string& tool2) |