Mercurial > hg > orthanc-stone
annotate Applications/Samples/SingleFrameEditorApplication.h @ 476:a95090305dd4 am-touch-events
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
| author | am@osimis.io |
|---|---|
| date | Wed, 13 Feb 2019 12:04:02 +0100 |
| parents | 3c28542229a3 |
| children | 2f6ecb5037ea |
| 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, | |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
64 Tool_Mask, |
| 407 | 65 Tool_Windowing |
| 66 }; | |
| 430 | 67 |
| 358 | 68 |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
69 StoneApplicationContext* context_; |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
70 UndoRedoStack undoRedoStack_; |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
71 Tool tool_; |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
72 RadiographyMaskLayer* maskLayer_; |
| 407 | 73 |
| 74 | |
| 75 static double GetHandleSize() | |
| 76 { | |
| 77 return 10.0; | |
| 78 } | |
| 430 | 79 |
| 80 | |
| 407 | 81 public: |
| 408 | 82 RadiographyEditorInteractor(MessageBroker& broker) : |
| 407 | 83 IObserver(broker), |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
84 context_(NULL), |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
85 tool_(Tool_Move), |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
86 maskLayer_(NULL) |
| 407 | 87 { |
| 88 } | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
89 |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
90 void SetContext(StoneApplicationContext& context) |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
91 { |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
92 context_ = &context; |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
93 } |
| 430 | 94 |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
95 void SetMaskLayer(RadiographyMaskLayer* maskLayer) |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
96 { |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
97 maskLayer_ = maskLayer; |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
98 } |
| 407 | 99 virtual IWorldSceneMouseTracker* CreateMouseTracker(WorldSceneWidget& worldWidget, |
| 100 const ViewportGeometry& view, | |
| 101 MouseButton button, | |
| 102 KeyboardModifiers modifiers, | |
| 103 int viewportX, | |
| 104 int viewportY, | |
| 105 double x, | |
| 106 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
|
107 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
|
108 const std::vector<Touch>& displayTouches) |
|
357
ec4ad6c5eb99
avoid breaking class hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
356
diff
changeset
|
109 { |
| 408 | 110 RadiographyWidget& widget = dynamic_cast<RadiographyWidget&>(worldWidget); |
| 407 | 111 |
| 112 if (button == MouseButton_Left) | |
| 358 | 113 { |
| 407 | 114 size_t selected; |
| 430 | 115 |
| 407 | 116 if (tool_ == Tool_Windowing) |
| 358 | 117 { |
| 408 | 118 return new RadiographyWindowingTracker( |
| 430 | 119 undoRedoStack_, widget.GetScene(), |
| 120 viewportX, viewportY, | |
| 121 RadiographyWindowingTracker::Action_DecreaseWidth, | |
| 122 RadiographyWindowingTracker::Action_IncreaseWidth, | |
| 123 RadiographyWindowingTracker::Action_DecreaseCenter, | |
| 124 RadiographyWindowingTracker::Action_IncreaseCenter); | |
| 358 | 125 } |
| 407 | 126 else if (!widget.LookupSelectedLayer(selected)) |
| 358 | 127 { |
| 407 | 128 // No layer is currently selected |
| 129 size_t layer; | |
| 130 if (widget.GetScene().LookupLayer(layer, x, y)) | |
| 358 | 131 { |
| 407 | 132 widget.Select(layer); |
| 358 | 133 } |
| 407 | 134 |
| 135 return NULL; | |
| 358 | 136 } |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
137 else if (tool_ == Tool_Mask) |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
138 { |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
139 // maskLayer_ |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
140 // case Tool_Mask: |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
141 // return new RadiographyLayerMaskTracker |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
142 // (undoRedoStack_, widget.GetScene(), view, selected, x, y, corner); |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
143 return NULL; |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
144 } |
| 407 | 145 else if (tool_ == Tool_Crop || |
| 146 tool_ == Tool_Resize) | |
| 358 | 147 { |
| 408 | 148 RadiographyScene::LayerAccessor accessor(widget.GetScene(), selected); |
|
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
149 |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
150 ControlPoint controlPoint; |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
151 if (accessor.GetLayer().LookupControlPoint(controlPoint, x, y, view.GetZoom(), GetHandleSize())) |
| 358 | 152 { |
| 407 | 153 switch (tool_) |
| 154 { | |
| 430 | 155 case Tool_Crop: |
| 156 return new RadiographyLayerCropTracker | |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
157 (undoRedoStack_, widget.GetScene(), view, selected, controlPoint); |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
158 |
| 407 | 159 |
| 430 | 160 case Tool_Resize: |
| 161 return new RadiographyLayerResizeTracker | |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
162 (undoRedoStack_, widget.GetScene(), selected, controlPoint, |
| 408 | 163 (modifiers & KeyboardModifiers_Shift)); |
| 407 | 164 |
| 430 | 165 default: |
| 166 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 407 | 167 } |
|
384
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
168 } |
|
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
169 else |
|
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
170 { |
| 407 | 171 size_t layer; |
| 430 | 172 |
| 407 | 173 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
|
174 { |
| 407 | 175 widget.Select(layer); |
|
384
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
176 } |
| 407 | 177 else |
| 178 { | |
| 179 widget.Unselect(); | |
| 180 } | |
| 430 | 181 |
|
384
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
182 return NULL; |
|
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
183 } |
| 358 | 184 } |
| 185 else | |
| 186 { | |
| 407 | 187 size_t layer; |
| 188 | |
| 189 if (widget.GetScene().LookupLayer(layer, x, y)) | |
| 190 { | |
| 191 if (layer == selected) | |
| 192 { | |
| 193 switch (tool_) | |
| 194 { | |
| 430 | 195 case Tool_Move: |
| 196 return new RadiographyLayerMoveTracker | |
| 408 | 197 (undoRedoStack_, widget.GetScene(), layer, x, y, |
| 198 (modifiers & KeyboardModifiers_Shift)); | |
| 407 | 199 |
| 430 | 200 case Tool_Rotate: |
| 201 return new RadiographyLayerRotateTracker | |
| 408 | 202 (undoRedoStack_, widget.GetScene(), view, layer, x, y, |
| 203 (modifiers & KeyboardModifiers_Shift)); | |
| 430 | 204 |
| 205 default: | |
| 206 break; | |
| 407 | 207 } |
| 208 | |
| 209 return NULL; | |
| 210 } | |
| 211 else | |
| 212 { | |
| 213 widget.Select(layer); | |
| 214 return NULL; | |
| 215 } | |
| 216 } | |
| 217 else | |
| 218 { | |
| 219 widget.Unselect(); | |
| 220 return NULL; | |
| 221 } | |
| 222 } | |
| 223 } | |
| 224 else | |
| 225 { | |
| 226 return NULL; | |
| 227 } | |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
228 return NULL; |
| 407 | 229 } |
| 230 | |
| 231 virtual void MouseOver(CairoContext& context, | |
| 232 WorldSceneWidget& worldWidget, | |
| 233 const ViewportGeometry& view, | |
| 234 double x, | |
| 235 double y, | |
| 236 IStatusBar* statusBar) | |
| 237 { | |
| 408 | 238 RadiographyWidget& widget = dynamic_cast<RadiographyWidget&>(worldWidget); |
| 407 | 239 |
| 240 #if 0 | |
| 241 if (statusBar != NULL) | |
| 242 { | |
| 243 char buf[64]; | |
| 244 sprintf(buf, "X = %.02f Y = %.02f (in cm)", x / 10.0, y / 10.0); | |
| 245 statusBar->SetMessage(buf); | |
| 246 } | |
| 247 #endif | |
| 248 | |
| 249 size_t selected; | |
| 250 | |
| 251 if (widget.LookupSelectedLayer(selected) && | |
| 252 (tool_ == Tool_Crop || | |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
253 tool_ == Tool_Resize) || |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
254 tool_ == Tool_Mask) |
| 407 | 255 { |
| 408 | 256 RadiographyScene::LayerAccessor accessor(widget.GetScene(), selected); |
| 430 | 257 |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
258 ControlPoint controlPoint; |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
259 if (accessor.GetLayer().LookupControlPoint(controlPoint, x, y, view.GetZoom(), GetHandleSize())) |
| 407 | 260 { |
| 261 double z = 1.0 / view.GetZoom(); | |
| 430 | 262 |
| 407 | 263 context.SetSourceColor(255, 0, 0); |
| 264 cairo_t* cr = context.GetObject(); | |
| 265 cairo_set_line_width(cr, 2.0 * z); | |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
266 cairo_move_to(cr, controlPoint.x - GetHandleSize() * z, controlPoint.y - GetHandleSize() * z); |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
267 cairo_line_to(cr, controlPoint.x + GetHandleSize() * z, controlPoint.y - GetHandleSize() * z); |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
268 cairo_line_to(cr, controlPoint.x + GetHandleSize() * z, controlPoint.y + GetHandleSize() * z); |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
269 cairo_line_to(cr, controlPoint.x - GetHandleSize() * z, controlPoint.y + GetHandleSize() * z); |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
270 cairo_line_to(cr, controlPoint.x - GetHandleSize() * z, controlPoint.y - GetHandleSize() * z); |
| 407 | 271 cairo_stroke(cr); |
| 358 | 272 } |
| 273 } | |
| 339 | 274 } |
| 407 | 275 |
| 276 virtual void MouseWheel(WorldSceneWidget& widget, | |
| 277 MouseWheelDirection direction, | |
| 278 KeyboardModifiers modifiers, | |
| 279 IStatusBar* statusBar) | |
|
344
fdec8e6893cb
ordering of bitmap layers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
343
diff
changeset
|
280 { |
| 358 | 281 } |
| 407 | 282 |
| 283 virtual void KeyPressed(WorldSceneWidget& worldWidget, | |
| 284 KeyboardKeys key, | |
| 285 char keyChar, | |
| 286 KeyboardModifiers modifiers, | |
| 287 IStatusBar* statusBar) | |
| 345 | 288 { |
| 408 | 289 RadiographyWidget& widget = dynamic_cast<RadiographyWidget&>(worldWidget); |
| 407 | 290 |
| 291 switch (keyChar) | |
| 358 | 292 { |
| 430 | 293 case 'a': |
| 294 widget.FitContent(); | |
| 295 break; | |
| 296 | |
| 297 case 'c': | |
| 298 tool_ = Tool_Crop; | |
| 299 break; | |
| 407 | 300 |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
301 case 'm': |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
302 tool_ = Tool_Mask; |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
303 widget.Select(1); |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
304 break; |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
305 |
| 430 | 306 case 'd': |
| 307 { | |
| 308 // dump to json and reload | |
| 309 Json::Value snapshot; | |
| 310 RadiographySceneWriter writer; | |
| 311 writer.Write(snapshot, widget.GetScene()); | |
| 407 | 312 |
| 430 | 313 LOG(INFO) << "JSON export was successful: " |
| 314 << snapshot.toStyledString(); | |
| 315 | |
| 316 boost::shared_ptr<RadiographyScene> scene(new RadiographyScene(GetBroker())); | |
| 317 RadiographySceneReader reader(*scene, context_->GetOrthancApiClient()); | |
| 318 | |
| 319 Orthanc::FontRegistry fontRegistry; | |
| 320 fontRegistry.AddFromResource(Orthanc::EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16); | |
| 321 | |
| 322 reader.SetFontRegistry(fontRegistry); | |
| 323 reader.Read(snapshot); | |
| 407 | 324 |
| 430 | 325 widget.SetScene(scene); |
| 326 };break; | |
| 327 | |
| 328 case 'e': | |
| 329 { | |
| 330 Orthanc::DicomMap tags; | |
| 407 | 331 |
| 430 | 332 // Minimal set of tags to generate a valid CR image |
| 333 tags.SetValue(Orthanc::DICOM_TAG_ACCESSION_NUMBER, "NOPE", false); | |
| 334 tags.SetValue(Orthanc::DICOM_TAG_BODY_PART_EXAMINED, "PELVIS", false); | |
| 335 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "1", false); | |
| 336 //tags.SetValue(Orthanc::DICOM_TAG_LATERALITY, "", false); | |
| 337 tags.SetValue(Orthanc::DICOM_TAG_MANUFACTURER, "OSIMIS", false); | |
| 338 tags.SetValue(Orthanc::DICOM_TAG_MODALITY, "CR", false); | |
| 339 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_BIRTH_DATE, "20000101", false); | |
| 340 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_ID, "hello", false); | |
| 341 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_NAME, "HELLO^WORLD", false); | |
| 342 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_ORIENTATION, "", false); | |
| 343 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_SEX, "M", false); | |
| 344 tags.SetValue(Orthanc::DICOM_TAG_REFERRING_PHYSICIAN_NAME, "HOUSE^MD", false); | |
| 345 tags.SetValue(Orthanc::DICOM_TAG_SERIES_NUMBER, "1", false); | |
| 346 tags.SetValue(Orthanc::DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.1", false); | |
| 347 tags.SetValue(Orthanc::DICOM_TAG_STUDY_ID, "STUDY", false); | |
| 348 tags.SetValue(Orthanc::DICOM_TAG_VIEW_POSITION, "", false); | |
| 349 | |
| 350 if (context_ != NULL) | |
| 351 { | |
| 352 widget.GetScene().ExportDicom(context_->GetOrthancApiClient(), | |
| 353 tags, std::string(), 0.1, 0.1, widget.IsInverted(), | |
| 354 widget.GetInterpolation(), EXPORT_USING_PAM); | |
| 407 | 355 } |
| 356 | |
| 430 | 357 break; |
| 358 } | |
| 359 | |
| 360 case 'i': | |
| 361 widget.SwitchInvert(); | |
| 362 break; | |
| 363 | |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
364 case 't': |
| 430 | 365 tool_ = Tool_Move; |
| 366 break; | |
| 367 | |
| 368 case 'n': | |
| 369 { | |
| 370 switch (widget.GetInterpolation()) | |
| 371 { | |
| 372 case ImageInterpolation_Nearest: | |
| 373 LOG(INFO) << "Switching to bilinear interpolation"; | |
| 374 widget.SetInterpolation(ImageInterpolation_Bilinear); | |
| 407 | 375 break; |
| 376 | |
| 430 | 377 case ImageInterpolation_Bilinear: |
| 378 LOG(INFO) << "Switching to nearest neighbor interpolation"; | |
| 379 widget.SetInterpolation(ImageInterpolation_Nearest); | |
| 407 | 380 break; |
| 381 | |
| 430 | 382 default: |
| 383 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 384 } | |
| 385 | |
| 386 break; | |
| 387 } | |
| 407 | 388 |
| 430 | 389 case 'r': |
| 390 tool_ = Tool_Rotate; | |
| 391 break; | |
| 392 | |
| 393 case 's': | |
| 394 tool_ = Tool_Resize; | |
| 395 break; | |
| 396 | |
| 397 case 'w': | |
| 398 tool_ = Tool_Windowing; | |
| 399 break; | |
| 407 | 400 |
| 430 | 401 case 'y': |
| 402 if (modifiers & KeyboardModifiers_Control) | |
| 403 { | |
| 404 undoRedoStack_.Redo(); | |
| 405 widget.NotifyContentChanged(); | |
| 406 } | |
| 407 break; | |
| 407 | 408 |
| 430 | 409 case 'z': |
| 410 if (modifiers & KeyboardModifiers_Control) | |
| 411 { | |
| 412 undoRedoStack_.Undo(); | |
| 413 widget.NotifyContentChanged(); | |
| 414 } | |
| 415 break; | |
| 416 | |
| 417 default: | |
| 418 break; | |
| 358 | 419 } |
| 345 | 420 } |
| 407 | 421 }; |
|
336
c7fdc8bac581
creating GrayscaleBitmapStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
334
diff
changeset
|
422 |
| 430 | 423 |
| 424 | |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
425 class SingleFrameEditorApplication : |
| 430 | 426 public SampleSingleCanvasApplicationBase, |
| 427 public IObserver | |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
428 { |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
429 private: |
| 430 | 430 boost::shared_ptr<RadiographyScene> scene_; |
| 431 RadiographyEditorInteractor interactor_; | |
| 432 Orthanc::FontRegistry fontRegistry_; | |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
433 RadiographyMaskLayer* maskLayer_; |
|
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 public: |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
436 SingleFrameEditorApplication(MessageBroker& broker) : |
|
362
12cec26d08ce
export of a valid DICOM CR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
361
diff
changeset
|
437 IObserver(broker), |
|
12cec26d08ce
export of a valid DICOM CR
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
361
diff
changeset
|
438 interactor_(broker) |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
439 { |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
440 } |
|
384
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
441 |
|
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
442 virtual ~SingleFrameEditorApplication() |
|
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
443 { |
|
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
444 LOG(WARNING) << "Destroying the application"; |
|
d20d75f20c5d
better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
377
diff
changeset
|
445 } |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
446 |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
447 virtual void DeclareStartupOptions(boost::program_options::options_description& options) |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
448 { |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
449 boost::program_options::options_description generic("Sample options"); |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
450 generic.add_options() |
| 430 | 451 ("instance", boost::program_options::value<std::string>(), |
| 452 "Orthanc ID of the instance") | |
| 453 ("frame", boost::program_options::value<unsigned int>()->default_value(0), | |
| 454 "Number of the frame, for multi-frame DICOM instances") | |
| 455 ; | |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
456 |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
457 options.add(generic); |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
458 } |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
459 |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
460 virtual void Initialize(StoneApplicationContext* context, |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
461 IStatusBar& statusBar, |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
462 const boost::program_options::variables_map& parameters) |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
463 { |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
464 using namespace OrthancStone; |
|
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 context_ = context; |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
467 interactor_.SetContext(*context); |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
468 |
| 358 | 469 statusBar.SetMessage("Use the key \"a\" to reinitialize the layout"); |
| 470 statusBar.SetMessage("Use the key \"c\" to crop"); | |
|
359
100df90bf0ea
preparing to implement Export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
358
diff
changeset
|
471 statusBar.SetMessage("Use the key \"e\" to export DICOM to the Orthanc server"); |
| 358 | 472 statusBar.SetMessage("Use the key \"f\" to switch full screen"); |
| 473 statusBar.SetMessage("Use the key \"i\" to invert contrast"); | |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
474 statusBar.SetMessage("Use the key \"m\" to modify the mask"); |
|
359
100df90bf0ea
preparing to implement Export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
358
diff
changeset
|
475 statusBar.SetMessage("Use the key \"n\" to switch between nearest neighbor and bilinear interpolation"); |
| 358 | 476 statusBar.SetMessage("Use the key \"r\" to rotate objects"); |
| 407 | 477 statusBar.SetMessage("Use the key \"s\" to resize objects (not applicable to DICOM layers)"); |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
478 statusBar.SetMessage("Use the key \"t\" to move (translate) objects"); |
| 358 | 479 statusBar.SetMessage("Use the key \"w\" to change windowing"); |
| 480 | |
| 481 statusBar.SetMessage("Use the key \"ctrl-z\" to undo action"); | |
| 482 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
|
483 |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
484 if (parameters.count("instance") != 1) |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
485 { |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
486 LOG(ERROR) << "The instance ID is missing"; |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
487 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
488 } |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
489 |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
490 std::string instance = parameters["instance"].as<std::string>(); |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
491 int frame = parameters["frame"].as<unsigned int>(); |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
492 |
| 430 | 493 fontRegistry_.AddFromResource(Orthanc::EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16); |
| 343 | 494 |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
495 scene_.reset(new RadiographyScene(GetBroker())); |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
496 //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
|
497 RadiographyLayer& dicomLayer = scene_->LoadDicomFrame(context->GetOrthancApiClient(), "61f3143e-96f34791-ad6bbb8d-62559e75-45943e1b", 0, false, NULL); |
| 418 | 498 |
| 499 #if !defined(ORTHANC_ENABLE_WASM) || ORTHANC_ENABLE_WASM != 1 | |
| 500 Orthanc::HttpClient::ConfigureSsl(true, "/etc/ssl/certs/ca-certificates.crt"); | |
| 501 #endif | |
| 502 | |
|
417
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
503 //scene_->LoadDicomWebFrame(context->GetWebService()); |
|
aee3d7941c9b
preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
415
diff
changeset
|
504 |
|
475
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
457
diff
changeset
|
505 std::vector<MaskPoint> mask; |
|
476
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
506 mask.push_back(MaskPoint(1100, 100)); |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
507 mask.push_back(MaskPoint(1100, 1000)); |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
508 mask.push_back(MaskPoint(2000, 1000)); |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
509 mask.push_back(MaskPoint(2200, 150)); |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
510 mask.push_back(MaskPoint(1500, 550)); |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
511 maskLayer_ = dynamic_cast<RadiographyMaskLayer*>(&(scene_->LoadMask(mask, dynamic_cast<RadiographyDicomLayer&>(dicomLayer), 128.0f, NULL))); |
|
a95090305dd4
Introduced ControlPoint instead of Corner in the trackers and layers + drawing mask from the ControlPoints
am@osimis.io
parents:
475
diff
changeset
|
512 interactor_.SetMaskLayer(maskLayer_); |
|
475
3c28542229a3
added a mask layer in the RadiographyWidget (to be cleaned)
am@osimis.io
parents:
457
diff
changeset
|
513 |
| 354 | 514 { |
| 430 | 515 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
|
516 layer.SetResizeable(true); |
| 354 | 517 } |
| 518 | |
| 519 { | |
| 430 | 520 RadiographyLayer& layer = scene_->LoadTestBlock(100, 50, NULL); |
|
410
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
521 layer.SetResizeable(true); |
|
6decc0ba9da5
rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
408
diff
changeset
|
522 layer.SetPan(0, 200); |
| 354 | 523 } |
| 524 | |
| 337 | 525 |
|
428
751fb354149e
ability to change the scene of the RadiographyWidget
am@osimis.io
parents:
418
diff
changeset
|
526 mainWidget_ = new RadiographyWidget(GetBroker(), scene_, "main-widget"); |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
527 mainWidget_->SetTransmitMouseOver(true); |
| 358 | 528 mainWidget_->SetInteractor(interactor_); |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
529 |
| 407 | 530 //scene_->SetWindowing(128, 256); |
|
325
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
531 } |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
532 }; |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
533 } |
|
37ab9d83dc9b
reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff
changeset
|
534 } |