Mercurial > hg > orthanc-stone
annotate Applications/Samples/SingleFrameEditorApplication.h @ 475:3c28542229a3 am-touch-events
added a mask layer in the RadiographyWidget (to be cleaned)
author | am@osimis.io |
---|---|
date | Tue, 12 Feb 2019 12:22:13 +0100 |
parents | 3b4df9925db6 |
children | a95090305dd4 |
rev | line source |
---|---|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
1 /** |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
2 * Stone of Orthanc |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
439 | 5 * Copyright (C) 2017-2019 Osimis S.A., Belgium |
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
6 * |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
7 * This program is free software: you can redistribute it and/or |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
8 * modify it under the terms of the GNU Affero General Public License |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
9 * as published by the Free Software Foundation, either version 3 of |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
10 * the License, or (at your option) any later version. |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
11 * |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
12 * This program is distributed in the hope that it will be useful, but |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
13 * WITHOUT ANY WARRANTY; without even the implied warranty of |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
15 * Affero General Public License for more details. |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
16 * |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
17 * You should have received a copy of the GNU Affero General Public License |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
19 **/ |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
20 |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
21 |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
22 #pragma once |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
23 |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
24 #include "SampleApplicationBase.h" |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
25 |
415
c0589c3173fd
finished reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
414
diff
changeset
|
26 #include "../../Framework/Radiography/RadiographyLayerCropTracker.h" |
414 | 27 #include "../../Framework/Radiography/RadiographyLayerMoveTracker.h" |
415
c0589c3173fd
finished reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
414
diff
changeset
|
28 #include "../../Framework/Radiography/RadiographyLayerResizeTracker.h" |
414 | 29 #include "../../Framework/Radiography/RadiographyLayerRotateTracker.h" |
408 | 30 #include "../../Framework/Radiography/RadiographyScene.h" |
414 | 31 #include "../../Framework/Radiography/RadiographySceneCommand.h" |
413 | 32 #include "../../Framework/Radiography/RadiographyWidget.h" |
415
c0589c3173fd
finished reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
414
diff
changeset
|
33 #include "../../Framework/Radiography/RadiographyWindowingTracker.h" |
430 | 34 #include "../../Framework/Radiography/RadiographySceneWriter.h" |
35 #include "../../Framework/Radiography/RadiographySceneReader.h" | |
475
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
457
diff
changeset
|
36 #include "../../Framework/Radiography/RadiographyMaskLayer.h" |
359
100df90bf0ea
preparing to implement Export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
358
diff
changeset
|
37 |
418 | 38 #include <Core/HttpClient.h> |
343 | 39 #include <Core/Images/FontRegistry.h> |
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
40 #include <Core/Logging.h> |
403 | 41 #include <Core/OrthancException.h> |
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
42 |
407 | 43 |
44 // Export using PAM is faster than using PNG, but requires Orthanc | |
45 // core >= 1.4.3 | |
362
12cec26d08ce
export of a valid DICOM CR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
361
diff
changeset
|
46 #define EXPORT_USING_PAM 1 |
12cec26d08ce
export of a valid DICOM CR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
361
diff
changeset
|
47 |
340
f5d5814a41a0
rendering BitmapStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
339
diff
changeset
|
48 |
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
49 namespace OrthancStone |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
50 { |
407 | 51 namespace Samples |
358 | 52 { |
408 | 53 class RadiographyEditorInteractor : |
430 | 54 public IWorldSceneInteractor, |
55 public IObserver | |
358 | 56 { |
407 | 57 private: |
58 enum Tool | |
59 { | |
60 Tool_Move, | |
61 Tool_Rotate, | |
62 Tool_Crop, | |
63 Tool_Resize, | |
64 Tool_Windowing | |
65 }; | |
430 | 66 |
358 | 67 |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
68 StoneApplicationContext* context_; |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
69 UndoRedoStack undoRedoStack_; |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
70 Tool tool_; |
407 | 71 |
72 | |
73 static double GetHandleSize() | |
74 { | |
75 return 10.0; | |
76 } | |
430 | 77 |
78 | |
407 | 79 public: |
408 | 80 RadiographyEditorInteractor(MessageBroker& broker) : |
407 | 81 IObserver(broker), |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
82 context_(NULL), |
407 | 83 tool_(Tool_Move) |
84 { | |
85 } | |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
86 |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
87 void SetContext(StoneApplicationContext& context) |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
88 { |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
89 context_ = &context; |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
90 } |
430 | 91 |
407 | 92 virtual IWorldSceneMouseTracker* CreateMouseTracker(WorldSceneWidget& worldWidget, |
93 const ViewportGeometry& view, | |
94 MouseButton button, | |
95 KeyboardModifiers modifiers, | |
96 int viewportX, | |
97 int viewportY, | |
98 double x, | |
99 double y, | |
457
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
440
diff
changeset
|
100 IStatusBar* statusBar, |
3b4df9925db6
added support for 'touch' in mouse trackers. This is still a bit hacky and we need to refactor it to make it clean. Thanks to that, Pan and zoom are available together with 2 touches
Alain Mazy <alain@mazy.be>
parents:
440
diff
changeset
|
101 const std::vector<Touch>& displayTouches) |
357
ec4ad6c5eb99
avoid breaking class hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
356
diff
changeset
|
102 { |
408 | 103 RadiographyWidget& widget = dynamic_cast<RadiographyWidget&>(worldWidget); |
407 | 104 |
105 if (button == MouseButton_Left) | |
358 | 106 { |
407 | 107 size_t selected; |
430 | 108 |
407 | 109 if (tool_ == Tool_Windowing) |
358 | 110 { |
408 | 111 return new RadiographyWindowingTracker( |
430 | 112 undoRedoStack_, widget.GetScene(), |
113 viewportX, viewportY, | |
114 RadiographyWindowingTracker::Action_DecreaseWidth, | |
115 RadiographyWindowingTracker::Action_IncreaseWidth, | |
116 RadiographyWindowingTracker::Action_DecreaseCenter, | |
117 RadiographyWindowingTracker::Action_IncreaseCenter); | |
358 | 118 } |
407 | 119 else if (!widget.LookupSelectedLayer(selected)) |
358 | 120 { |
407 | 121 // No layer is currently selected |
122 size_t layer; | |
123 if (widget.GetScene().LookupLayer(layer, x, y)) | |
358 | 124 { |
407 | 125 widget.Select(layer); |
358 | 126 } |
407 | 127 |
128 return NULL; | |
358 | 129 } |
407 | 130 else if (tool_ == Tool_Crop || |
131 tool_ == Tool_Resize) | |
358 | 132 { |
408 | 133 RadiographyScene::LayerAccessor accessor(widget.GetScene(), selected); |
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
134 |
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
135 Corner corner; |
407 | 136 if (accessor.GetLayer().LookupCorner(corner, x, y, view.GetZoom(), GetHandleSize())) |
358 | 137 { |
407 | 138 switch (tool_) |
139 { | |
430 | 140 case Tool_Crop: |
141 return new RadiographyLayerCropTracker | |
408 | 142 (undoRedoStack_, widget.GetScene(), view, selected, x, y, corner); |
407 | 143 |
430 | 144 case Tool_Resize: |
145 return new RadiographyLayerResizeTracker | |
408 | 146 (undoRedoStack_, widget.GetScene(), selected, x, y, corner, |
147 (modifiers & KeyboardModifiers_Shift)); | |
407 | 148 |
430 | 149 default: |
150 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
407 | 151 } |
384
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
152 } |
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
153 else |
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
154 { |
407 | 155 size_t layer; |
430 | 156 |
407 | 157 if (widget.GetScene().LookupLayer(layer, x, y)) |
384
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
158 { |
407 | 159 widget.Select(layer); |
384
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
160 } |
407 | 161 else |
162 { | |
163 widget.Unselect(); | |
164 } | |
430 | 165 |
384
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
166 return NULL; |
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
167 } |
358 | 168 } |
169 else | |
170 { | |
407 | 171 size_t layer; |
172 | |
173 if (widget.GetScene().LookupLayer(layer, x, y)) | |
174 { | |
175 if (layer == selected) | |
176 { | |
177 switch (tool_) | |
178 { | |
430 | 179 case Tool_Move: |
180 return new RadiographyLayerMoveTracker | |
408 | 181 (undoRedoStack_, widget.GetScene(), layer, x, y, |
182 (modifiers & KeyboardModifiers_Shift)); | |
407 | 183 |
430 | 184 case Tool_Rotate: |
185 return new RadiographyLayerRotateTracker | |
408 | 186 (undoRedoStack_, widget.GetScene(), view, layer, x, y, |
187 (modifiers & KeyboardModifiers_Shift)); | |
430 | 188 |
189 default: | |
190 break; | |
407 | 191 } |
192 | |
193 return NULL; | |
194 } | |
195 else | |
196 { | |
197 widget.Select(layer); | |
198 return NULL; | |
199 } | |
200 } | |
201 else | |
202 { | |
203 widget.Unselect(); | |
204 return NULL; | |
205 } | |
206 } | |
207 } | |
208 else | |
209 { | |
210 return NULL; | |
211 } | |
212 } | |
213 | |
214 virtual void MouseOver(CairoContext& context, | |
215 WorldSceneWidget& worldWidget, | |
216 const ViewportGeometry& view, | |
217 double x, | |
218 double y, | |
219 IStatusBar* statusBar) | |
220 { | |
408 | 221 RadiographyWidget& widget = dynamic_cast<RadiographyWidget&>(worldWidget); |
407 | 222 |
223 #if 0 | |
224 if (statusBar != NULL) | |
225 { | |
226 char buf[64]; | |
227 sprintf(buf, "X = %.02f Y = %.02f (in cm)", x / 10.0, y / 10.0); | |
228 statusBar->SetMessage(buf); | |
229 } | |
230 #endif | |
231 | |
232 size_t selected; | |
233 | |
234 if (widget.LookupSelectedLayer(selected) && | |
235 (tool_ == Tool_Crop || | |
236 tool_ == Tool_Resize)) | |
237 { | |
408 | 238 RadiographyScene::LayerAccessor accessor(widget.GetScene(), selected); |
430 | 239 |
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
240 Corner corner; |
407 | 241 if (accessor.GetLayer().LookupCorner(corner, x, y, view.GetZoom(), GetHandleSize())) |
242 { | |
243 accessor.GetLayer().GetCorner(x, y, corner); | |
430 | 244 |
407 | 245 double z = 1.0 / view.GetZoom(); |
430 | 246 |
407 | 247 context.SetSourceColor(255, 0, 0); |
248 cairo_t* cr = context.GetObject(); | |
249 cairo_set_line_width(cr, 2.0 * z); | |
250 cairo_move_to(cr, x - GetHandleSize() * z, y - GetHandleSize() * z); | |
251 cairo_line_to(cr, x + GetHandleSize() * z, y - GetHandleSize() * z); | |
252 cairo_line_to(cr, x + GetHandleSize() * z, y + GetHandleSize() * z); | |
253 cairo_line_to(cr, x - GetHandleSize() * z, y + GetHandleSize() * z); | |
254 cairo_line_to(cr, x - GetHandleSize() * z, y - GetHandleSize() * z); | |
255 cairo_stroke(cr); | |
358 | 256 } |
257 } | |
339 | 258 } |
407 | 259 |
260 virtual void MouseWheel(WorldSceneWidget& widget, | |
261 MouseWheelDirection direction, | |
262 KeyboardModifiers modifiers, | |
263 IStatusBar* statusBar) | |
344
fdec8e6893cb
ordering of bitmap layers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
343
diff
changeset
|
264 { |
358 | 265 } |
407 | 266 |
267 virtual void KeyPressed(WorldSceneWidget& worldWidget, | |
268 KeyboardKeys key, | |
269 char keyChar, | |
270 KeyboardModifiers modifiers, | |
271 IStatusBar* statusBar) | |
345 | 272 { |
408 | 273 RadiographyWidget& widget = dynamic_cast<RadiographyWidget&>(worldWidget); |
407 | 274 |
275 switch (keyChar) | |
358 | 276 { |
430 | 277 case 'a': |
278 widget.FitContent(); | |
279 break; | |
280 | |
281 case 'c': | |
282 tool_ = Tool_Crop; | |
283 break; | |
407 | 284 |
430 | 285 case 'd': |
286 { | |
287 // dump to json and reload | |
288 Json::Value snapshot; | |
289 RadiographySceneWriter writer; | |
290 writer.Write(snapshot, widget.GetScene()); | |
407 | 291 |
430 | 292 LOG(INFO) << "JSON export was successful: " |
293 << snapshot.toStyledString(); | |
294 | |
295 boost::shared_ptr<RadiographyScene> scene(new RadiographyScene(GetBroker())); | |
296 RadiographySceneReader reader(*scene, context_->GetOrthancApiClient()); | |
297 | |
298 Orthanc::FontRegistry fontRegistry; | |
299 fontRegistry.AddFromResource(Orthanc::EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16); | |
300 | |
301 reader.SetFontRegistry(fontRegistry); | |
302 reader.Read(snapshot); | |
407 | 303 |
430 | 304 widget.SetScene(scene); |
305 };break; | |
306 | |
307 case 'e': | |
308 { | |
309 Orthanc::DicomMap tags; | |
407 | 310 |
430 | 311 // Minimal set of tags to generate a valid CR image |
312 tags.SetValue(Orthanc::DICOM_TAG_ACCESSION_NUMBER, "NOPE", false); | |
313 tags.SetValue(Orthanc::DICOM_TAG_BODY_PART_EXAMINED, "PELVIS", false); | |
314 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "1", false); | |
315 //tags.SetValue(Orthanc::DICOM_TAG_LATERALITY, "", false); | |
316 tags.SetValue(Orthanc::DICOM_TAG_MANUFACTURER, "OSIMIS", false); | |
317 tags.SetValue(Orthanc::DICOM_TAG_MODALITY, "CR", false); | |
318 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_BIRTH_DATE, "20000101", false); | |
319 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_ID, "hello", false); | |
320 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_NAME, "HELLO^WORLD", false); | |
321 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_ORIENTATION, "", false); | |
322 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_SEX, "M", false); | |
323 tags.SetValue(Orthanc::DICOM_TAG_REFERRING_PHYSICIAN_NAME, "HOUSE^MD", false); | |
324 tags.SetValue(Orthanc::DICOM_TAG_SERIES_NUMBER, "1", false); | |
325 tags.SetValue(Orthanc::DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.1", false); | |
326 tags.SetValue(Orthanc::DICOM_TAG_STUDY_ID, "STUDY", false); | |
327 tags.SetValue(Orthanc::DICOM_TAG_VIEW_POSITION, "", false); | |
328 | |
329 if (context_ != NULL) | |
330 { | |
331 widget.GetScene().ExportDicom(context_->GetOrthancApiClient(), | |
332 tags, std::string(), 0.1, 0.1, widget.IsInverted(), | |
333 widget.GetInterpolation(), EXPORT_USING_PAM); | |
407 | 334 } |
335 | |
430 | 336 break; |
337 } | |
338 | |
339 case 'i': | |
340 widget.SwitchInvert(); | |
341 break; | |
342 | |
343 case 'm': | |
344 tool_ = Tool_Move; | |
345 break; | |
346 | |
347 case 'n': | |
348 { | |
349 switch (widget.GetInterpolation()) | |
350 { | |
351 case ImageInterpolation_Nearest: | |
352 LOG(INFO) << "Switching to bilinear interpolation"; | |
353 widget.SetInterpolation(ImageInterpolation_Bilinear); | |
407 | 354 break; |
355 | |
430 | 356 case ImageInterpolation_Bilinear: |
357 LOG(INFO) << "Switching to nearest neighbor interpolation"; | |
358 widget.SetInterpolation(ImageInterpolation_Nearest); | |
407 | 359 break; |
360 | |
430 | 361 default: |
362 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
363 } | |
364 | |
365 break; | |
366 } | |
407 | 367 |
430 | 368 case 'r': |
369 tool_ = Tool_Rotate; | |
370 break; | |
371 | |
372 case 's': | |
373 tool_ = Tool_Resize; | |
374 break; | |
375 | |
376 case 'w': | |
377 tool_ = Tool_Windowing; | |
378 break; | |
407 | 379 |
430 | 380 case 'y': |
381 if (modifiers & KeyboardModifiers_Control) | |
382 { | |
383 undoRedoStack_.Redo(); | |
384 widget.NotifyContentChanged(); | |
385 } | |
386 break; | |
407 | 387 |
430 | 388 case 'z': |
389 if (modifiers & KeyboardModifiers_Control) | |
390 { | |
391 undoRedoStack_.Undo(); | |
392 widget.NotifyContentChanged(); | |
393 } | |
394 break; | |
395 | |
396 default: | |
397 break; | |
358 | 398 } |
345 | 399 } |
407 | 400 }; |
336
c7fdc8bac581
creating GrayscaleBitmapStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
401 |
430 | 402 |
403 | |
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
404 class SingleFrameEditorApplication : |
430 | 405 public SampleSingleCanvasApplicationBase, |
406 public IObserver | |
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
407 { |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
408 private: |
430 | 409 boost::shared_ptr<RadiographyScene> scene_; |
410 RadiographyEditorInteractor interactor_; | |
411 Orthanc::FontRegistry fontRegistry_; | |
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
412 |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
413 public: |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
414 SingleFrameEditorApplication(MessageBroker& broker) : |
362
12cec26d08ce
export of a valid DICOM CR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
361
diff
changeset
|
415 IObserver(broker), |
12cec26d08ce
export of a valid DICOM CR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
361
diff
changeset
|
416 interactor_(broker) |
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
417 { |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
418 } |
384
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
419 |
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
420 virtual ~SingleFrameEditorApplication() |
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
421 { |
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
422 LOG(WARNING) << "Destroying the application"; |
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
423 } |
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
424 |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
425 virtual void DeclareStartupOptions(boost::program_options::options_description& options) |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
426 { |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
427 boost::program_options::options_description generic("Sample options"); |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
428 generic.add_options() |
430 | 429 ("instance", boost::program_options::value<std::string>(), |
430 "Orthanc ID of the instance") | |
431 ("frame", boost::program_options::value<unsigned int>()->default_value(0), | |
432 "Number of the frame, for multi-frame DICOM instances") | |
433 ; | |
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
434 |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
435 options.add(generic); |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
436 } |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
437 |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
438 virtual void Initialize(StoneApplicationContext* context, |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
439 IStatusBar& statusBar, |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
440 const boost::program_options::variables_map& parameters) |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
441 { |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
442 using namespace OrthancStone; |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
443 |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
444 context_ = context; |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
445 interactor_.SetContext(*context); |
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
446 |
358 | 447 statusBar.SetMessage("Use the key \"a\" to reinitialize the layout"); |
448 statusBar.SetMessage("Use the key \"c\" to crop"); | |
359
100df90bf0ea
preparing to implement Export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
358
diff
changeset
|
449 statusBar.SetMessage("Use the key \"e\" to export DICOM to the Orthanc server"); |
358 | 450 statusBar.SetMessage("Use the key \"f\" to switch full screen"); |
451 statusBar.SetMessage("Use the key \"i\" to invert contrast"); | |
452 statusBar.SetMessage("Use the key \"m\" to move objects"); | |
359
100df90bf0ea
preparing to implement Export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
358
diff
changeset
|
453 statusBar.SetMessage("Use the key \"n\" to switch between nearest neighbor and bilinear interpolation"); |
358 | 454 statusBar.SetMessage("Use the key \"r\" to rotate objects"); |
407 | 455 statusBar.SetMessage("Use the key \"s\" to resize objects (not applicable to DICOM layers)"); |
358 | 456 statusBar.SetMessage("Use the key \"w\" to change windowing"); |
457 | |
458 statusBar.SetMessage("Use the key \"ctrl-z\" to undo action"); | |
459 statusBar.SetMessage("Use the key \"ctrl-y\" to redo action"); | |
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
460 |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
461 if (parameters.count("instance") != 1) |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
462 { |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
463 LOG(ERROR) << "The instance ID is missing"; |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
464 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
465 } |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
466 |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
467 std::string instance = parameters["instance"].as<std::string>(); |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
468 int frame = parameters["frame"].as<unsigned int>(); |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
469 |
430 | 470 fontRegistry_.AddFromResource(Orthanc::EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16); |
343 | 471 |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
472 scene_.reset(new RadiographyScene(GetBroker())); |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
473 //scene_->LoadDicomFrame(instance, frame, false); //.SetPan(200, 0); |
475
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
457
diff
changeset
|
474 RadiographyLayer& dicomLayer = scene_->LoadDicomFrame(context->GetOrthancApiClient(), "61f3143e-96f34791-ad6bbb8d-62559e75-45943e1b", 0, false, NULL); |
418 | 475 |
476 #if !defined(ORTHANC_ENABLE_WASM) || ORTHANC_ENABLE_WASM != 1 | |
477 Orthanc::HttpClient::ConfigureSsl(true, "/etc/ssl/certs/ca-certificates.crt"); | |
478 #endif | |
479 | |
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
480 //scene_->LoadDicomWebFrame(context->GetWebService()); |
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
481 |
475
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
457
diff
changeset
|
482 std::vector<MaskPoint> mask; |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
457
diff
changeset
|
483 mask.push_back(MaskPoint(100, 100)); |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
457
diff
changeset
|
484 mask.push_back(MaskPoint(100, 1000)); |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
457
diff
changeset
|
485 mask.push_back(MaskPoint(1000, 1000)); |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
457
diff
changeset
|
486 scene_->LoadMask(mask, dynamic_cast<RadiographyDicomLayer&>(dicomLayer), 128.0f, NULL); |
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
457
diff
changeset
|
487 |
354 | 488 { |
430 | 489 RadiographyLayer& layer = scene_->LoadText(fontRegistry_.GetFont(0), "Hello\nworld", NULL); |
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
490 layer.SetResizeable(true); |
354 | 491 } |
492 | |
493 { | |
430 | 494 RadiographyLayer& layer = scene_->LoadTestBlock(100, 50, NULL); |
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
495 layer.SetResizeable(true); |
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
496 layer.SetPan(0, 200); |
354 | 497 } |
498 | |
337 | 499 |
428
751fb354149e
ability to change the scene of the RadiographyWidget
am@osimis.io
parents:
418
diff
changeset
|
500 mainWidget_ = new RadiographyWidget(GetBroker(), scene_, "main-widget"); |
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
501 mainWidget_->SetTransmitMouseOver(true); |
358 | 502 mainWidget_->SetInteractor(interactor_); |
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
503 |
407 | 504 //scene_->SetWindowing(128, 256); |
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
505 } |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
506 }; |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
507 } |
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
508 } |