Mercurial > hg > orthanc-stone
annotate Applications/Samples/SingleFrameEditorApplication.h @ 417:aee3d7941c9b
preparing to load images using DICOMweb
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 15 Nov 2018 17:28:15 +0100 |
| parents | c0589c3173fd |
| children | c23df8b3433b |
| 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 |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium |
|
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" |
|
359
100df90bf0ea
preparing to implement Export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
358
diff
changeset
|
34 |
| 343 | 35 #include <Core/Images/FontRegistry.h> |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
36 #include <Core/Logging.h> |
| 403 | 37 #include <Core/OrthancException.h> |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
38 |
| 407 | 39 |
| 40 // Export using PAM is faster than using PNG, but requires Orthanc | |
| 41 // core >= 1.4.3 | |
|
362
12cec26d08ce
export of a valid DICOM CR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
361
diff
changeset
|
42 #define EXPORT_USING_PAM 1 |
|
12cec26d08ce
export of a valid DICOM CR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
361
diff
changeset
|
43 |
|
340
f5d5814a41a0
rendering BitmapStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
339
diff
changeset
|
44 |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
45 namespace OrthancStone |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
46 { |
| 407 | 47 namespace Samples |
| 358 | 48 { |
| 408 | 49 class RadiographyEditorInteractor : |
| 407 | 50 public IWorldSceneInteractor, |
| 51 public IObserver | |
| 358 | 52 { |
| 407 | 53 private: |
| 54 enum Tool | |
| 55 { | |
| 56 Tool_Move, | |
| 57 Tool_Rotate, | |
| 58 Tool_Crop, | |
| 59 Tool_Resize, | |
| 60 Tool_Windowing | |
| 61 }; | |
| 358 | 62 |
| 63 | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
64 StoneApplicationContext* context_; |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
65 UndoRedoStack undoRedoStack_; |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
66 Tool tool_; |
| 407 | 67 |
| 68 | |
| 69 static double GetHandleSize() | |
| 70 { | |
| 71 return 10.0; | |
| 72 } | |
| 358 | 73 |
|
384
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
74 |
| 407 | 75 public: |
| 408 | 76 RadiographyEditorInteractor(MessageBroker& broker) : |
| 407 | 77 IObserver(broker), |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
78 context_(NULL), |
| 407 | 79 tool_(Tool_Move) |
| 80 { | |
| 81 } | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
82 |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
83 void SetContext(StoneApplicationContext& context) |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
84 { |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
85 context_ = &context; |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
86 } |
| 358 | 87 |
| 407 | 88 virtual IWorldSceneMouseTracker* CreateMouseTracker(WorldSceneWidget& worldWidget, |
| 89 const ViewportGeometry& view, | |
| 90 MouseButton button, | |
| 91 KeyboardModifiers modifiers, | |
| 92 int viewportX, | |
| 93 int viewportY, | |
| 94 double x, | |
| 95 double y, | |
| 96 IStatusBar* statusBar) | |
|
357
ec4ad6c5eb99
avoid breaking class hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
356
diff
changeset
|
97 { |
| 408 | 98 RadiographyWidget& widget = dynamic_cast<RadiographyWidget&>(worldWidget); |
| 407 | 99 |
| 100 if (button == MouseButton_Left) | |
| 358 | 101 { |
| 407 | 102 size_t selected; |
| 103 | |
| 104 if (tool_ == Tool_Windowing) | |
| 358 | 105 { |
| 408 | 106 return new RadiographyWindowingTracker( |
| 107 undoRedoStack_, widget.GetScene(), | |
| 108 viewportX, viewportY, | |
| 109 RadiographyWindowingTracker::Action_DecreaseWidth, | |
| 110 RadiographyWindowingTracker::Action_IncreaseWidth, | |
| 111 RadiographyWindowingTracker::Action_DecreaseCenter, | |
| 112 RadiographyWindowingTracker::Action_IncreaseCenter); | |
| 358 | 113 } |
| 407 | 114 else if (!widget.LookupSelectedLayer(selected)) |
| 358 | 115 { |
| 407 | 116 // No layer is currently selected |
| 117 size_t layer; | |
| 118 if (widget.GetScene().LookupLayer(layer, x, y)) | |
| 358 | 119 { |
| 407 | 120 widget.Select(layer); |
| 358 | 121 } |
| 407 | 122 |
| 123 return NULL; | |
| 358 | 124 } |
| 407 | 125 else if (tool_ == Tool_Crop || |
| 126 tool_ == Tool_Resize) | |
| 358 | 127 { |
| 408 | 128 RadiographyScene::LayerAccessor accessor(widget.GetScene(), selected); |
|
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
129 |
|
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
130 Corner corner; |
| 407 | 131 if (accessor.GetLayer().LookupCorner(corner, x, y, view.GetZoom(), GetHandleSize())) |
| 358 | 132 { |
| 407 | 133 switch (tool_) |
| 134 { | |
| 135 case Tool_Crop: | |
| 408 | 136 return new RadiographyLayerCropTracker |
| 137 (undoRedoStack_, widget.GetScene(), view, selected, x, y, corner); | |
| 407 | 138 |
| 139 case Tool_Resize: | |
| 408 | 140 return new RadiographyLayerResizeTracker |
| 141 (undoRedoStack_, widget.GetScene(), selected, x, y, corner, | |
| 142 (modifiers & KeyboardModifiers_Shift)); | |
| 407 | 143 |
| 144 default: | |
| 145 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 146 } | |
|
384
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
147 } |
|
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
148 else |
|
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
149 { |
| 407 | 150 size_t layer; |
| 358 | 151 |
| 407 | 152 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
|
153 { |
| 407 | 154 widget.Select(layer); |
|
384
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
155 } |
| 407 | 156 else |
| 157 { | |
| 158 widget.Unselect(); | |
| 159 } | |
| 160 | |
|
384
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
161 return NULL; |
|
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
162 } |
| 358 | 163 } |
| 164 else | |
| 165 { | |
| 407 | 166 size_t layer; |
| 167 | |
| 168 if (widget.GetScene().LookupLayer(layer, x, y)) | |
| 169 { | |
| 170 if (layer == selected) | |
| 171 { | |
| 172 switch (tool_) | |
| 173 { | |
| 174 case Tool_Move: | |
| 408 | 175 return new RadiographyLayerMoveTracker |
| 176 (undoRedoStack_, widget.GetScene(), layer, x, y, | |
| 177 (modifiers & KeyboardModifiers_Shift)); | |
| 407 | 178 |
| 179 case Tool_Rotate: | |
| 408 | 180 return new RadiographyLayerRotateTracker |
| 181 (undoRedoStack_, widget.GetScene(), view, layer, x, y, | |
| 182 (modifiers & KeyboardModifiers_Shift)); | |
| 407 | 183 |
| 184 default: | |
| 185 break; | |
| 186 } | |
| 187 | |
| 188 return NULL; | |
| 189 } | |
| 190 else | |
| 191 { | |
| 192 widget.Select(layer); | |
| 193 return NULL; | |
| 194 } | |
| 195 } | |
| 196 else | |
| 197 { | |
| 198 widget.Unselect(); | |
| 199 return NULL; | |
| 200 } | |
| 201 } | |
| 202 } | |
| 203 else | |
| 204 { | |
| 205 return NULL; | |
| 206 } | |
| 207 } | |
| 208 | |
| 209 virtual void MouseOver(CairoContext& context, | |
| 210 WorldSceneWidget& worldWidget, | |
| 211 const ViewportGeometry& view, | |
| 212 double x, | |
| 213 double y, | |
| 214 IStatusBar* statusBar) | |
| 215 { | |
| 408 | 216 RadiographyWidget& widget = dynamic_cast<RadiographyWidget&>(worldWidget); |
| 407 | 217 |
| 218 #if 0 | |
| 219 if (statusBar != NULL) | |
| 220 { | |
| 221 char buf[64]; | |
| 222 sprintf(buf, "X = %.02f Y = %.02f (in cm)", x / 10.0, y / 10.0); | |
| 223 statusBar->SetMessage(buf); | |
| 224 } | |
| 225 #endif | |
| 226 | |
| 227 size_t selected; | |
| 228 | |
| 229 if (widget.LookupSelectedLayer(selected) && | |
| 230 (tool_ == Tool_Crop || | |
| 231 tool_ == Tool_Resize)) | |
| 232 { | |
| 408 | 233 RadiographyScene::LayerAccessor accessor(widget.GetScene(), selected); |
| 407 | 234 |
|
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
235 Corner corner; |
| 407 | 236 if (accessor.GetLayer().LookupCorner(corner, x, y, view.GetZoom(), GetHandleSize())) |
| 237 { | |
| 238 accessor.GetLayer().GetCorner(x, y, corner); | |
| 239 | |
| 240 double z = 1.0 / view.GetZoom(); | |
| 241 | |
| 242 context.SetSourceColor(255, 0, 0); | |
| 243 cairo_t* cr = context.GetObject(); | |
| 244 cairo_set_line_width(cr, 2.0 * z); | |
| 245 cairo_move_to(cr, x - GetHandleSize() * z, y - GetHandleSize() * z); | |
| 246 cairo_line_to(cr, x + GetHandleSize() * z, y - GetHandleSize() * z); | |
| 247 cairo_line_to(cr, x + GetHandleSize() * z, y + GetHandleSize() * z); | |
| 248 cairo_line_to(cr, x - GetHandleSize() * z, y + GetHandleSize() * z); | |
| 249 cairo_line_to(cr, x - GetHandleSize() * z, y - GetHandleSize() * z); | |
| 250 cairo_stroke(cr); | |
| 358 | 251 } |
| 252 } | |
| 339 | 253 } |
| 407 | 254 |
| 255 virtual void MouseWheel(WorldSceneWidget& widget, | |
| 256 MouseWheelDirection direction, | |
| 257 KeyboardModifiers modifiers, | |
| 258 IStatusBar* statusBar) | |
|
344
fdec8e6893cb
ordering of bitmap layers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
343
diff
changeset
|
259 { |
| 358 | 260 } |
| 407 | 261 |
| 262 virtual void KeyPressed(WorldSceneWidget& worldWidget, | |
| 263 KeyboardKeys key, | |
| 264 char keyChar, | |
| 265 KeyboardModifiers modifiers, | |
| 266 IStatusBar* statusBar) | |
| 345 | 267 { |
| 408 | 268 RadiographyWidget& widget = dynamic_cast<RadiographyWidget&>(worldWidget); |
| 407 | 269 |
| 270 switch (keyChar) | |
| 358 | 271 { |
| 407 | 272 case 'a': |
| 273 widget.FitContent(); | |
| 274 break; | |
| 275 | |
| 276 case 'c': | |
| 277 tool_ = Tool_Crop; | |
| 278 break; | |
| 279 | |
| 280 case 'e': | |
| 281 { | |
| 282 Orthanc::DicomMap tags; | |
| 283 | |
| 284 // Minimal set of tags to generate a valid CR image | |
| 285 tags.SetValue(Orthanc::DICOM_TAG_ACCESSION_NUMBER, "NOPE", false); | |
| 286 tags.SetValue(Orthanc::DICOM_TAG_BODY_PART_EXAMINED, "PELVIS", false); | |
| 287 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "1", false); | |
| 288 //tags.SetValue(Orthanc::DICOM_TAG_LATERALITY, "", false); | |
| 289 tags.SetValue(Orthanc::DICOM_TAG_MANUFACTURER, "OSIMIS", false); | |
| 290 tags.SetValue(Orthanc::DICOM_TAG_MODALITY, "CR", false); | |
| 291 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_BIRTH_DATE, "20000101", false); | |
| 292 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_ID, "hello", false); | |
| 293 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_NAME, "HELLO^WORLD", false); | |
| 294 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_ORIENTATION, "", false); | |
| 295 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_SEX, "M", false); | |
| 296 tags.SetValue(Orthanc::DICOM_TAG_REFERRING_PHYSICIAN_NAME, "HOUSE^MD", false); | |
| 297 tags.SetValue(Orthanc::DICOM_TAG_SERIES_NUMBER, "1", false); | |
| 298 tags.SetValue(Orthanc::DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.1", false); | |
| 299 tags.SetValue(Orthanc::DICOM_TAG_STUDY_ID, "STUDY", false); | |
| 300 tags.SetValue(Orthanc::DICOM_TAG_VIEW_POSITION, "", false); | |
| 301 | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
302 if (context_ != NULL) |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
303 { |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
304 widget.GetScene().ExportDicom(context_->GetOrthancApiClient(), |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
305 tags, 0.1, 0.1, widget.IsInverted(), |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
306 widget.GetInterpolation(), EXPORT_USING_PAM); |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
307 } |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
308 |
| 407 | 309 break; |
| 310 } | |
| 311 | |
| 312 case 'i': | |
| 313 widget.SwitchInvert(); | |
| 314 break; | |
| 315 | |
| 316 case 'm': | |
| 317 tool_ = Tool_Move; | |
| 318 break; | |
| 319 | |
| 320 case 'n': | |
| 321 { | |
| 322 switch (widget.GetInterpolation()) | |
| 323 { | |
| 324 case ImageInterpolation_Nearest: | |
| 325 LOG(INFO) << "Switching to bilinear interpolation"; | |
| 326 widget.SetInterpolation(ImageInterpolation_Bilinear); | |
| 327 break; | |
| 328 | |
| 329 case ImageInterpolation_Bilinear: | |
| 330 LOG(INFO) << "Switching to nearest neighbor interpolation"; | |
| 331 widget.SetInterpolation(ImageInterpolation_Nearest); | |
| 332 break; | |
| 333 | |
| 334 default: | |
| 335 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 336 } | |
| 358 | 337 |
| 407 | 338 break; |
| 339 } | |
| 340 | |
| 341 case 'r': | |
| 342 tool_ = Tool_Rotate; | |
| 343 break; | |
| 344 | |
| 345 case 's': | |
| 346 tool_ = Tool_Resize; | |
| 347 break; | |
| 348 | |
| 349 case 'w': | |
| 350 tool_ = Tool_Windowing; | |
| 351 break; | |
| 352 | |
| 353 case 'y': | |
| 354 if (modifiers & KeyboardModifiers_Control) | |
| 355 { | |
| 356 undoRedoStack_.Redo(); | |
| 357 widget.NotifyContentChanged(); | |
| 358 } | |
| 359 break; | |
| 360 | |
| 361 case 'z': | |
| 362 if (modifiers & KeyboardModifiers_Control) | |
| 363 { | |
| 364 undoRedoStack_.Undo(); | |
| 365 widget.NotifyContentChanged(); | |
| 366 } | |
| 367 break; | |
| 368 | |
| 369 default: | |
| 370 break; | |
| 358 | 371 } |
| 345 | 372 } |
| 407 | 373 }; |
|
336
c7fdc8bac581
creating GrayscaleBitmapStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
374 |
|
c7fdc8bac581
creating GrayscaleBitmapStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
375 |
| 358 | 376 |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
377 class SingleFrameEditorApplication : |
|
340
f5d5814a41a0
rendering BitmapStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
339
diff
changeset
|
378 public SampleSingleCanvasApplicationBase, |
|
f5d5814a41a0
rendering BitmapStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
339
diff
changeset
|
379 public IObserver |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
380 { |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
381 private: |
| 408 | 382 std::auto_ptr<RadiographyScene> scene_; |
| 383 RadiographyEditorInteractor interactor_; | |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
384 |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
385 public: |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
386 SingleFrameEditorApplication(MessageBroker& broker) : |
|
362
12cec26d08ce
export of a valid DICOM CR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
361
diff
changeset
|
387 IObserver(broker), |
|
12cec26d08ce
export of a valid DICOM CR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
361
diff
changeset
|
388 interactor_(broker) |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
389 { |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
390 } |
|
384
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
391 |
|
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
392 virtual ~SingleFrameEditorApplication() |
|
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
393 { |
|
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
394 LOG(WARNING) << "Destroying the application"; |
|
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
395 } |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
396 |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
397 virtual void DeclareStartupOptions(boost::program_options::options_description& options) |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
398 { |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
399 boost::program_options::options_description generic("Sample options"); |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
400 generic.add_options() |
|
340
f5d5814a41a0
rendering BitmapStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
339
diff
changeset
|
401 ("instance", boost::program_options::value<std::string>(), |
|
f5d5814a41a0
rendering BitmapStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
339
diff
changeset
|
402 "Orthanc ID of the instance") |
|
f5d5814a41a0
rendering BitmapStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
339
diff
changeset
|
403 ("frame", boost::program_options::value<unsigned int>()->default_value(0), |
|
f5d5814a41a0
rendering BitmapStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
339
diff
changeset
|
404 "Number of the frame, for multi-frame DICOM instances") |
|
f5d5814a41a0
rendering BitmapStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
339
diff
changeset
|
405 ; |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
406 |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
407 options.add(generic); |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
408 } |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
409 |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
410 virtual void Initialize(StoneApplicationContext* context, |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
411 IStatusBar& statusBar, |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
412 const boost::program_options::variables_map& parameters) |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
413 { |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
414 using namespace OrthancStone; |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
415 |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
416 context_ = context; |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
417 interactor_.SetContext(*context); |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
418 |
| 358 | 419 statusBar.SetMessage("Use the key \"a\" to reinitialize the layout"); |
| 420 statusBar.SetMessage("Use the key \"c\" to crop"); | |
|
359
100df90bf0ea
preparing to implement Export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
358
diff
changeset
|
421 statusBar.SetMessage("Use the key \"e\" to export DICOM to the Orthanc server"); |
| 358 | 422 statusBar.SetMessage("Use the key \"f\" to switch full screen"); |
| 423 statusBar.SetMessage("Use the key \"i\" to invert contrast"); | |
| 424 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
|
425 statusBar.SetMessage("Use the key \"n\" to switch between nearest neighbor and bilinear interpolation"); |
| 358 | 426 statusBar.SetMessage("Use the key \"r\" to rotate objects"); |
| 407 | 427 statusBar.SetMessage("Use the key \"s\" to resize objects (not applicable to DICOM layers)"); |
| 358 | 428 statusBar.SetMessage("Use the key \"w\" to change windowing"); |
| 429 | |
| 430 statusBar.SetMessage("Use the key \"ctrl-z\" to undo action"); | |
| 431 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
|
432 |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
433 if (parameters.count("instance") != 1) |
|
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 LOG(ERROR) << "The instance ID is missing"; |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
436 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
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 |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
439 std::string instance = parameters["instance"].as<std::string>(); |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
440 int frame = parameters["frame"].as<unsigned int>(); |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
441 |
| 343 | 442 Orthanc::FontRegistry fonts; |
| 443 fonts.AddFromResource(Orthanc::EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16); | |
| 444 | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
445 scene_.reset(new RadiographyScene(GetBroker())); |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
446 //scene_->LoadDicomFrame(instance, frame, false); //.SetPan(200, 0); |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
447 scene_->LoadDicomFrame(context->GetOrthancApiClient(), "61f3143e-96f34791-ad6bbb8d-62559e75-45943e1b", 0, false); |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
448 //scene_->LoadDicomWebFrame(context->GetWebService()); |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
449 |
| 354 | 450 { |
|
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
451 RadiographyLayer& layer = scene_->LoadText(fonts.GetFont(0), "Hello\nworld"); |
|
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
452 layer.SetResizeable(true); |
| 354 | 453 } |
| 454 | |
| 455 { | |
|
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
456 RadiographyLayer& layer = scene_->LoadTestBlock(100, 50); |
|
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
457 layer.SetResizeable(true); |
|
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
458 layer.SetPan(0, 200); |
| 354 | 459 } |
| 460 | |
| 337 | 461 |
| 408 | 462 mainWidget_ = new RadiographyWidget(GetBroker(), *scene_, "main-widget"); |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
463 mainWidget_->SetTransmitMouseOver(true); |
| 358 | 464 mainWidget_->SetInteractor(interactor_); |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
465 |
| 407 | 466 //scene_->SetWindowing(128, 256); |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
467 } |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
468 }; |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
469 } |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
470 } |