Mercurial > hg > orthanc-stone

annotate Applications/Samples/SingleFrameEditorApplication.h @ 1085:63539e826355

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added TextRenderer
author Alain Mazy <alain@mazy.be>
date Tue, 22 Oct 2019 17:24:37 +0200
parents efc5b62b9539
children 3dbdcecccf5d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
b70e9be013e4 preparing for 2019
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
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"
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
27 #include "../../Framework/Radiography/RadiographyLayerMaskTracker.h"
414
f7616c010056 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
28 #include "../../Framework/Radiography/RadiographyLayerMoveTracker.h"
415
c0589c3173fd finished reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
29 #include "../../Framework/Radiography/RadiographyLayerResizeTracker.h"
414
f7616c010056 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
30 #include "../../Framework/Radiography/RadiographyLayerRotateTracker.h"
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 407
diff changeset
31 #include "../../Framework/Radiography/RadiographyScene.h"
414
f7616c010056 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 413
diff changeset
32 #include "../../Framework/Radiography/RadiographySceneCommand.h"
413
18b707fb8620 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 410
diff changeset
33 #include "../../Framework/Radiography/RadiographyWidget.h"
415
c0589c3173fd finished reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 414
diff changeset
34 #include "../../Framework/Radiography/RadiographyWindowingTracker.h"
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
35 #include "../../Framework/Radiography/RadiographySceneWriter.h"
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
36 #include "../../Framework/Radiography/RadiographySceneReader.h"
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
37 #include "../../Framework/Radiography/RadiographyMaskLayer.h"
359
100df90bf0ea preparing to implement Export
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 358
diff changeset
38
1085
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
39 #include <../../Framework/Toolbox/TextRenderer.h>
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
40
418
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
41 #include <Core/HttpClient.h>
343
712acc87fa2e text layer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 342
diff changeset
42 #include <Core/Images/FontRegistry.h>
325
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
43 #include <Core/Logging.h>
403
99e31898910e IObservable.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 393
diff changeset
44 #include <Core/OrthancException.h>
1085
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
45 #include <Core/Images/PngWriter.h>
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
46 #include <Core/Images/PngReader.h>
325
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
47
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
48
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
49 // Export using PAM is faster than using PNG, but requires Orthanc
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
50 // core >= 1.4.3
362
12cec26d08ce export of a valid DICOM CR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 361
diff changeset
51 #define EXPORT_USING_PAM 1
12cec26d08ce export of a valid DICOM CR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 361
diff changeset
52
340
f5d5814a41a0 rendering BitmapStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 339
diff changeset
53
325
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
54 namespace OrthancStone
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
55 {
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
56 namespace Samples
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
57 {
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 407
diff changeset
58 class RadiographyEditorInteractor :
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
59 public Deprecated::IWorldSceneInteractor,
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
60 public IObserver
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
61 {
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
62 private:
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
63 enum Tool
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
64 {
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
65 Tool_Move,
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
66 Tool_Rotate,
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
67 Tool_Crop,
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
68 Tool_Resize,
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
69 Tool_Mask,
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
70 Tool_Windowing
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
71 };
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
72
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
73
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
74 StoneApplicationContext* context_;
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
75 UndoRedoStack undoRedoStack_;
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
76 Tool tool_;
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
77 RadiographyMaskLayer* maskLayer_;
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
78
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
79
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
80 static double GetHandleSize()
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
81 {
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
82 return 10.0;
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
83 }
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
84
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
85
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
86 public:
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 407
diff changeset
87 RadiographyEditorInteractor(MessageBroker& broker) :
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
88 IObserver(broker),
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
89 context_(NULL),
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
90 tool_(Tool_Move),
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
91 maskLayer_(NULL)
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
92 {
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
93 }
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
94
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
95 void SetContext(StoneApplicationContext& context)
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
96 {
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
97 context_ = &context;
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
98 }
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
99
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
100 void SetMaskLayer(RadiographyMaskLayer* maskLayer)
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
101 {
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
102 maskLayer_ = maskLayer;
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
103 }
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
104 virtual Deprecated::IWorldSceneMouseTracker* CreateMouseTracker(Deprecated::WorldSceneWidget& worldWidget,
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
105 const Deprecated::ViewportGeometry& view,
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
106 MouseButton button,
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
107 KeyboardModifiers modifiers,
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
108 int viewportX,
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
109 int viewportY,
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
110 double x,
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
111 double y,
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
112 Deprecated::IStatusBar* statusBar,
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
113 const std::vector<Deprecated::Touch>& displayTouches)
357
ec4ad6c5eb99 avoid breaking class hierarchy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 356
diff changeset
114 {
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 407
diff changeset
115 RadiographyWidget& widget = dynamic_cast<RadiographyWidget&>(worldWidget);
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
116
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
117 if (button == MouseButton_Left)
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
118 {
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
119 size_t selected;
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
120
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
121 if (tool_ == Tool_Windowing)
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
122 {
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 407
diff changeset
123 return new RadiographyWindowingTracker(
1085
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
124 undoRedoStack_,
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
125 widget.GetScene(),
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
126 widget,
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
127 OrthancStone::ImageInterpolation_Nearest,
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
128 viewportX, viewportY,
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
129 RadiographyWindowingTracker::Action_DecreaseWidth,
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
130 RadiographyWindowingTracker::Action_IncreaseWidth,
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
131 RadiographyWindowingTracker::Action_DecreaseCenter,
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
132 RadiographyWindowingTracker::Action_IncreaseCenter);
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
133 }
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
134 else if (!widget.LookupSelectedLayer(selected))
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
135 {
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
136 // No layer is currently selected
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
137 size_t layer;
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
138 if (widget.GetScene().LookupLayer(layer, x, y))
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
139 {
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
140 widget.Select(layer);
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
141 }
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
142
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
143 return NULL;
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
144 }
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
145 else if (tool_ == Tool_Crop ||
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
146 tool_ == Tool_Resize ||
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
147 tool_ == Tool_Mask)
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
148 {
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 407
diff changeset
149 RadiographyScene::LayerAccessor accessor(widget.GetScene(), selected);
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
150
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
151 ControlPoint controlPoint;
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
152 if (accessor.GetLayer().LookupControlPoint(controlPoint, x, y, view.GetZoom(), GetHandleSize()))
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
153 {
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
154 switch (tool_)
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
155 {
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
156 case Tool_Crop:
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
157 return new RadiographyLayerCropTracker
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
158 (undoRedoStack_, widget.GetScene(), view, selected, controlPoint);
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
159
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
160 case Tool_Mask:
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
161 return new RadiographyLayerMaskTracker
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
162 (undoRedoStack_, widget.GetScene(), view, selected, controlPoint);
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
163
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
164 case Tool_Resize:
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
165 return new RadiographyLayerResizeTracker
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
166 (undoRedoStack_, widget.GetScene(), selected, controlPoint,
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 407
diff changeset
167 (modifiers & KeyboardModifiers_Shift));
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
168
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
169 default:
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
170 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
171 }
384
d20d75f20c5d better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 377
diff changeset
172 }
d20d75f20c5d better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 377
diff changeset
173 else
d20d75f20c5d better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 377
diff changeset
174 {
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
175 size_t layer;
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
176
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
177 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
178 {
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
179 widget.Select(layer);
384
d20d75f20c5d better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 377
diff changeset
180 }
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
181 else
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
182 {
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
183 widget.Unselect();
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
184 }
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
185
384
d20d75f20c5d better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 377
diff changeset
186 return NULL;
d20d75f20c5d better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 377
diff changeset
187 }
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
188 }
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
189 else
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
190 {
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
191 size_t layer;
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
192
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
193 if (widget.GetScene().LookupLayer(layer, x, y))
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
194 {
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
195 if (layer == selected)
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
196 {
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
197 switch (tool_)
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
198 {
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
199 case Tool_Move:
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
200 return new RadiographyLayerMoveTracker
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 407
diff changeset
201 (undoRedoStack_, widget.GetScene(), layer, x, y,
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 407
diff changeset
202 (modifiers & KeyboardModifiers_Shift));
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
203
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
204 case Tool_Rotate:
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
205 return new RadiographyLayerRotateTracker
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 407
diff changeset
206 (undoRedoStack_, widget.GetScene(), view, layer, x, y,
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 407
diff changeset
207 (modifiers & KeyboardModifiers_Shift));
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
208
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
209 default:
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
210 break;
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
211 }
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
212
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
213 return NULL;
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
214 }
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
215 else
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
216 {
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
217 widget.Select(layer);
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
218 return NULL;
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
219 }
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
220 }
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
221 else
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
222 {
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
223 widget.Unselect();
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
224 return NULL;
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
225 }
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
226 }
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
227 }
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
228 else
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
229 {
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
230 return NULL;
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
231 }
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
232 return NULL;
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
233 }
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
234
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
235 virtual void MouseOver(CairoContext& context,
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
236 Deprecated::WorldSceneWidget& worldWidget,
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
237 const Deprecated::ViewportGeometry& view,
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
238 double x,
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
239 double y,
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
240 Deprecated::IStatusBar* statusBar)
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
241 {
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 407
diff changeset
242 RadiographyWidget& widget = dynamic_cast<RadiographyWidget&>(worldWidget);
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
243
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
244 #if 0
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
245 if (statusBar != NULL)
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
246 {
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
247 char buf[64];
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
248 sprintf(buf, "X = %.02f Y = %.02f (in cm)", x / 10.0, y / 10.0);
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
249 statusBar->SetMessage(buf);
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
250 }
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
251 #endif
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
252
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
253 size_t selected;
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
254
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
255 if (widget.LookupSelectedLayer(selected) &&
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
256 (tool_ == Tool_Crop ||
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
257 tool_ == Tool_Resize ||
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
258 tool_ == Tool_Mask))
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
259 {
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 407
diff changeset
260 RadiographyScene::LayerAccessor accessor(widget.GetScene(), selected);
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
261
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
262 ControlPoint controlPoint;
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
263 if (accessor.GetLayer().LookupControlPoint(controlPoint, x, y, view.GetZoom(), GetHandleSize()))
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
264 {
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
265 double z = 1.0 / view.GetZoom();
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
266
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
267 context.SetSourceColor(255, 0, 0);
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
268 cairo_t* cr = context.GetObject();
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
269 cairo_set_line_width(cr, 2.0 * z);
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
270 cairo_move_to(cr, controlPoint.x - GetHandleSize() * z, controlPoint.y - GetHandleSize() * z);
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
271 cairo_line_to(cr, controlPoint.x + GetHandleSize() * z, controlPoint.y - GetHandleSize() * z);
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
272 cairo_line_to(cr, controlPoint.x + GetHandleSize() * z, controlPoint.y + GetHandleSize() * z);
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
273 cairo_line_to(cr, controlPoint.x - GetHandleSize() * z, controlPoint.y + GetHandleSize() * z);
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
274 cairo_line_to(cr, controlPoint.x - GetHandleSize() * z, controlPoint.y - GetHandleSize() * z);
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
275 cairo_stroke(cr);
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
276 }
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
277 }
339
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 338
diff changeset
278 }
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
279
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
280 virtual void MouseWheel(Deprecated::WorldSceneWidget& widget,
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
281 MouseWheelDirection direction,
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
282 KeyboardModifiers modifiers,
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
283 Deprecated::IStatusBar* statusBar)
344
fdec8e6893cb ordering of bitmap layers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 343
diff changeset
284 {
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
285 }
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
286
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
287 virtual void KeyPressed(Deprecated::WorldSceneWidget& worldWidget,
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
288 KeyboardKeys key,
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
289 char keyChar,
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
290 KeyboardModifiers modifiers,
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
291 Deprecated::IStatusBar* statusBar)
345
55438b1ca317 drawing borders
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 344
diff changeset
292 {
408
6834c236b36d reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 407
diff changeset
293 RadiographyWidget& widget = dynamic_cast<RadiographyWidget&>(worldWidget);
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
294
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
295 switch (keyChar)
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
296 {
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
297 case 'a':
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
298 widget.FitContent();
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
299 break;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
300
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
301 case 'c':
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
302 tool_ = Tool_Crop;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
303 break;
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
304
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
305 case 'm':
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
306 tool_ = Tool_Mask;
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
307 widget.Select(1);
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
308 break;
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
309
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
310 case 'd':
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
311 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
312 // dump to json and reload
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
313 Json::Value snapshot;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
314 RadiographySceneWriter writer;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
315 writer.Write(snapshot, widget.GetScene());
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
316
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
317 LOG(INFO) << "JSON export was successful: "
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
318 << snapshot.toStyledString();
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
319
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
320 boost::shared_ptr<RadiographyScene> scene(new RadiographyScene(GetBroker()));
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
321 RadiographySceneReader reader(*scene, context_->GetOrthancApiClient());
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
322
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
323 Orthanc::FontRegistry fontRegistry;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
324 fontRegistry.AddFromResource(Orthanc::EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
325
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
326 reader.SetFontRegistry(fontRegistry);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
327 reader.Read(snapshot);
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
328
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
329 widget.SetScene(scene);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
330 };break;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
331
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
332 case 'e':
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
333 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
334 Orthanc::DicomMap tags;
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
335
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
336 // Minimal set of tags to generate a valid CR image
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
337 tags.SetValue(Orthanc::DICOM_TAG_ACCESSION_NUMBER, "NOPE", false);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
338 tags.SetValue(Orthanc::DICOM_TAG_BODY_PART_EXAMINED, "PELVIS", false);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
339 tags.SetValue(Orthanc::DICOM_TAG_INSTANCE_NUMBER, "1", false);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
340 //tags.SetValue(Orthanc::DICOM_TAG_LATERALITY, "", false);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
341 tags.SetValue(Orthanc::DICOM_TAG_MANUFACTURER, "OSIMIS", false);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
342 tags.SetValue(Orthanc::DICOM_TAG_MODALITY, "CR", false);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
343 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_BIRTH_DATE, "20000101", false);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
344 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_ID, "hello", false);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
345 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_NAME, "HELLO^WORLD", false);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
346 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_ORIENTATION, "", false);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
347 tags.SetValue(Orthanc::DICOM_TAG_PATIENT_SEX, "M", false);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
348 tags.SetValue(Orthanc::DICOM_TAG_REFERRING_PHYSICIAN_NAME, "HOUSE^MD", false);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
349 tags.SetValue(Orthanc::DICOM_TAG_SERIES_NUMBER, "1", false);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
350 tags.SetValue(Orthanc::DICOM_TAG_SOP_CLASS_UID, "1.2.840.10008.5.1.4.1.1.1", false);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
351 tags.SetValue(Orthanc::DICOM_TAG_STUDY_ID, "STUDY", false);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
352 tags.SetValue(Orthanc::DICOM_TAG_VIEW_POSITION, "", false);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
353
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
354 if (context_ != NULL)
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
355 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
356 widget.GetScene().ExportDicom(context_->GetOrthancApiClient(),
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
357 tags, std::string(), 0.1, 0.1, widget.IsInverted(),
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
358 widget.GetInterpolation(), EXPORT_USING_PAM);
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
359 }
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
360
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
361 break;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
362 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
363
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
364 case 'i':
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
365 widget.SwitchInvert();
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
366 break;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
367
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
368 case 't':
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
369 tool_ = Tool_Move;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
370 break;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
371
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
372 case 'n':
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
373 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
374 switch (widget.GetInterpolation())
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
375 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
376 case ImageInterpolation_Nearest:
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
377 LOG(INFO) << "Switching to bilinear interpolation";
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
378 widget.SetInterpolation(ImageInterpolation_Bilinear);
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
379 break;
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
380
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
381 case ImageInterpolation_Bilinear:
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
382 LOG(INFO) << "Switching to nearest neighbor interpolation";
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
383 widget.SetInterpolation(ImageInterpolation_Nearest);
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
384 break;
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
385
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
386 default:
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
387 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
388 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
389
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
390 break;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
391 }
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
392
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
393 case 'r':
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
394 tool_ = Tool_Rotate;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
395 break;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
396
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
397 case 's':
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
398 tool_ = Tool_Resize;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
399 break;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
400
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
401 case 'w':
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
402 tool_ = Tool_Windowing;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
403 break;
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
404
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
405 case 'y':
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
406 if (modifiers & KeyboardModifiers_Control)
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
407 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
408 undoRedoStack_.Redo();
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
409 widget.NotifyContentChanged();
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
410 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
411 break;
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
412
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
413 case 'z':
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
414 if (modifiers & KeyboardModifiers_Control)
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
415 {
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
416 undoRedoStack_.Undo();
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
417 widget.NotifyContentChanged();
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
418 }
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
419 break;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
420
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
421 default:
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
422 break;
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
423 }
345
55438b1ca317 drawing borders
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 344
diff changeset
424 }
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
425 };
336
c7fdc8bac581 creating GrayscaleBitmapStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 334
diff changeset
426
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
427
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
428
325
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
429 class SingleFrameEditorApplication :
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
430 public SampleSingleCanvasApplicationBase,
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
431 public IObserver
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 private:
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
434 boost::shared_ptr<RadiographyScene> scene_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
435 RadiographyEditorInteractor interactor_;
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
436 Orthanc::FontRegistry fontRegistry_;
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
437 RadiographyMaskLayer* maskLayer_;
325
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 public:
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
440 SingleFrameEditorApplication(MessageBroker& broker) :
362
12cec26d08ce export of a valid DICOM CR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 361
diff changeset
441 IObserver(broker),
12cec26d08ce export of a valid DICOM CR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 361
diff changeset
442 interactor_(broker)
325
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 }
384
d20d75f20c5d better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 377
diff changeset
445
d20d75f20c5d better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 377
diff changeset
446 virtual ~SingleFrameEditorApplication()
d20d75f20c5d better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 377
diff changeset
447 {
d20d75f20c5d better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 377
diff changeset
448 LOG(WARNING) << "Destroying the application";
d20d75f20c5d better following of the MVC design pattern
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 377
diff changeset
449 }
325
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
450
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
451 virtual void DeclareStartupOptions(boost::program_options::options_description& options)
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
452 {
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
453 boost::program_options::options_description generic("Sample options");
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
454 generic.add_options()
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
455 ("instance", boost::program_options::value<std::string>(),
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
456 "Orthanc ID of the instance")
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
457 ("frame", boost::program_options::value<unsigned int>()->default_value(0),
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
458 "Number of the frame, for multi-frame DICOM instances")
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
459 ;
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 options.add(generic);
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
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
464 virtual void Initialize(StoneApplicationContext* context,
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
465 Deprecated::IStatusBar& statusBar,
325
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
466 const boost::program_options::variables_map& parameters)
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 using namespace OrthancStone;
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 context_ = context;
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
471 interactor_.SetContext(*context);
325
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
472
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
473 statusBar.SetMessage("Use the key \"a\" to reinitialize the layout");
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
474 statusBar.SetMessage("Use the key \"c\" to crop");
359
100df90bf0ea preparing to implement Export
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 358
diff changeset
475 statusBar.SetMessage("Use the key \"e\" to export DICOM to the Orthanc server");
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
476 statusBar.SetMessage("Use the key \"f\" to switch full screen");
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
477 statusBar.SetMessage("Use the key \"i\" to invert contrast");
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
478 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
479 statusBar.SetMessage("Use the key \"n\" to switch between nearest neighbor and bilinear interpolation");
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
480 statusBar.SetMessage("Use the key \"r\" to rotate objects");
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
481 statusBar.SetMessage("Use the key \"s\" to resize objects (not applicable to DICOM layers)");
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
482 statusBar.SetMessage("Use the key \"t\" to move (translate) objects");
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
483 statusBar.SetMessage("Use the key \"w\" to change windowing");
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
484
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
485 statusBar.SetMessage("Use the key \"ctrl-z\" to undo action");
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
486 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
487
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
488 if (parameters.count("instance") != 1)
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 LOG(ERROR) << "The instance ID is missing";
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
491 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
492 }
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
493
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
494 std::string instance = parameters["instance"].as<std::string>();
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 535
diff changeset
495 //int frame = parameters["frame"].as<unsigned int>();
325
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
496
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
497 fontRegistry_.AddFromResource(Orthanc::EmbeddedResources::FONT_UBUNTU_MONO_BOLD_16);
343
712acc87fa2e text layer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 342
diff changeset
498
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
499 scene_.reset(new RadiographyScene(GetBroker()));
535
79bb0a02d1cc - Added ORTHANC_OVERRIDE to several methods (translates to "override" in C++ 11 compilers)
Benjamin Golinvaux <bgo@osimis.io>
parents: 518
diff changeset
500
79bb0a02d1cc - Added ORTHANC_OVERRIDE to several methods (translates to "override" in C++ 11 compilers)
Benjamin Golinvaux <bgo@osimis.io>
parents: 518
diff changeset
501 RadiographyLayer& dicomLayer = scene_->LoadDicomFrame(context->GetOrthancApiClient(), instance, 0, false, NULL);
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
502 //scene_->LoadDicomFrame(instance, frame, false); //.SetPan(200, 0);
535
79bb0a02d1cc - Added ORTHANC_OVERRIDE to several methods (translates to "override" in C++ 11 compilers)
Benjamin Golinvaux <bgo@osimis.io>
parents: 518
diff changeset
503 // = scene_->LoadDicomFrame(context->GetOrthancApiClient(), "61f3143e-96f34791-ad6bbb8d-62559e75-45943e1b", 0, false, NULL);
418
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
504
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
505 #if !defined(ORTHANC_ENABLE_WASM) || ORTHANC_ENABLE_WASM != 1
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
506 Orthanc::HttpClient::ConfigureSsl(true, "/etc/ssl/certs/ca-certificates.crt");
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
507 #endif
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
508
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
509 //scene_->LoadDicomWebFrame(context->GetWebService());
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 415
diff changeset
510
518
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
511 std::vector<Orthanc::ImageProcessing::ImagePoint> mask;
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
512 mask.push_back(Orthanc::ImageProcessing::ImagePoint(1100, 100));
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
513 mask.push_back(Orthanc::ImageProcessing::ImagePoint(1100, 1000));
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
514 mask.push_back(Orthanc::ImageProcessing::ImagePoint(2000, 1000));
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
515 mask.push_back(Orthanc::ImageProcessing::ImagePoint(2200, 150));
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
516 mask.push_back(Orthanc::ImageProcessing::ImagePoint(1500, 550));
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
517 maskLayer_ = dynamic_cast<RadiographyMaskLayer*>(&(scene_->LoadMask(mask, dynamic_cast<RadiographyDicomLayer&>(dicomLayer), 128.0f, NULL)));
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
518 interactor_.SetMaskLayer(maskLayer_);
40bb5eb247a5 Reverted a couple of files to AM version (wrong changes on my end)
Benjamin Golinvaux <bgo@osimis.io>
parents: 516
diff changeset
519
354
f806779bd40f UndoRedoStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
520 {
1085
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
521 std::auto_ptr<Orthanc::ImageAccessor> renderedTextAlpha(TextRenderer::RenderWhiteOnBlack(Orthanc::EmbeddedResources::UBUNTU_FONT, 100,
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
522 "%öÇaA&#"));
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
523 RadiographyLayer& layer = scene_->LoadAlphaBitmap(renderedTextAlpha.release(), NULL);
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
524 dynamic_cast<RadiographyAlphaLayer&>(layer).SetForegroundValue(200);
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
525 }
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
526
63539e826355 Added TextRenderer
Alain Mazy <alain@mazy.be>
parents: 1047
diff changeset
527 {
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
528 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
529 layer.SetResizeable(true);
354
f806779bd40f UndoRedoStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
530 }
f806779bd40f UndoRedoStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
531
f806779bd40f UndoRedoStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
532 {
430
b85f635f1eb5 added serialization for RadiographyScene
am@osimis.io
parents: 428
diff changeset
533 RadiographyLayer& layer = scene_->LoadTestBlock(100, 50, NULL);
410
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
534 layer.SetResizeable(true);
6decc0ba9da5 rename RadiographyScene::Layer as RadiographyLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 408
diff changeset
535 layer.SetPan(0, 200);
354
f806779bd40f UndoRedoStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
536 }
f806779bd40f UndoRedoStack
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 353
diff changeset
537
337
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 336
diff changeset
538
428
751fb354149e ability to change the scene of the RadiographyWidget
am@osimis.io
parents: 418
diff changeset
539 mainWidget_ = new RadiographyWidget(GetBroker(), scene_, "main-widget");
325
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
540 mainWidget_->SetTransmitMouseOver(true);
358
b8eeb49f3e65 cleaning up
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 357
diff changeset
541 mainWidget_->SetInteractor(interactor_);
325
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
542
407
842a3c7cfdc0 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 403
diff changeset
543 //scene_->SetWindowing(128, 256);
325
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
544 }
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
545 };
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
546 }
37ab9d83dc9b reactivate SingleFrameApplication sample + Added SingleFrameEditorApplication (SDL only)
am@osimis.io
parents:
diff changeset
547 }