annotate Applications/Samples/SimpleViewerApplication.h @ 294:faccc4b07b92 am-2

renamings
author am@osimis.io
date Thu, 30 Aug 2018 17:17:11 +0200
parents 8c8da145fefa
children 3897f9f28cfa
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
1 /**
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
2 * Stone of Orthanc
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
6 *
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
8 * modify it under the terms of the GNU Affero General Public License
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
10 * the License, or (at your option) any later version.
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
11 *
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
15 * Affero General Public License for more details.
249
54c7284b0eff merged useful changes from branch am
am@osimis.io
parents: 245
diff changeset
16 *
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
17 * You should have received a copy of the GNU Affero General Public License
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
19 **/
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
20
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
21
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
22 #pragma once
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
23
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
24 #include "SampleApplicationBase.h"
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
25
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
26 #include "../../Framework/Layers/OrthancFrameLayerSource.h"
285
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
27 #include "../../Framework/Layers/CircleMeasureTracker.h"
281
300d8b8c48b3 mouse tracker tuning
am@osimis.io
parents: 279
diff changeset
28 #include "../../Framework/Layers/LineMeasureTracker.h"
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
29 #include "../../Framework/Widgets/LayerWidget.h"
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
30 #include "../../Framework/Widgets/LayoutWidget.h"
251
192e6e349e69 first usage of new message system (in SDL only)
am@osimis.io
parents: 249
diff changeset
31 #include "../../Framework/Messages/IObserver.h"
258
e5a9b3d03478 first very basic version of SmartLoader
am@osimis.io
parents: 257
diff changeset
32 #include "../../Framework/SmartLoader.h"
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
33
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
34 #if ORTHANC_ENABLE_WASM==1
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
35 #include "../../Platforms/Wasm/IStoneApplicationToWebApplicationAdapter.h"
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
36 #include "../../Platforms/Wasm/Defaults.h"
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
37 #endif
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
38 #include <Core/Logging.h>
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
39
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
40 namespace OrthancStone
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
41 {
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
42 namespace Samples
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
43 {
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
44 class SimpleViewerApplication :
249
54c7284b0eff merged useful changes from branch am
am@osimis.io
parents: 245
diff changeset
45 public SampleApplicationBase,
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
46 #if ORTHANC_ENABLE_WASM==1
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
47 public IStoneApplicationToWebApplicationAdapter,
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
48 #endif
251
192e6e349e69 first usage of new message system (in SDL only)
am@osimis.io
parents: 249
diff changeset
49 public IObserver
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
50 {
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
51 private:
273
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
52 class ThumbnailInteractor : public IWorldSceneInteractor
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
53 {
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
54 private:
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
55 SimpleViewerApplication& application_;
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
56 public:
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
57 ThumbnailInteractor(SimpleViewerApplication& application) :
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
58 application_(application)
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
59 {
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
60 }
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
61
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
62 virtual IWorldSceneMouseTracker* CreateMouseTracker(WorldSceneWidget& widget,
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
63 const ViewportGeometry& view,
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
64 MouseButton button,
281
300d8b8c48b3 mouse tracker tuning
am@osimis.io
parents: 279
diff changeset
65 KeyboardModifiers modifiers,
273
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
66 double x,
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
67 double y,
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
68 IStatusBar* statusBar)
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
69 {
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
70 if (button == MouseButton_Left)
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
71 {
279
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
72 statusBar->SetMessage("selected thumbnail " + widget.GetName());
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
73 std::string seriesId = widget.GetName().substr(strlen("thumbnail-series-"));
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
74 application_.SelectSeriesInMainViewport(seriesId);
273
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
75 }
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
76 return NULL;
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
77 }
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
78 virtual void MouseOver(CairoContext& context,
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
79 WorldSceneWidget& widget,
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
80 const ViewportGeometry& view,
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
81 double x,
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
82 double y,
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
83 IStatusBar* statusBar)
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
84 {}
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
85
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
86 virtual void MouseWheel(WorldSceneWidget& widget,
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
87 MouseWheelDirection direction,
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
88 KeyboardModifiers modifiers,
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
89 IStatusBar* statusBar)
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
90 {}
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
91
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
92 virtual void KeyPressed(WorldSceneWidget& widget,
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
93 char key,
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
94 KeyboardModifiers modifiers,
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
95 IStatusBar* statusBar)
281
300d8b8c48b3 mouse tracker tuning
am@osimis.io
parents: 279
diff changeset
96 {}
273
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
97
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
98 };
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
99
281
300d8b8c48b3 mouse tracker tuning
am@osimis.io
parents: 279
diff changeset
100 class MainWidgetInteractor : public IWorldSceneInteractor
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
101 {
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
102 private:
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
103 SimpleViewerApplication& application_;
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
104
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
105 public:
281
300d8b8c48b3 mouse tracker tuning
am@osimis.io
parents: 279
diff changeset
106 MainWidgetInteractor(SimpleViewerApplication& application) :
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
107 application_(application)
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
108 {
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
109 }
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
110
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
111 virtual IWorldSceneMouseTracker* CreateMouseTracker(WorldSceneWidget& widget,
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
112 const ViewportGeometry& view,
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
113 MouseButton button,
281
300d8b8c48b3 mouse tracker tuning
am@osimis.io
parents: 279
diff changeset
114 KeyboardModifiers modifiers,
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
115 double x,
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
116 double y,
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
117 IStatusBar* statusBar)
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
118 {
281
300d8b8c48b3 mouse tracker tuning
am@osimis.io
parents: 279
diff changeset
119 if (button == MouseButton_Left)
300d8b8c48b3 mouse tracker tuning
am@osimis.io
parents: 279
diff changeset
120 {
285
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
121 if (application_.currentTool_ == Tools_LineMeasure)
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
122 {
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
123 return new LineMeasureTracker(statusBar, dynamic_cast<LayerWidget&>(widget).GetSlice(), x, y, 255, 0, 0, 10);
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
124 }
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
125 else if (application_.currentTool_ == Tools_CircleMeasure)
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
126 {
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
127 return new CircleMeasureTracker(statusBar, dynamic_cast<LayerWidget&>(widget).GetSlice(), x, y, 255, 0, 0, 10);
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
128 }
281
300d8b8c48b3 mouse tracker tuning
am@osimis.io
parents: 279
diff changeset
129 }
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
130 return NULL;
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
131 }
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
132
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
133 virtual void MouseOver(CairoContext& context,
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
134 WorldSceneWidget& widget,
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
135 const ViewportGeometry& view,
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
136 double x,
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
137 double y,
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
138 IStatusBar* statusBar)
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
139 {
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
140 if (statusBar != NULL)
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
141 {
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
142 Vector p = dynamic_cast<LayerWidget&>(widget).GetSlice().MapSliceToWorldCoordinates(x, y);
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
143
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
144 char buf[64];
249
54c7284b0eff merged useful changes from branch am
am@osimis.io
parents: 245
diff changeset
145 sprintf(buf, "X = %.02f Y = %.02f Z = %.02f (in cm)",
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
146 p[0] / 10.0, p[1] / 10.0, p[2] / 10.0);
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
147 statusBar->SetMessage(buf);
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
148 }
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
149 }
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
150
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
151 virtual void MouseWheel(WorldSceneWidget& widget,
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
152 MouseWheelDirection direction,
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
153 KeyboardModifiers modifiers,
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
154 IStatusBar* statusBar)
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
155 {
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
156 }
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
157
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
158 virtual void KeyPressed(WorldSceneWidget& widget,
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
159 char key,
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
160 KeyboardModifiers modifiers,
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
161 IStatusBar* statusBar)
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
162 {
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
163 switch (key)
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
164 {
249
54c7284b0eff merged useful changes from branch am
am@osimis.io
parents: 245
diff changeset
165 case 's':
54c7284b0eff merged useful changes from branch am
am@osimis.io
parents: 245
diff changeset
166 widget.SetDefaultView();
54c7284b0eff merged useful changes from branch am
am@osimis.io
parents: 245
diff changeset
167 break;
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
168
249
54c7284b0eff merged useful changes from branch am
am@osimis.io
parents: 245
diff changeset
169 default:
54c7284b0eff merged useful changes from branch am
am@osimis.io
parents: 245
diff changeset
170 break;
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
171 }
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
172 }
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
173 };
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
174
285
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
175 enum Tools {
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
176 Tools_LineMeasure,
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
177 Tools_CircleMeasure
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
178 };
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
179
285
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
180 Tools currentTool_;
281
300d8b8c48b3 mouse tracker tuning
am@osimis.io
parents: 279
diff changeset
181 std::unique_ptr<MainWidgetInteractor> mainWidgetInteractor_;
273
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
182 std::unique_ptr<ThumbnailInteractor> thumbnailInteractor_;
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
183 LayoutWidget* mainLayout_;
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
184 LayoutWidget* thumbnailsLayout_;
273
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
185 LayerWidget* mainWidget_;
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
186 std::vector<LayerWidget*> thumbnails_;
279
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
187 std::map<std::string, std::vector<std::string>> instancesIdsPerSeriesId_;
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
188 std::map<std::string, Json::Value> seriesTags_;
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
189
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
190 unsigned int currentInstanceIndex_;
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
191 OrthancStone::WidgetViewport* wasmViewport1_;
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
192 OrthancStone::WidgetViewport* wasmViewport2_;
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
193
254
abc1c6231947 cleanup
am@osimis.io
parents: 253
diff changeset
194 IStatusBar* statusBar_;
258
e5a9b3d03478 first very basic version of SmartLoader
am@osimis.io
parents: 257
diff changeset
195 std::unique_ptr<SmartLoader> smartLoader_;
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
196 std::unique_ptr<OrthancApiClient> orthancApiClient_;
251
192e6e349e69 first usage of new message system (in SDL only)
am@osimis.io
parents: 249
diff changeset
197
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
198 public:
251
192e6e349e69 first usage of new message system (in SDL only)
am@osimis.io
parents: 249
diff changeset
199 SimpleViewerApplication(MessageBroker& broker) :
258
e5a9b3d03478 first very basic version of SmartLoader
am@osimis.io
parents: 257
diff changeset
200 IObserver(broker),
285
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
201 currentTool_(Tools_LineMeasure),
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
202 mainLayout_(NULL),
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
203 currentInstanceIndex_(0),
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 237
diff changeset
204 wasmViewport1_(NULL),
285
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
205 wasmViewport2_(NULL)
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
206 {
267
89d02de83c03 added declaretion of messages handled/emitted
am@osimis.io
parents: 266
diff changeset
207 DeclareIgnoredMessage(MessageType_Widget_ContentChanged);
89d02de83c03 added declaretion of messages handled/emitted
am@osimis.io
parents: 266
diff changeset
208 DeclareHandledMessage(MessageType_Widget_GeometryChanged);
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
209
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
210 DeclareHandledMessage(MessageType_OrthancApi_GetStudyIds_Ready);
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
211 DeclareHandledMessage(MessageType_OrthancApi_GetStudy_Ready);
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
212 DeclareHandledMessage(MessageType_OrthancApi_GetSeries_Ready);
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
213 }
251
192e6e349e69 first usage of new message system (in SDL only)
am@osimis.io
parents: 249
diff changeset
214
237
b4642964c355 SimpleViewer demo running both with SDL and Wasm
am@osimis.io
parents: 235
diff changeset
215 virtual void Finalize() {}
b4642964c355 SimpleViewer demo running both with SDL and Wasm
am@osimis.io
parents: 235
diff changeset
216 virtual IWidget* GetCentralWidget() {return mainLayout_;}
b4642964c355 SimpleViewer demo running both with SDL and Wasm
am@osimis.io
parents: 235
diff changeset
217
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
218 virtual void DeclareStartupOptions(boost::program_options::options_description& options)
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
219 {
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
220 boost::program_options::options_description generic("Sample options");
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
221 generic.add_options()
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
222 ("studyId", boost::program_options::value<std::string>(),
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
223 "Orthanc ID of the study")
249
54c7284b0eff merged useful changes from branch am
am@osimis.io
parents: 245
diff changeset
224 ;
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
225
249
54c7284b0eff merged useful changes from branch am
am@osimis.io
parents: 245
diff changeset
226 options.add(generic);
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
227 }
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
228
288
8c8da145fefa renamings and doc
am@osimis.io
parents: 287
diff changeset
229 virtual void Initialize(StoneApplicationContext* context,
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 237
diff changeset
230 IStatusBar& statusBar,
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
231 const boost::program_options::variables_map& parameters)
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
232 {
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
233 using namespace OrthancStone;
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
234
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 237
diff changeset
235 context_ = context;
254
abc1c6231947 cleanup
am@osimis.io
parents: 253
diff changeset
236 statusBar_ = &statusBar;
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
237
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
238 {// initialize viewports and layout
273
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
239 mainLayout_ = new LayoutWidget("main-layout");
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
240 mainLayout_->SetPadding(10);
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
241 mainLayout_->SetBackgroundCleared(true);
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
242 mainLayout_->SetBackgroundColor(0, 0, 0);
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
243 mainLayout_->SetHorizontal();
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
244
273
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
245 thumbnailsLayout_ = new LayoutWidget("thumbnail-layout");
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
246 thumbnailsLayout_->SetPadding(10);
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
247 thumbnailsLayout_->SetBackgroundCleared(true);
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
248 thumbnailsLayout_->SetBackgroundColor(50, 50, 50);
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
249 thumbnailsLayout_->SetVertical();
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
250
273
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
251 mainWidget_ = new LayerWidget(broker_, "main-viewport");
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
252 mainWidget_->RegisterObserver(*this);
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
253
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
254 // hierarchy
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
255 mainLayout_->AddWidget(thumbnailsLayout_);
273
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
256 mainLayout_->AddWidget(mainWidget_);
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
257
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
258 // sources
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
259 smartLoader_.reset(new SmartLoader(broker_, context_->GetWebService()));
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
260 smartLoader_->SetImageQuality(SliceImageQuality_FullPam);
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
261
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
262 mainLayout_->SetTransmitMouseOver(true);
281
300d8b8c48b3 mouse tracker tuning
am@osimis.io
parents: 279
diff changeset
263 mainWidgetInteractor_.reset(new MainWidgetInteractor(*this));
300d8b8c48b3 mouse tracker tuning
am@osimis.io
parents: 279
diff changeset
264 mainWidget_->SetInteractor(*mainWidgetInteractor_);
273
f21ba2468570 force all Widgets to have a name to ease debugging
am@osimis.io
parents: 271
diff changeset
265 thumbnailInteractor_.reset(new ThumbnailInteractor(*this));
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
266 }
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
267
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
268 statusBar.SetMessage("Use the key \"s\" to reinitialize the layout");
254
abc1c6231947 cleanup
am@osimis.io
parents: 253
diff changeset
269 statusBar.SetMessage("Use the key \"n\" to go to next image in the main viewport");
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
270
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
271 orthancApiClient_.reset(new OrthancApiClient(broker_, context_->GetWebService()));
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
272
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
273 if (parameters.count("studyId") < 1)
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
274 {
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
275 LOG(WARNING) << "The study ID is missing, will take the first studyId found in Orthanc";
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
276 orthancApiClient_->ScheduleGetStudyIds(*this);
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
277 }
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
278 else
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
279 {
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
280 SelectStudy(parameters["studyId"].as<std::string>());
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
281 }
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
282 }
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
283
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
284 void OnStudyListReceived(const Json::Value& response)
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
285 {
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
286 if (response.isArray() && response.size() > 1)
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
287 {
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
288 SelectStudy(response[0].asString());
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
289 }
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
290 }
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
291 void OnStudyReceived(const Json::Value& response)
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
292 {
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
293 if (response.isObject() && response["Series"].isArray())
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
294 {
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
295 for (size_t i=0; i < response["Series"].size(); i++)
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
296 {
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
297 orthancApiClient_->ScheduleGetSeries(*this, response["Series"][(int)i].asString());
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
298 }
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
299 }
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
300 }
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
301
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
302 void OnSeriesReceived(const Json::Value& response)
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
303 {
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
304 if (response.isObject() && response["Instances"].isArray() && response["Instances"].size() > 0)
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
305 {
279
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
306 // keep track of all instances IDs
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
307 const std::string& seriesId = response["ID"].asString();
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
308 seriesTags_[seriesId] = response;
279
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
309 instancesIdsPerSeriesId_[seriesId] = std::vector<std::string>();
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
310 for (size_t i = 0; i < response["Instances"].size(); i++)
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
311 {
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
312 const std::string& instanceId = response["Instances"][static_cast<int>(i)].asString();
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
313 instancesIdsPerSeriesId_[seriesId].push_back(instanceId);
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
314 }
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
315
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
316 // load the first instance in the thumbnail
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
317 LoadThumbnailForSeries(seriesId, instancesIdsPerSeriesId_[seriesId][0]);
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
318
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
319 // if this is the first thumbnail loaded, load the first instance in the mainWidget
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
320 if (mainWidget_->GetLayerCount() == 0)
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
321 {
285
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
322 mainWidget_->AddLayer(smartLoader_->GetFrame(instancesIdsPerSeriesId_[seriesId][0], 0));
279
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
323 }
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
324 }
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
325 }
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
326
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
327 void LoadThumbnailForSeries(const std::string& seriesId, const std::string& instanceId)
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
328 {
271
46c5296d867e OracleWebService and BasicSdlApplicationContext using the same global mutex
am@osimis.io
parents: 270
diff changeset
329 LOG(INFO) << "Loading thumbnail for series " << seriesId;
46c5296d867e OracleWebService and BasicSdlApplicationContext using the same global mutex
am@osimis.io
parents: 270
diff changeset
330 LayerWidget* thumbnailWidget = new LayerWidget(broker_, "thumbnail-series-" + seriesId);
46c5296d867e OracleWebService and BasicSdlApplicationContext using the same global mutex
am@osimis.io
parents: 270
diff changeset
331 thumbnails_.push_back(thumbnailWidget);
46c5296d867e OracleWebService and BasicSdlApplicationContext using the same global mutex
am@osimis.io
parents: 270
diff changeset
332 thumbnailsLayout_->AddWidget(thumbnailWidget);
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
333 thumbnailWidget->RegisterObserver(*this);
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
334 thumbnailWidget->AddLayer(smartLoader_->GetFrame(instanceId, 0));
279
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
335 thumbnailWidget->SetInteractor(*thumbnailInteractor_);
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
336 }
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
337
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
338 void SelectStudy(const std::string& studyId)
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
339 {
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
340 orthancApiClient_->ScheduleGetStudy(*this, studyId);
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
341 }
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
342
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
343 virtual void HandleMessage(IObservable& from, const IMessage& message) {
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
344 switch (message.GetType()) {
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
345 case MessageType_Widget_GeometryChanged:
271
46c5296d867e OracleWebService and BasicSdlApplicationContext using the same global mutex
am@osimis.io
parents: 270
diff changeset
346 LOG(INFO) << "Widget geometry ready: " << dynamic_cast<LayerWidget&>(from).GetName();
270
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
347 dynamic_cast<LayerWidget&>(from).SetDefaultView();
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
348 break;
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
349 case MessageType_OrthancApi_GetStudyIds_Ready:
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
350 OnStudyListReceived(dynamic_cast<const OrthancApiClient::GetJsonResponseReadyMessage&>(message).response_);
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
351 break;
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
352 case MessageType_OrthancApi_GetSeries_Ready:
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
353 OnSeriesReceived(dynamic_cast<const OrthancApiClient::GetJsonResponseReadyMessage&>(message).response_);
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
354 break;
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
355 case MessageType_OrthancApi_GetStudy_Ready:
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
356 OnStudyReceived(dynamic_cast<const OrthancApiClient::GetJsonResponseReadyMessage&>(message).response_);
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
357 break;
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
358 default:
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
359 VLOG("unhandled message type" << message.GetType());
2d64f4d39610 backup (work in progress)
am@osimis.io
parents: 268
diff changeset
360 }
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 237
diff changeset
361 }
237
b4642964c355 SimpleViewer demo running both with SDL and Wasm
am@osimis.io
parents: 235
diff changeset
362
279
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
363 void SelectSeriesInMainViewport(const std::string& seriesId)
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
364 {
8f5d7495076d SimpleViewer sample working in SDL, Qt and WASM
am@osimis.io
parents: 274
diff changeset
365 mainWidget_->ReplaceLayer(0, smartLoader_->GetFrame(instancesIdsPerSeriesId_[seriesId][0], 0));
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
366 #if ORTHANC_ENABLE_WASM==1
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
367 NotifyStatusUpdateFromCppToWeb("series-description=" + seriesTags_[seriesId]["MainDicomTags"]["SeriesDescription"].asString());
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
368 #endif
249
54c7284b0eff merged useful changes from branch am
am@osimis.io
parents: 245
diff changeset
369 }
285
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
370
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
371 virtual void OnPushButton1Clicked() {}
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
372 virtual void OnPushButton2Clicked() {}
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
373 virtual void OnTool1Clicked() { currentTool_ = Tools_LineMeasure;}
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
374 virtual void OnTool2Clicked() { currentTool_ = Tools_CircleMeasure;}
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
375
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
376 virtual void GetButtonNames(std::string& pushButton1,
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
377 std::string& pushButton2,
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
378 std::string& tool1,
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
379 std::string& tool2
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
380 ) {
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
381 tool1 = "line";
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
382 tool2 = "circle";
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
383 pushButton1 = "action1";
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
384 pushButton2 = "action2";
3c190e2bb3af refactoring: ApplicationRunner + app hierarchy
am@osimis.io
parents: 281
diff changeset
385 }
287
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
386
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
387 #if ORTHANC_ENABLE_WASM==1
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
388 virtual void HandleMessageFromWeb(std::string& output, const std::string& input) {
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
389 if (input == "select-tool:line-measure")
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
390 {
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
391 currentTool_ = Tools_LineMeasure;
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
392 NotifyStatusUpdateFromCppToWeb("currentTool=line-measure");
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
393 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
394 else if (input == "select-tool:circle-measure")
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
395 {
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
396 currentTool_ = Tools_CircleMeasure;
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
397 NotifyStatusUpdateFromCppToWeb("currentTool=circle-measure");
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
398 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
399
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
400 output = "ok";
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
401 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
402
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
403 virtual void NotifyStatusUpdateFromCppToWeb(const std::string& statusUpdateMessage) {
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
404 UpdateStoneApplicationStatusFromCpp(statusUpdateMessage.c_str());
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
405 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
406
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
407 virtual void InitializeWasm() {
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
408
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
409 AttachWidgetToWasmViewport("canvas", thumbnailsLayout_);
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
410 AttachWidgetToWasmViewport("canvas2", mainWidget_);
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
411 }
2038d76bf13f interaction with HTML/JS
am@osimis.io
parents: 285
diff changeset
412 #endif
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
413 };
249
54c7284b0eff merged useful changes from branch am
am@osimis.io
parents: 245
diff changeset
414
54c7284b0eff merged useful changes from branch am
am@osimis.io
parents: 245
diff changeset
415
235
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
416 }
ce4405d98b92 Added SimpleViewerApplication (working in SDL)
am@osimis.io
parents:
diff changeset
417 }