Mercurial > hg > orthanc-stone

annotate Applications/Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp @ 1809:79a5838739a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
starting the integration of AnnotationsSceneLayer into Stone Web viewer
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 20 May 2021 18:52:02 +0200
parents 0840a25c6d41
children 36430d73e36c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
21
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
22
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
23 #define SAMPLE_USE_OPENGL 1
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
24 #define SAMPLE_USE_ANNOTATIONS_LAYER 1
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
25
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
26
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
27 #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
28 #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
29 #include "../../Common/SampleHelpers.h"
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
30
1542
6e0da8370270 fixing paths
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1538
diff changeset
31 #include "../../../../OrthancStone/Sources/Loaders/GenericLoadersContext.h"
1804
5a872e69c74f reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1803
diff changeset
32 #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
33 #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
34 #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
35 #include "../../../../OrthancStone/Sources/Scene2DViewport/UndoStack.h"
1542
6e0da8370270 fixing paths
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1538
diff changeset
36 #include "../../../../OrthancStone/Sources/StoneException.h"
6e0da8370270 fixing paths
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1538
diff changeset
37 #include "../../../../OrthancStone/Sources/StoneInitialization.h"
1560
b4ccd4963d37 fix sdl and wasm samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
38 #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
39 #include "../../../Platforms/Sdl/SdlViewport.h"
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
40
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
41 #include <EmbeddedResources.h>
1507
169adf9090a6 replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1458
diff changeset
42 #include <Compatibility.h> // For std::unique_ptr<>
1457
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1426
diff changeset
43 #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
44
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
45 #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
46 #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
47
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
48 #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
49
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
50
1804
5a872e69c74f reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1803
diff changeset
51 static std::string orthancUrl;
5a872e69c74f reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1803
diff changeset
52 static std::string instanceId;
5a872e69c74f reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1803
diff changeset
53 static int frameIndex = 0;
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
54
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
55
1382
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
56 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
57 {
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
58 namespace po = boost::program_options;
1532
c7a37c3a0b8e print help in sdl samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1512
diff changeset
59 po::options_description desc("Usage");
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
60
1382
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
61 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
62 ("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
63 "You can choose WARNING, INFO or TRACE for the logging level: Errors and warnings will always be displayed. (default: WARNING)")
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
64
1382
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
65 ("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
66 "Base URL of the Orthanc instance")
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
67
1382
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
68 ("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
69 "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
70
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
71 ("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
72 "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
73 ;
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
74
1532
c7a37c3a0b8e print help in sdl samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1512
diff changeset
75 std::cout << desc << std::endl;
c7a37c3a0b8e print help in sdl samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1512
diff changeset
76
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
77 std::cout << std::endl << "Keyboard shorcuts:" << std::endl
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
78 #if SAMPLE_USE_ANNOTATIONS_LAYER == 1
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
79 << " a\tCreate angle annotations" << std::endl
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
80 << " c\tCreate circle annotations" << std::endl
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
81 << " d\tDelete mode for annotations" << std::endl
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
82 << " e\tEdit mode, don't create annotation (default)" << std::endl
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
83 << " l\tCreate line annotations" << std::endl
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
84 #else
1799
1125793d82d3 serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1798
diff changeset
85 << " a\tEnable/disable the angle annotation tool" << std::endl
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
86 << " l\tEnable/disable the line annotation tool" << std::endl
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
87 << " r\tRedo the last edit to the annotation tools" << std::endl
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
88 << " u\tUndo the last edit to the annotation tools" << std::endl
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
89 #endif
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
90 << " f\tToggle fullscreen display" << std::endl
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
91 << " q\tExit" << std::endl
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
92 << " s\tFit the viewpoint to the image" << std::endl
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
93 << std::endl << "Mouse buttons:" << std::endl
1799
1125793d82d3 serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1798
diff changeset
94 << " left \tChange windowing, or edit annotation" << std::endl
1125793d82d3 serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1798
diff changeset
95 << " center\tMove the viewpoint, or edit annotation" << std::endl
1125793d82d3 serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1798
diff changeset
96 << " 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
97 << std::endl;
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
98
1382
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
99 po::variables_map vm;
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
100 try
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
101 {
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
102 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
103 po::notify(vm);
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 catch (std::exception& e)
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
106 {
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
107 std::cerr << "Please check your command line options! (\"" << e.what() << "\")" << std::endl;
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
108 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
109
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
110 if (vm.count("loglevel") > 0)
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
111 {
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
112 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
113 OrthancStoneHelpers::SetLogLevel(logLevel);
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
114 }
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
115
1382
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
116 if (vm.count("orthanc") > 0)
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
117 {
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
118 // maybe check URL validity here
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
119 orthancUrl = vm["orthanc"].as<std::string>();
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
120 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
121
1382
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
122 if (vm.count("instance") > 0)
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
123 {
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
124 instanceId = vm["instance"].as<std::string>();
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
125 }
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
126
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
127 if (vm.count("frame_index") > 0)
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
128 {
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
129 frameIndex = vm["frame_index"].as<int>();
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
130 }
1790
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
131 }
1382
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
132
1790
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
133
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
134 enum ActiveTool
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
135 {
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
136 ActiveTool_None,
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
137 ActiveTool_Line,
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
138 ActiveTool_Angle
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
139 };
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
140
1382
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
141
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
142 /**
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
143 * IMPORTANT: The full arguments to "main()" are needed for SDL on
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
144 * Windows. Otherwise, one gets the linking error "undefined reference
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
145 * to `SDL_main'". https://wiki.libsdl.org/FAQWindows
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
146 **/
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
147 int main(int argc, char* argv[])
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
148 {
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
149 try
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
150 {
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
151 OrthancStone::StoneInitialize();
1591
5887a4f8594b moving platform-specific files out of the "OrthancStone" folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1576
diff changeset
152 OrthancStone::SdlWindow::GlobalInitialize();
5887a4f8594b moving platform-specific files out of the "OrthancStone" folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1576
diff changeset
153
1382
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
154 ProcessOptions(argc, argv);
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
155
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
156 //Orthanc::Logging::EnableInfoLevel(true);
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
157 //Orthanc::Logging::EnableTraceLevel(true);
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
158
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
159 {
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
160 #if SAMPLE_USE_OPENGL == 1
1382
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
161 boost::shared_ptr<OrthancStone::SdlViewport> viewport =
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
162 OrthancStone::SdlOpenGLViewport::Create("Stone of Orthanc", 800, 600);
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
163 #else
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
164 boost::shared_ptr<OrthancStone::SdlViewport> viewport =
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
165 OrthancStone::SdlCairoViewport::Create("Stone of Orthanc", 800, 600);
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
166 #endif
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
167
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
168 #if SAMPLE_USE_ANNOTATIONS_LAYER != 1
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
169 boost::shared_ptr<OrthancStone::UndoStack> undoStack(new OrthancStone::UndoStack);
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
170 #endif
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
171
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
172 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
173
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
174 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
175 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
176 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
177
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
178 context.StartOracle();
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
179
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
180 {
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
181 {
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
182 std::string font;
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
183 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
184
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
185 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
186 lock->GetCompositor().SetFont(0, font, 16, Orthanc::Encoding_Latin1);
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
187
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
188 #if SAMPLE_USE_ANNOTATIONS_LAYER != 1
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
189 lock->GetController().SetUndoStack(undoStack);
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
190 #endif
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
191 }
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
192
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
193 #if SAMPLE_USE_ANNOTATIONS_LAYER == 1
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
194 OrthancStone::AnnotationsSceneLayer annotations(10);
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
195 annotations.SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_Edit);
1806
0840a25c6d41 removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1805
diff changeset
196
0840a25c6d41 removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1805
diff changeset
197 /*
0840a25c6d41 removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1805
diff changeset
198 annotations.AddSegmentAnnotation(OrthancStone::ScenePoint2D(0, 0),
0840a25c6d41 removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1805
diff changeset
199 OrthancStone::ScenePoint2D(100, 100));
0840a25c6d41 removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1805
diff changeset
200 annotations.AddAngleAnnotation(OrthancStone::ScenePoint2D(100, 50),
0840a25c6d41 removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1805
diff changeset
201 OrthancStone::ScenePoint2D(150, 40),
0840a25c6d41 removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1805
diff changeset
202 OrthancStone::ScenePoint2D(200, 50));
0840a25c6d41 removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1805
diff changeset
203 annotations.AddCircleAnnotation(OrthancStone::ScenePoint2D(50, 200),
0840a25c6d41 removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1805
diff changeset
204 OrthancStone::ScenePoint2D(100, 250));
0840a25c6d41 removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1805
diff changeset
205 */
0840a25c6d41 removed hard-coded test in AnnotationsSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1805
diff changeset
206
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
207 #else
1790
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
208 ActiveTool activeTool = ActiveTool_None;
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
209
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
210 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
211 bool lineMeasureFirst = true;
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
212 lineMeasureTool->Disable();
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
213
1790
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
214 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
215 bool angleMeasureFirst = true;
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
216 angleMeasureTool->Disable();
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
217 #endif
1799
1125793d82d3 serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1798
diff changeset
218
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
219 boost::shared_ptr<SdlSimpleViewerApplication> application(
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
220 SdlSimpleViewerApplication::Create(context, viewport));
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
221
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
222 OrthancStone::DicomSource source;
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
223
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
224 application->LoadOrthancFrame(source, instanceId, frameIndex);
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
225
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
226 OrthancStone::DefaultViewportInteractor interactor;
1535
301571299212 DefaultViewportInteractor::SetWindowingLayer()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1532
diff changeset
227 interactor.SetWindowingLayer(0);
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
228
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
229 {
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
230 int scancodeCount = 0;
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
231 const uint8_t* keyboardState = SDL_GetKeyboardState(&scancodeCount);
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
232
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
233 bool stop = false;
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
234 while (!stop)
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
235 {
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
236 bool paint = false;
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
237 SDL_Event event;
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
238 while (SDL_PollEvent(&event))
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
239 {
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
240 if (event.type == SDL_QUIT)
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
241 {
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
242 stop = true;
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
243 break;
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
244 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
245 else if (viewport->IsRefreshEvent(event))
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
246 {
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
247 paint = true;
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
248 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
249 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
250 (event.window.event == SDL_WINDOWEVENT_RESIZED ||
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
251 event.window.event == SDL_WINDOWEVENT_SIZE_CHANGED))
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
252 {
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
253 viewport->UpdateSize(event.window.data1, event.window.data2);
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
254 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
255 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
256 (event.window.event == SDL_WINDOWEVENT_SHOWN ||
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
257 event.window.event == SDL_WINDOWEVENT_EXPOSED))
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
258 {
1576
92fca2b3ba3d sanitizing the handling of canvas size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1560
diff changeset
259 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
260 lock->RefreshCanvasSize();
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
261 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
262 else if (event.type == SDL_KEYDOWN &&
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
263 event.key.repeat == 0 /* Ignore key bounce */)
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
264 {
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
265 switch (event.key.keysym.sym)
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
266 {
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
267 case SDLK_f:
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
268 viewport->ToggleMaximize();
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
269 break;
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
270
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
271 case SDLK_s:
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
272 application->FitContent();
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
273 break;
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
274
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
275 case SDLK_q:
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
276 stop = true;
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
277 break;
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
278
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
279 #if SAMPLE_USE_ANNOTATIONS_LAYER != 1
1790
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
280 case SDLK_u:
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
281 {
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
282 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
283 if (lock->GetController().CanUndo())
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
284 {
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
285 lock->GetController().Undo();
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
286 }
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
287 break;
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
288 }
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
289 #endif
1790
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
290
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
291 #if SAMPLE_USE_ANNOTATIONS_LAYER != 1
1790
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
292 case SDLK_r:
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
293 {
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
294 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
295 if (lock->GetController().CanRedo())
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
296 {
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
297 lock->GetController().Redo();
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
298 }
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
299 break;
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
300 }
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
301 #endif
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
302
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
303 #if SAMPLE_USE_ANNOTATIONS_LAYER == 1
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
304 case SDLK_c:
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
305 annotations.SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_Circle);
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
306 break;
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
307 #endif
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
308
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
309 #if SAMPLE_USE_ANNOTATIONS_LAYER == 1
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
310 case SDLK_e:
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
311 annotations.SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_Edit);
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
312 break;
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
313 #endif
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
314
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
315 #if SAMPLE_USE_ANNOTATIONS_LAYER == 1
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
316 case SDLK_d:
1809
79a5838739a6 starting the integration of AnnotationsSceneLayer into Stone Web viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1806
diff changeset
317 annotations.SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_Remove);
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
318 break;
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
319 #endif
1790
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
320
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
321 case SDLK_l:
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
322 #if SAMPLE_USE_ANNOTATIONS_LAYER == 1
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
323 annotations.SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_Segment);
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
324 #else
1790
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
325 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
326 {
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
327 lineMeasureTool->Disable();
1790
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
328 activeTool = ActiveTool_None;
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
329 }
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
330 else
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
331 {
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
332 if (lineMeasureFirst)
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
333 {
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
334 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
335 OrthancStone::Extent2D extent;
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
336 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
337 if (!extent.IsEmpty())
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
338 {
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
339 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
340 lineMeasureTool->Set(p, p);
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
341 }
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
342 lineMeasureFirst = false;
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
343 }
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
344
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
345 lineMeasureTool->Enable();
1790
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
346 angleMeasureTool->Disable();
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
347 activeTool = ActiveTool_Line;
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
348 }
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
349 #endif
1790
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
350 break;
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
351
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
352 case SDLK_a:
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
353 #if SAMPLE_USE_ANNOTATIONS_LAYER == 1
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
354 annotations.SetActiveTool(OrthancStone::AnnotationsSceneLayer::Tool_Angle);
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
355 #else
1790
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
356 if (activeTool == ActiveTool_Angle)
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
357 {
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
358 angleMeasureTool->Disable();
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
359 activeTool = ActiveTool_None;
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
360 }
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
361 else
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
362 {
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
363 if (angleMeasureFirst)
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
364 {
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
365 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
366 OrthancStone::Extent2D extent;
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
367 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
368 if (!extent.IsEmpty())
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
369 {
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
370 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
371 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
372 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
373 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
374 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
375 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
376 angleMeasureTool->SetSide1End(p1);
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
377 angleMeasureTool->SetCenter(p2);
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
378 angleMeasureTool->SetSide2End(p3);
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
379 }
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
380 angleMeasureFirst = false;
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
381 }
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
382
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
383 lineMeasureTool->Disable();
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
384 angleMeasureTool->Enable();
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
385 activeTool = ActiveTool_Angle;
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
386 }
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
387 #endif
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
388 break;
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
389
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
390 default:
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
391 break;
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
392 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
393 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
394 else if (event.type == SDL_MOUSEBUTTONDOWN ||
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
395 event.type == SDL_MOUSEMOTION ||
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
396 event.type == SDL_MOUSEBUTTONUP)
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
397 {
1507
169adf9090a6 replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1458
diff changeset
398 std::unique_ptr<OrthancStone::IViewport::ILock> lock(viewport->Lock());
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
399 if (lock->HasCompositor())
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
400 {
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
401 OrthancStone::PointerEvent p;
1382
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
402 OrthancStoneHelpers::GetPointerEvent(p, lock->GetCompositor(),
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
403 event, keyboardState, scancodeCount);
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
404
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
405 switch (event.type)
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
406 {
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
407 case SDL_MOUSEBUTTONDOWN:
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
408 {
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
409 boost::shared_ptr<OrthancStone::IFlexiblePointerTracker> t;
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
410
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
411 #if SAMPLE_USE_ANNOTATIONS_LAYER == 1
1799
1125793d82d3 serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1798
diff changeset
412 if (p.GetMouseButton() == OrthancStone::MouseButton_Left)
1125793d82d3 serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1798
diff changeset
413 {
1803
d1849468729b added messages to AnnotationsLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1801
diff changeset
414 t.reset(annotations.CreateTracker(p.GetMainPosition(), lock->GetController().GetScene()));
1799
1125793d82d3 serialization of annotations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1798
diff changeset
415 }
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
416 #else
1796
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
417 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
418 {
1796
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
419 switch (activeTool)
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
420 {
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
421 case ActiveTool_Angle:
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
422 t = angleMeasureTool->CreateEditionTracker(p);
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
423 break;
1790
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
424
1796
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
425 case ActiveTool_Line:
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
426 t = lineMeasureTool->CreateEditionTracker(p);
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
427 break;
1790
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
428
1796
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
429 case ActiveTool_None:
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
430 break;
1790
b325761e0bd3 angle measure and undo/redo in sdl simple viewer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1789
diff changeset
431
1796
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
432 default:
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
433 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
434 }
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
435 }
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
436 #endif
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
437
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
438 if (t.get() != NULL)
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
439 {
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
440 lock->GetController().AcquireActiveTracker(t);
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
441 }
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
442 else
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
443 {
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
444 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
445 lock->GetCompositor().GetCanvasWidth(),
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
446 lock->GetCompositor().GetCanvasHeight());
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
447 }
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
448 lock->Invalidate();
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
449 break;
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
450 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
451
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
452 case SDL_MOUSEMOTION:
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
453 #if SAMPLE_USE_ANNOTATIONS_LAYER == 1
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
454 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
455 {
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
456 lock->Invalidate();
1803
d1849468729b added messages to AnnotationsLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1801
diff changeset
457 if (annotations.ClearHover())
1796
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
458 {
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
459 paint = true;
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
460 }
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
461 }
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
462 else
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
463 {
1803
d1849468729b added messages to AnnotationsLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1801
diff changeset
464 if (annotations.SetMouseHover(p.GetMainPosition(), lock->GetController().GetScene()))
1796
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
465 {
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
466 paint = true;
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
467 }
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
468 }
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
469 #else
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
470 if (lock->GetController().HandleMouseMove(p))
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
471 {
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
472 lock->Invalidate();
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
473 paint = true;
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
474 }
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
475 #endif
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
476 break;
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
477
1789
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
478 case SDL_MOUSEBUTTONUP:
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
479 lock->GetController().HandleMouseRelease(p);
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
480 lock->Invalidate();
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
481 break;
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
482
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
483 default:
462d7a0e064e added line measures to sdl single frame viewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
484 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
485 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
486 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
487 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
488 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
489
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
490 if (paint)
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
491 {
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
492 #if SAMPLE_USE_ANNOTATIONS_LAYER == 1
1796
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
493 {
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
494 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
495 annotations.Render(lock->GetController().GetScene());
1796
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
496 }
1805
de7cea710008 recovery of old SdlSimpleViewer sample
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1804
diff changeset
497 #endif
1796
20a0aba0ede5 creation of AnnotationsOverlay
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1790
diff changeset
498
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
499 viewport->Paint();
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
500 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
501
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
502 // Small delay to avoid using 100% of CPU
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
503 SDL_Delay(1);
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
504 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
505 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
506 context.StopOracle();
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
507 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
508 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
509
1591
5887a4f8594b moving platform-specific files out of the "OrthancStone" folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1576
diff changeset
510 OrthancStone::SdlWindow::GlobalFinalize();
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
511 OrthancStone::StoneFinalize();
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
512 return 0;
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
513 }
1382
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
514 catch (Orthanc::OrthancException& e)
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
515 {
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
516 LOG(ERROR) << "OrthancException: " << e.What();
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
517 return -1;
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
518 }
1382
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
519 catch (OrthancStone::StoneException& e)
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
520 {
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
521 LOG(ERROR) << "StoneException: " << e.What();
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
522 return -1;
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
523 }
1382
9d138883be66 Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents: 1368
diff changeset
524 catch (std::runtime_error& e)
1368
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
525 {
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
526 LOG(ERROR) << "Runtime error: " << e.what();
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
527 return -1;
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
528 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
529 catch (...)
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
530 {
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
531 LOG(ERROR) << "Native exception";
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
532 return -1;
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
533 }
33da5d02885f SdlSimpleViewer rename
Benjamin Golinvaux <bgo@osimis.io>
parents:
diff changeset
534 }