Mercurial > hg > orthanc-stone
annotate Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp @ 1804:5a872e69c74f
reorganization
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 20 May 2021 14:48:51 +0200 |
parents | d1849468729b |
children | de7cea710008 |
rev | line source |
---|---|
1458
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
1 /** |
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
2 * Stone of Orthanc |
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
1739
9ac2a65d4172
upgrade to year 2021
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1596
diff
changeset
|
5 * Copyright (C) 2017-2021 Osimis S.A., Belgium |
1458
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
6 * |
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
7 * This program is free software: you can redistribute it and/or |
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
8 * modify it under the terms of the GNU Affero General Public License |
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
9 * as published by the Free Software Foundation, either version 3 of |
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
10 * the License, or (at your option) any later version. |
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
11 * |
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
12 * This program is distributed in the hope that it will be useful, but |
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
13 * WITHOUT ANY WARRANTY; without even the implied warranty of |
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
15 * Affero General Public License for more details. |
1596
4fb8fdf03314
removed annoying whitespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1591
diff
changeset
|
16 * |
1458
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
17 * You should have received a copy of the GNU Affero General Public License |
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
19 **/ |
828a9b4ee1b7
added missing copyright
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1457
diff
changeset
|
20 |
1368 | 21 |
22 #include "SdlSimpleViewerApplication.h" | |
1387
4ebf246f3919
Fixed big mistake (factoring the option parsing, which only adds noise to the people reading the code)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1383
diff
changeset
|
23 #include "../SdlHelpers.h" |
4ebf246f3919
Fixed big mistake (factoring the option parsing, which only adds noise to the people reading the code)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1383
diff
changeset
|
24 #include "../../Common/SampleHelpers.h" |
1368 | 25 |
1542 | 26 #include "../../../../OrthancStone/Sources/Loaders/GenericLoadersContext.h" |
1804 | 27 #include "../../../../OrthancStone/Sources/Scene2D/AnnotationsSceneLayer.h" |
1790
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
28 #include "../../../../OrthancStone/Sources/Scene2DViewport/AngleMeasureTool.h" |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
29 #include "../../../../OrthancStone/Sources/Scene2DViewport/LineMeasureTool.h" |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
30 #include "../../../../OrthancStone/Sources/Scene2DViewport/UndoStack.h" |
1542 | 31 #include "../../../../OrthancStone/Sources/StoneException.h" |
32 #include "../../../../OrthancStone/Sources/StoneInitialization.h" | |
1560
b4ccd4963d37
fix sdl and wasm samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1542
diff
changeset
|
33 #include "../../../../OrthancStone/Sources/Viewport/DefaultViewportInteractor.h" |
1591
5887a4f8594b
moving platform-specific files out of the "OrthancStone" folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1576
diff
changeset
|
34 #include "../../../Platforms/Sdl/SdlViewport.h" |
1368 | 35 |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
36 #include <EmbeddedResources.h> |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1458
diff
changeset
|
37 #include <Compatibility.h> // For std::unique_ptr<> |
1457 | 38 #include <OrthancException.h> |
1387
4ebf246f3919
Fixed big mistake (factoring the option parsing, which only adds noise to the people reading the code)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1383
diff
changeset
|
39 |
4ebf246f3919
Fixed big mistake (factoring the option parsing, which only adds noise to the people reading the code)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1383
diff
changeset
|
40 #include <boost/program_options.hpp> |
4ebf246f3919
Fixed big mistake (factoring the option parsing, which only adds noise to the people reading the code)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1383
diff
changeset
|
41 #include <SDL.h> |
4ebf246f3919
Fixed big mistake (factoring the option parsing, which only adds noise to the people reading the code)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1383
diff
changeset
|
42 |
4ebf246f3919
Fixed big mistake (factoring the option parsing, which only adds noise to the people reading the code)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1383
diff
changeset
|
43 #include <string> |
4ebf246f3919
Fixed big mistake (factoring the option parsing, which only adds noise to the people reading the code)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1383
diff
changeset
|
44 |
1368 | 45 |
1804 | 46 static std::string orthancUrl; |
47 static std::string instanceId; | |
48 static int frameIndex = 0; | |
1368 | 49 |
1387
4ebf246f3919
Fixed big mistake (factoring the option parsing, which only adds noise to the people reading the code)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1383
diff
changeset
|
50 |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
51 static void ProcessOptions(int argc, char* argv[]) |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
52 { |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
53 namespace po = boost::program_options; |
1532
c7a37c3a0b8e
print help in sdl samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1512
diff
changeset
|
54 po::options_description desc("Usage"); |
1368 | 55 |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
56 desc.add_options() |
1387
4ebf246f3919
Fixed big mistake (factoring the option parsing, which only adds noise to the people reading the code)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1383
diff
changeset
|
57 ("loglevel", po::value<std::string>()->default_value("WARNING"), |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
58 "You can choose WARNING, INFO or TRACE for the logging level: Errors and warnings will always be displayed. (default: WARNING)") |
1368 | 59 |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
60 ("orthanc", po::value<std::string>()->default_value("http://localhost:8042"), |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
61 "Base URL of the Orthanc instance") |
1368 | 62 |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
63 ("instance", po::value<std::string>()->default_value("285dece8-e1956b38-cdc7d084-6ce3371e-536a9ffc"), |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
64 "Orthanc ID of the instance to display") |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
65 |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
66 ("frame_index", po::value<int>()->default_value(0), |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
67 "The zero-based index of the frame (for multi-frame instances)") |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
68 ; |
1368 | 69 |
1532
c7a37c3a0b8e
print help in sdl samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1512
diff
changeset
|
70 std::cout << desc << std::endl; |
c7a37c3a0b8e
print help in sdl samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1512
diff
changeset
|
71 |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
72 std::cout << std::endl << "Keyboard shorcuts:" << std::endl |
1799
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
73 << " a\tEnable/disable the angle annotation tool" << std::endl |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
74 << " f\tToggle fullscreen display" << std::endl |
1799
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
75 << " l\tEnable/disable the line annotation tool" << std::endl |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
76 << " q\tExit" << std::endl |
1799
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
77 << " r\tRedo the last edit to the annotation tools" << std::endl |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
78 << " s\tFit the viewpoint to the image" << std::endl |
1799
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
79 << " u\tUndo the last edit to the annotation tools" << std::endl |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
80 << std::endl << "Mouse buttons:" << std::endl |
1799
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
81 << " left \tChange windowing, or edit annotation" << std::endl |
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
82 << " center\tMove the viewpoint, or edit annotation" << std::endl |
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
83 << " right \tZoom, or edit annotation" << std::endl |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
84 << std::endl; |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
85 |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
86 po::variables_map vm; |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
87 try |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
88 { |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
89 po::store(po::parse_command_line(argc, argv, desc), vm); |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
90 po::notify(vm); |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
91 } |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
92 catch (std::exception& e) |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
93 { |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
94 std::cerr << "Please check your command line options! (\"" << e.what() << "\")" << std::endl; |
1368 | 95 } |
96 | |
1387
4ebf246f3919
Fixed big mistake (factoring the option parsing, which only adds noise to the people reading the code)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1383
diff
changeset
|
97 if (vm.count("loglevel") > 0) |
1368 | 98 { |
1387
4ebf246f3919
Fixed big mistake (factoring the option parsing, which only adds noise to the people reading the code)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1383
diff
changeset
|
99 std::string logLevel = vm["loglevel"].as<std::string>(); |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
100 OrthancStoneHelpers::SetLogLevel(logLevel); |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
101 } |
1368 | 102 |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
103 if (vm.count("orthanc") > 0) |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
104 { |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
105 // maybe check URL validity here |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
106 orthancUrl = vm["orthanc"].as<std::string>(); |
1368 | 107 } |
108 | |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
109 if (vm.count("instance") > 0) |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
110 { |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
111 instanceId = vm["instance"].as<std::string>(); |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
112 } |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
113 |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
114 if (vm.count("frame_index") > 0) |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
115 { |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
116 frameIndex = vm["frame_index"].as<int>(); |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
117 } |
1790
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
118 } |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
119 |
1790
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
120 |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
121 enum ActiveTool |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
122 { |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
123 ActiveTool_None, |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
124 ActiveTool_Line, |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
125 ActiveTool_Angle |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
126 }; |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
127 |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
128 |
1368 | 129 /** |
130 * IMPORTANT: The full arguments to "main()" are needed for SDL on | |
131 * Windows. Otherwise, one gets the linking error "undefined reference | |
132 * to `SDL_main'". https://wiki.libsdl.org/FAQWindows | |
133 **/ | |
134 int main(int argc, char* argv[]) | |
135 { | |
136 try | |
137 { | |
138 OrthancStone::StoneInitialize(); | |
1591
5887a4f8594b
moving platform-specific files out of the "OrthancStone" folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1576
diff
changeset
|
139 OrthancStone::SdlWindow::GlobalInitialize(); |
5887a4f8594b
moving platform-specific files out of the "OrthancStone" folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1576
diff
changeset
|
140 |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
141 ProcessOptions(argc, argv); |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
142 |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
143 //Orthanc::Logging::EnableInfoLevel(true); |
1368 | 144 //Orthanc::Logging::EnableTraceLevel(true); |
145 | |
146 { | |
147 | |
1804 | 148 #if 0 |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
149 boost::shared_ptr<OrthancStone::SdlViewport> viewport = |
1368 | 150 OrthancStone::SdlOpenGLViewport::Create("Stone of Orthanc", 800, 600); |
151 #else | |
152 boost::shared_ptr<OrthancStone::SdlViewport> viewport = | |
153 OrthancStone::SdlCairoViewport::Create("Stone of Orthanc", 800, 600); | |
154 #endif | |
155 | |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
156 boost::shared_ptr<OrthancStone::UndoStack> undoStack(new OrthancStone::UndoStack); |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
157 |
1368 | 158 OrthancStone::GenericLoadersContext context(1, 4, 1); |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
159 |
1395
62dc0d737e7b
build script for wasm sample + updated instructions + fixed Sdl sample for Orthanc listening on other ports that 8042
Alain Mazy <alain@mazy.be>
parents:
1392
diff
changeset
|
160 Orthanc::WebServiceParameters orthancWebService; |
62dc0d737e7b
build script for wasm sample + updated instructions + fixed Sdl sample for Orthanc listening on other ports that 8042
Alain Mazy <alain@mazy.be>
parents:
1392
diff
changeset
|
161 orthancWebService.SetUrl(orthancUrl); |
62dc0d737e7b
build script for wasm sample + updated instructions + fixed Sdl sample for Orthanc listening on other ports that 8042
Alain Mazy <alain@mazy.be>
parents:
1392
diff
changeset
|
162 context.SetOrthancParameters(orthancWebService); |
62dc0d737e7b
build script for wasm sample + updated instructions + fixed Sdl sample for Orthanc listening on other ports that 8042
Alain Mazy <alain@mazy.be>
parents:
1392
diff
changeset
|
163 |
1368 | 164 context.StartOracle(); |
165 | |
166 { | |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
167 { |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
168 std::string font; |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
169 Orthanc::EmbeddedResources::GetFileResource(font, Orthanc::EmbeddedResources::UBUNTU_FONT); |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
170 |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
171 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport->Lock()); |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
172 lock->GetCompositor().SetFont(0, font, 16, Orthanc::Encoding_Latin1); |
1799
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
173 //lock->GetController().SetUndoStack(undoStack); |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
174 } |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
175 |
1790
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
176 ActiveTool activeTool = ActiveTool_None; |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
177 |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
178 boost::shared_ptr<OrthancStone::LineMeasureTool> lineMeasureTool(OrthancStone::LineMeasureTool::Create(viewport)); |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
179 bool lineMeasureFirst = true; |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
180 lineMeasureTool->Disable(); |
1368 | 181 |
1790
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
182 boost::shared_ptr<OrthancStone::AngleMeasureTool> angleMeasureTool(OrthancStone::AngleMeasureTool::Create(viewport)); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
183 bool angleMeasureFirst = true; |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
184 angleMeasureTool->Disable(); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
185 |
1804 | 186 OrthancStone::AnnotationsSceneLayer annotations(10); |
187 annotations.SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_Angle); | |
1796
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
188 |
1799
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
189 { |
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
190 Json::Value v; |
1803
d1849468729b
added messages to AnnotationsLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1801
diff
changeset
|
191 annotations.Serialize(v); |
1799
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
192 std::cout << v.toStyledString() << std::endl; |
1803
d1849468729b
added messages to AnnotationsLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1801
diff
changeset
|
193 annotations.Clear(); |
d1849468729b
added messages to AnnotationsLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1801
diff
changeset
|
194 annotations.Unserialize(v); |
1799
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
195 } |
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
196 |
1368 | 197 boost::shared_ptr<SdlSimpleViewerApplication> application( |
198 SdlSimpleViewerApplication::Create(context, viewport)); | |
199 | |
200 OrthancStone::DicomSource source; | |
201 | |
202 application->LoadOrthancFrame(source, instanceId, frameIndex); | |
203 | |
204 OrthancStone::DefaultViewportInteractor interactor; | |
1535
301571299212
DefaultViewportInteractor::SetWindowingLayer()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1532
diff
changeset
|
205 interactor.SetWindowingLayer(0); |
1368 | 206 |
207 { | |
208 int scancodeCount = 0; | |
209 const uint8_t* keyboardState = SDL_GetKeyboardState(&scancodeCount); | |
210 | |
211 bool stop = false; | |
212 while (!stop) | |
213 { | |
214 bool paint = false; | |
215 SDL_Event event; | |
216 while (SDL_PollEvent(&event)) | |
217 { | |
218 if (event.type == SDL_QUIT) | |
219 { | |
220 stop = true; | |
221 break; | |
222 } | |
223 else if (viewport->IsRefreshEvent(event)) | |
224 { | |
225 paint = true; | |
226 } | |
227 else if (event.type == SDL_WINDOWEVENT && | |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
228 (event.window.event == SDL_WINDOWEVENT_RESIZED || |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
229 event.window.event == SDL_WINDOWEVENT_SIZE_CHANGED)) |
1368 | 230 { |
231 viewport->UpdateSize(event.window.data1, event.window.data2); | |
232 } | |
233 else if (event.type == SDL_WINDOWEVENT && | |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
234 (event.window.event == SDL_WINDOWEVENT_SHOWN || |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
235 event.window.event == SDL_WINDOWEVENT_EXPOSED)) |
1368 | 236 { |
1576
92fca2b3ba3d
sanitizing the handling of canvas size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1560
diff
changeset
|
237 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport->Lock()); |
92fca2b3ba3d
sanitizing the handling of canvas size
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1560
diff
changeset
|
238 lock->RefreshCanvasSize(); |
1368 | 239 } |
240 else if (event.type == SDL_KEYDOWN && | |
241 event.key.repeat == 0 /* Ignore key bounce */) | |
242 { | |
243 switch (event.key.keysym.sym) | |
244 { | |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
245 case SDLK_f: |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
246 viewport->ToggleMaximize(); |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
247 break; |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
248 |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
249 case SDLK_s: |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
250 application->FitContent(); |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
251 break; |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
252 |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
253 case SDLK_q: |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
254 stop = true; |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
255 break; |
1368 | 256 |
1790
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
257 case SDLK_u: |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
258 { |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
259 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport->Lock()); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
260 if (lock->GetController().CanUndo()) |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
261 { |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
262 lock->GetController().Undo(); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
263 } |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
264 break; |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
265 } |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
266 |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
267 case SDLK_r: |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
268 { |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
269 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport->Lock()); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
270 if (lock->GetController().CanRedo()) |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
271 { |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
272 lock->GetController().Redo(); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
273 } |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
274 break; |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
275 } |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
276 |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
277 case SDLK_l: |
1790
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
278 if (activeTool == ActiveTool_Line) |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
279 { |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
280 lineMeasureTool->Disable(); |
1790
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
281 activeTool = ActiveTool_None; |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
282 } |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
283 else |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
284 { |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
285 if (lineMeasureFirst) |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
286 { |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
287 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport->Lock()); |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
288 OrthancStone::Extent2D extent; |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
289 lock->GetController().GetScene().GetBoundingBox(extent); |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
290 if (!extent.IsEmpty()) |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
291 { |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
292 OrthancStone::ScenePoint2D p(extent.GetCenterX(), extent.GetCenterY()); |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
293 lineMeasureTool->Set(p, p); |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
294 } |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
295 lineMeasureFirst = false; |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
296 } |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
297 |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
298 lineMeasureTool->Enable(); |
1790
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
299 angleMeasureTool->Disable(); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
300 activeTool = ActiveTool_Line; |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
301 } |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
302 break; |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
303 |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
304 case SDLK_a: |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
305 if (activeTool == ActiveTool_Angle) |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
306 { |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
307 angleMeasureTool->Disable(); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
308 activeTool = ActiveTool_None; |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
309 } |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
310 else |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
311 { |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
312 if (angleMeasureFirst) |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
313 { |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
314 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport->Lock()); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
315 OrthancStone::Extent2D extent; |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
316 lock->GetController().GetScene().GetBoundingBox(extent); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
317 if (!extent.IsEmpty()) |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
318 { |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
319 OrthancStone::ScenePoint2D p1(1.0 * extent.GetX1() / 3.0 + 2.0 * extent.GetX2() / 3.0, |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
320 2.0 * extent.GetY1() / 3.0 + 2.0 * extent.GetY2() / 3.0); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
321 OrthancStone::ScenePoint2D p2(1.0 * extent.GetX1() / 2.0 + 1.0 * extent.GetX2() / 2.0, |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
322 1.0 * extent.GetY1() / 3.0 + 1.0 * extent.GetY2() / 3.0); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
323 OrthancStone::ScenePoint2D p3(2.0 * extent.GetX1() / 3.0 + 1.0 * extent.GetX2() / 3.0, |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
324 2.0 * extent.GetY1() / 3.0 + 2.0 * extent.GetY2() / 3.0); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
325 angleMeasureTool->SetSide1End(p1); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
326 angleMeasureTool->SetCenter(p2); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
327 angleMeasureTool->SetSide2End(p3); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
328 } |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
329 angleMeasureFirst = false; |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
330 } |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
331 |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
332 lineMeasureTool->Disable(); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
333 angleMeasureTool->Enable(); |
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
334 activeTool = ActiveTool_Angle; |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
335 } |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
336 break; |
1368 | 337 |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
338 default: |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
339 break; |
1368 | 340 } |
341 } | |
342 else if (event.type == SDL_MOUSEBUTTONDOWN || | |
343 event.type == SDL_MOUSEMOTION || | |
344 event.type == SDL_MOUSEBUTTONUP) | |
345 { | |
1507
169adf9090a6
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1458
diff
changeset
|
346 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport->Lock()); |
1368 | 347 if (lock->HasCompositor()) |
348 { | |
349 OrthancStone::PointerEvent p; | |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
350 OrthancStoneHelpers::GetPointerEvent(p, lock->GetCompositor(), |
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
351 event, keyboardState, scancodeCount); |
1368 | 352 |
353 switch (event.type) | |
354 { | |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
355 case SDL_MOUSEBUTTONDOWN: |
1368 | 356 { |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
357 boost::shared_ptr<OrthancStone::IFlexiblePointerTracker> t; |
1796
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
358 |
1799
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
359 if (p.GetMouseButton() == OrthancStone::MouseButton_Left) |
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
360 { |
1803
d1849468729b
added messages to AnnotationsLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1801
diff
changeset
|
361 t.reset(annotations.CreateTracker(p.GetMainPosition(), lock->GetController().GetScene())); |
1799
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
362 } |
1125793d82d3
serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1798
diff
changeset
|
363 |
1796
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
364 if (t.get() == NULL) |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
365 { |
1796
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
366 switch (activeTool) |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
367 { |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
368 case ActiveTool_Angle: |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
369 t = angleMeasureTool->CreateEditionTracker(p); |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
370 break; |
1790
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
371 |
1796
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
372 case ActiveTool_Line: |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
373 t = lineMeasureTool->CreateEditionTracker(p); |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
374 break; |
1790
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
375 |
1796
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
376 case ActiveTool_None: |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
377 break; |
1790
b325761e0bd3
angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1789
diff
changeset
|
378 |
1796
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
379 default: |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
380 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
381 } |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
382 } |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
383 |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
384 if (t.get() != NULL) |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
385 { |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
386 lock->GetController().AcquireActiveTracker(t); |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
387 } |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
388 else |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
389 { |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
390 lock->GetController().HandleMousePress(interactor, p, |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
391 lock->GetCompositor().GetCanvasWidth(), |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
392 lock->GetCompositor().GetCanvasHeight()); |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
393 } |
1368 | 394 lock->Invalidate(); |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
395 break; |
1368 | 396 } |
397 | |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
398 case SDL_MOUSEMOTION: |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
399 if (lock->GetController().HandleMouseMove(p)) |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
400 { |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
401 lock->Invalidate(); |
1803
d1849468729b
added messages to AnnotationsLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1801
diff
changeset
|
402 if (annotations.ClearHover()) |
1796
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
403 { |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
404 paint = true; |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
405 } |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
406 } |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
407 else |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
408 { |
1803
d1849468729b
added messages to AnnotationsLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1801
diff
changeset
|
409 if (annotations.SetMouseHover(p.GetMainPosition(), lock->GetController().GetScene())) |
1796
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
410 { |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
411 paint = true; |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
412 } |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
413 } |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
414 break; |
1368 | 415 |
1789
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
416 case SDL_MOUSEBUTTONUP: |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
417 lock->GetController().HandleMouseRelease(p); |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
418 lock->Invalidate(); |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
419 break; |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
420 |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
421 default: |
462d7a0e064e
added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1739
diff
changeset
|
422 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); |
1368 | 423 } |
424 } | |
425 } | |
426 } | |
427 | |
428 if (paint) | |
429 { | |
1796
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
430 { |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
431 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport->Lock()); |
1803
d1849468729b
added messages to AnnotationsLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1801
diff
changeset
|
432 annotations.Render(lock->GetController().GetScene()); |
1796
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
433 } |
20a0aba0ede5
creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1790
diff
changeset
|
434 |
1368 | 435 viewport->Paint(); |
436 } | |
437 | |
438 // Small delay to avoid using 100% of CPU | |
439 SDL_Delay(1); | |
440 } | |
441 } | |
442 context.StopOracle(); | |
443 } | |
444 } | |
445 | |
1591
5887a4f8594b
moving platform-specific files out of the "OrthancStone" folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1576
diff
changeset
|
446 OrthancStone::SdlWindow::GlobalFinalize(); |
1368 | 447 OrthancStone::StoneFinalize(); |
448 return 0; | |
449 } | |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
450 catch (Orthanc::OrthancException& e) |
1368 | 451 { |
452 LOG(ERROR) << "OrthancException: " << e.What(); | |
453 return -1; | |
454 } | |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
455 catch (OrthancStone::StoneException& e) |
1368 | 456 { |
457 LOG(ERROR) << "StoneException: " << e.What(); | |
458 return -1; | |
459 } | |
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
460 catch (std::runtime_error& e) |
1368 | 461 { |
462 LOG(ERROR) << "Runtime error: " << e.what(); | |
463 return -1; | |
464 } | |
465 catch (...) | |
466 { | |
467 LOG(ERROR) << "Native exception"; | |
468 return -1; | |
469 } | |
470 } |