Mercurial > hg > orthanc-stone

annotate Applications/Samples/Sdl/RtViewer/RtViewerSdl.cpp @ 1896:b3c08e607d9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplified signature of DicomStructureSet::ProjectStructure()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 26 Jan 2022 17:19:37 +0100
parents 7053b8a0aaec
children 184b0aeae1af
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
1 /**
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
2 * Stone of Orthanc
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
4 * Department, University Hospital of Liege, Belgium
1871
7053b8a0aaec upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1870
diff changeset
5 * Copyright (C) 2017-2022 Osimis S.A., Belgium
7053b8a0aaec upgrade to year 2022
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1870
diff changeset
6 * Copyright (C) 2021-2022 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
7 *
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
8 * This program is free software: you can redistribute it and/or
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
9 * modify it under the terms of the GNU Affero General Public License
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
10 * as published by the Free Software Foundation, either version 3 of
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
11 * the License, or (at your option) any later version.
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
12 *
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
13 * This program is distributed in the hope that it will be useful, but
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
14 * WITHOUT ANY WARRANTY; without even the implied warranty of
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
16 * Affero General Public License for more details.
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
17 *
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
18 * You should have received a copy of the GNU Affero General Public License
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
20 **/
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
21
1457
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1434
diff changeset
22 #include "../../Common/RtViewerApp.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1434
diff changeset
23 #include "../../Common/RtViewerView.h"
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
24 #include "../SdlHelpers.h"
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
25
1471
28c64c246312 working on a shared library
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1457
diff changeset
26 #include <EmbeddedResources.h>
28c64c246312 working on a shared library
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1457
diff changeset
27
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
28 // Stone of Orthanc includes
1542
6e0da8370270 fixing paths
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1538
diff changeset
29 #include "../../../../OrthancStone/Sources/Loaders/GenericLoadersContext.h"
6e0da8370270 fixing paths
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1538
diff changeset
30 #include "../../../../OrthancStone/Sources/OpenGL/OpenGLIncludes.h"
6e0da8370270 fixing paths
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1538
diff changeset
31 #include "../../../../OrthancStone/Sources/StoneException.h"
6e0da8370270 fixing paths
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1538
diff changeset
32 #include "../../../../OrthancStone/Sources/StoneInitialization.h"
1591
5887a4f8594b moving platform-specific files out of the "OrthancStone" folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1576
diff changeset
33 #include "../../../Platforms/Sdl/SdlOpenGLContext.h"
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
34
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
35 // Orthanc (a.o. for screenshot capture)
1507
169adf9090a6 replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1471
diff changeset
36 #include <Compatibility.h> // For std::unique_ptr<>
1457
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1434
diff changeset
37 #include <Images/Image.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1434
diff changeset
38 #include <Images/ImageProcessing.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1434
diff changeset
39 #include <Images/PngWriter.h>
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
40
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
41
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
42 #include <boost/program_options.hpp>
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
43 #include <boost/shared_ptr.hpp>
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
44
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
45 // #include <boost/pointer_cast.hpp> this include might be necessary in more recent boost versions
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
46
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
47 #include <SDL.h>
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
48
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
49 #include <string>
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
50
1430
5128b448a6ee yet another try to fix OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1429
diff changeset
51
1431
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
52 #if !defined(__APPLE__)
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
53 /**
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
54 * OpenGL: "OS X does not seem to support debug output functionality
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
55 * (as gathered online)."
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
56 * https://learnopengl.com/In-Practice/Debugging
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
57 **/
1430
5128b448a6ee yet another try to fix OS X
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1429
diff changeset
58 static void GLAPIENTRY
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
59 OpenGLMessageCallback(GLenum source,
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
60 GLenum type,
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
61 GLuint id,
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
62 GLenum severity,
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
63 GLsizei length,
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
64 const GLchar* message,
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
65 const void* userParam)
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
66 {
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
67 if (severity != GL_DEBUG_SEVERITY_NOTIFICATION)
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
68 {
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
69 fprintf(stderr, "GL CALLBACK: %s type = 0x%x, severity = 0x%x, message = %s\n",
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
70 (type == GL_DEBUG_TYPE_ERROR ? "** GL ERROR **" : ""),
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
71 type, severity, message);
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
72 }
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
73 }
1431
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
74 #endif
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
75
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
76 namespace OrthancStone
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
77 {
1404
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
78 void RtViewerView::EnableGLDebugOutput()
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
79 {
1431
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
80 #if !defined(__APPLE__)
1404
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
81 glEnable(GL_DEBUG_OUTPUT);
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
82 glDebugMessageCallback(OpenGLMessageCallback, 0);
1431
1eaf19af15bf OpenGL: OS X does not seem to support debug output functionality
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1430
diff changeset
83 #endif
1404
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
84 }
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
85
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
86 boost::shared_ptr<IViewport> RtViewerView::CreateViewport(const std::string& canvasId)
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
87 {
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
88 // False means we do NOT let Windows treat this as a legacy application that needs to be scaled
1404
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
89 return SdlOpenGLViewport::Create(canvasId, 1024, 1024, false);
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
90 }
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
91
1619
4c9e68291467 Added code to remove the wheel callback in dtor, to prevent access to dead object
Benjamin Golinvaux <bgo@osimis.io>
parents: 1591
diff changeset
92 void RtViewerView::CleanupViewportEvents()
4c9e68291467 Added code to remove the wheel callback in dtor, to prevent access to dead object
Benjamin Golinvaux <bgo@osimis.io>
parents: 1591
diff changeset
93 {
4c9e68291467 Added code to remove the wheel callback in dtor, to prevent access to dead object
Benjamin Golinvaux <bgo@osimis.io>
parents: 1591
diff changeset
94 // only used in WASM at the moment
4c9e68291467 Added code to remove the wheel callback in dtor, to prevent access to dead object
Benjamin Golinvaux <bgo@osimis.io>
parents: 1591
diff changeset
95 }
4c9e68291467 Added code to remove the wheel callback in dtor, to prevent access to dead object
Benjamin Golinvaux <bgo@osimis.io>
parents: 1591
diff changeset
96
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
97 void RtViewerApp::ProcessOptions(int argc, char* argv[])
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
98 {
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
99 namespace po = boost::program_options;
1532
c7a37c3a0b8e print help in sdl samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1525
diff changeset
100 po::options_description desc("Usage");
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
101
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
102 desc.add_options()
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
103 ("loglevel", po::value<std::string>()->default_value("WARNING"),
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
104 "You can choose WARNING, INFO or TRACE for the logging level: Errors and warnings will always be displayed. (default: WARNING)")
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
105
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
106 ("orthanc", po::value<std::string>()->default_value("http://localhost:8042"),
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
107 "Base URL of the Orthanc instance")
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
108
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
109 ("ctseries", po::value<std::string>()->default_value("a04ecf01-79b2fc33-58239f7e-ad9db983-28e81afa"),
1525
31b0449a163a JPEG mode re-enabled in MPR RT viewer + some docs
Benjamin Golinvaux <bgo@osimis.io>
parents: 1517
diff changeset
110 "Orthanc ID of the CT series to load. This must be supplied.")
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
111
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
112 ("rtdose", po::value<std::string>()->default_value("830a69ff-8e4b5ee3-b7f966c8-bccc20fb-d322dceb"),
1525
31b0449a163a JPEG mode re-enabled in MPR RT viewer + some docs
Benjamin Golinvaux <bgo@osimis.io>
parents: 1517
diff changeset
113 "Orthanc ID of the RTDOSE instance to load. This may be an empty string.")
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
114
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
115 ("rtstruct", po::value<std::string>()->default_value("54460695-ba3885ee-ddf61ac0-f028e31d-a6e474d9"),
1525
31b0449a163a JPEG mode re-enabled in MPR RT viewer + some docs
Benjamin Golinvaux <bgo@osimis.io>
parents: 1517
diff changeset
116 "Orthanc ID of the RTSTRUCT instance to load. This may be an empty string.")
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
117 ;
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
118
1532
c7a37c3a0b8e print help in sdl samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1525
diff changeset
119 std::cout << desc << std::endl;
c7a37c3a0b8e print help in sdl samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1525
diff changeset
120
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
121 po::variables_map vm;
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
122 try
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
123 {
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
124 po::store(po::parse_command_line(argc, argv, desc), vm);
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
125 po::notify(vm);
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
126 }
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
127 catch (std::exception& e)
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
128 {
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
129 std::cerr << "Please check your command line options! (\"" << e.what() << "\")" << std::endl;
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
130 }
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
131
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
132 for (po::variables_map::iterator it = vm.begin(); it != vm.end(); ++it)
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
133 {
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
134 std::string key = it->first;
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
135 const po::variable_value& value = it->second;
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
136 const std::string& strValue = value.as<std::string>();
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
137 SetArgument(key, strValue);
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
138 }
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
139 }
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
140
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
141 void RtViewerApp::RunSdl(int argc, char* argv[])
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
142 {
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
143 ProcessOptions(argc, argv);
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
144
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
145 /**
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
146 Create the shared loaders context
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
147 */
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
148 loadersContext_.reset(new GenericLoadersContext(1, 4, 1));
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
149
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
150 // we are in SDL --> downcast to concrete type
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
151 boost::shared_ptr<GenericLoadersContext> loadersContext = boost::dynamic_pointer_cast<GenericLoadersContext>(loadersContext_);
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
152
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
153 /**
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
154 Url of the Orthanc instance
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
155 Typically, in a native application (Qt, SDL), it will be an absolute URL like "http://localhost:8042". In
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
156 wasm on the browser, it could be an absolute URL, provided you do not have cross-origin problems, or a relative
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
157 URL. In our wasm samples, it is set to "..", because we set up either a reverse proxy or an Orthanc ServeFolders
1517
307a805d0587 rtviewer --> stone-rtviewer
Benjamin Golinvaux <bgo@osimis.io>
parents: 1512
diff changeset
158 plugin that serves the main web application from an URL like "http://localhost:8042/stone-rtviewer" (with ".."
307a805d0587 rtviewer --> stone-rtviewer
Benjamin Golinvaux <bgo@osimis.io>
parents: 1512
diff changeset
159 leading to the main Orthanc root URL)
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
160 */
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
161 std::string orthancUrl = arguments_["orthanc"];
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
162
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
163 {
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
164 Orthanc::WebServiceParameters p;
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
165 if (HasArgument("orthanc"))
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
166 {
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
167 p.SetUrl(orthancUrl);
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
168 }
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
169 if (HasArgument("user"))
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
170 {
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
171 ORTHANC_ASSERT(HasArgument("password"));
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
172 p.SetCredentials(GetArgument("user"), GetArgument("password"));
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
173 }
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
174 else
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
175 {
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
176 ORTHANC_ASSERT(!HasArgument("password"));
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
177 }
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
178 loadersContext->SetOrthancParameters(p);
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
179 }
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
180
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
181 loadersContext->StartOracle();
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
182
1404
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
183 CreateLoaders();
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
184
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
185 /**
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
186 Create viewports
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
187 */
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
188 CreateView("RtViewer Axial", VolumeProjection_Axial);
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
189 CreateView("RtViewer Coronal", VolumeProjection_Coronal);
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
190 CreateView("RtViewer Sagittal", VolumeProjection_Sagittal);
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
191
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
192 for (size_t i = 0; i < views_.size(); ++i)
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
193 {
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
194 views_[i]->PrepareViewport();
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
195 views_[i]->EnableGLDebugOutput();
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
196 }
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
197
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
198 DefaultViewportInteractor interactor;
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
199
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
200 /**
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
201 It is very important that the Oracle (responsible for network I/O) be started before creating and firing the
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
202 loaders, for any command scheduled by the loader before the oracle is started will be lost.
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
203 */
1404
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
204 StartLoaders();
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
205
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
206
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
207 SdlRunLoop(views_, interactor);
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
208 loadersContext->StopOracle();
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
209 }
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
210
1404
3e644f6fadd4 Three-viewport is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1393
diff changeset
211 void RtViewerView::TakeScreenshot(const std::string& target,
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
212 unsigned int canvasWidth,
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
213 unsigned int canvasHeight)
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
214 {
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
215 std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
216 ViewportController& controller = lock->GetController();
1573
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
217 const Scene2D& scene = controller.GetScene();
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
218
1471
28c64c246312 working on a shared library
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1457
diff changeset
219 std::string ttf;
28c64c246312 working on a shared library
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1457
diff changeset
220 Orthanc::EmbeddedResources::GetFileResource(ttf, Orthanc::EmbeddedResources::UBUNTU_FONT);
28c64c246312 working on a shared library
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1457
diff changeset
221
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
222 CairoCompositor compositor(canvasWidth, canvasHeight);
1471
28c64c246312 working on a shared library
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1457
diff changeset
223 compositor.SetFont(0, ttf, FONT_SIZE_0, Orthanc::Encoding_Latin1);
1393
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
224 compositor.Refresh(scene);
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
225
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
226 Orthanc::ImageAccessor canvas;
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
227 compositor.GetCanvas().GetReadOnlyAccessor(canvas);
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
228
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
229 Orthanc::Image png(Orthanc::PixelFormat_RGB24, canvas.GetWidth(), canvas.GetHeight(), false);
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
230 Orthanc::ImageProcessing::Convert(png, canvas);
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
231
27e0a00bd3e8 RtViewer SingleFrameViewer OK : wasm SDL single viewport
Benjamin Golinvaux <bgo@osimis.io>
parents: 1392
diff changeset
232 Orthanc::PngWriter writer;
1629
7fc8a3ff09ee fix build
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1619
diff changeset
233 Orthanc::IImageWriter::WriteToFile(writer, target, png);
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
234 }
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
235
1640
52b8b96cb55f cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1629
diff changeset
236 static boost::shared_ptr<RtViewerView> GetViewFromWindowId(
52b8b96cb55f cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1629
diff changeset
237 const std::vector<boost::shared_ptr<RtViewerView> >& views,
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
238 Uint32 windowID)
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
239 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
240 using namespace OrthancStone;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
241 for (size_t i = 0; i < views.size(); ++i)
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
242 {
1640
52b8b96cb55f cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1629
diff changeset
243 boost::shared_ptr<RtViewerView> view = views[i];
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
244 boost::shared_ptr<IViewport> viewport = view->GetViewport();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
245 boost::shared_ptr<SdlViewport> sdlViewport = boost::dynamic_pointer_cast<SdlViewport>(viewport);
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
246 Uint32 curWindowID = sdlViewport->GetSdlWindowId();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
247 if (windowID == curWindowID)
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
248 return view;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
249 }
1640
52b8b96cb55f cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1629
diff changeset
250 return boost::shared_ptr<RtViewerView>();
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
251 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
252
1640
52b8b96cb55f cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1629
diff changeset
253 void RtViewerApp::SdlRunLoop(const std::vector<boost::shared_ptr<RtViewerView> >& views,
52b8b96cb55f cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1629
diff changeset
254 DefaultViewportInteractor& interactor)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
255 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
256 using namespace OrthancStone;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
257
1640
52b8b96cb55f cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1629
diff changeset
258 // const std::vector<boost::shared_ptr<RtViewerView> >& views
52b8b96cb55f cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1629
diff changeset
259 std::vector<boost::shared_ptr<SdlViewport> > viewports;
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
260 for (size_t i = 0; i < views.size(); ++i)
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
261 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
262 boost::shared_ptr<RtViewerView> view = views[i];
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
263 boost::shared_ptr<IViewport> viewport = view->GetViewport();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
264 boost::shared_ptr<SdlViewport> sdlViewport =
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
265 boost::dynamic_pointer_cast<SdlViewport>(viewport);
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
266 viewports.push_back(sdlViewport);
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
267 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
268
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
269 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
270 int scancodeCount = 0;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
271 const uint8_t* keyboardState = SDL_GetKeyboardState(&scancodeCount);
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
272
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
273 bool stop = false;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
274 while (!stop)
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
275 {
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
276 std::vector<SDL_Event> sdlEvents;
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
277 std::map<Uint32,SDL_Event> userEventsMap;
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
278
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
279 {
1573
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
280 SDL_Event sdlEvent;
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
281
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
282 // FIRST: collect all pending events
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
283 while (SDL_PollEvent(&sdlEvent) != 0)
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
284 {
1573
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
285 if ( (sdlEvent.type >= SDL_USEREVENT) &&
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
286 (sdlEvent.type < SDL_LASTEVENT) )
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
287 {
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
288 // we don't want to have multiple refresh events ,
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
289 // and since every refresh event is a user event with a special type,
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
290 // we use a map
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
291 userEventsMap[sdlEvent.type] = sdlEvent;
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
292 }
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
293 else
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
294 {
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
295 sdlEvents.push_back(sdlEvent);
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
296 }
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
297 }
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
298 }
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
299
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
300 // SECOND: add all user events to sdlEvents
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
301 for (std::map<Uint32,SDL_Event>::const_iterator it = userEventsMap.begin(); it != userEventsMap.end(); ++it)
1573
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
302 {
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
303 sdlEvents.push_back(it->second);
1573
32e0c007789d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1542
diff changeset
304 }
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
305
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
306 // now process the events
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
307 for (std::vector<SDL_Event>::const_iterator it = sdlEvents.begin(); it != sdlEvents.end(); ++it)
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
308 {
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
309 const SDL_Event& sdlEvent = *it;
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
310
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
311 if (sdlEvent.type == SDL_QUIT)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
312 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
313 stop = true;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
314 break;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
315 }
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
316 else if (sdlEvent.type == SDL_WINDOWEVENT &&
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
317 (sdlEvent.window.event == SDL_WINDOWEVENT_RESIZED ||
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
318 sdlEvent.window.event == SDL_WINDOWEVENT_SIZE_CHANGED))
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
319 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
320 boost::shared_ptr<RtViewerView> view = GetViewFromWindowId(
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
321 views, sdlEvent.window.windowID);
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
322
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
323 boost::shared_ptr<SdlViewport> sdlViewport =
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
324 boost::dynamic_pointer_cast<SdlViewport>(view->GetViewport());
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
325
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
326 sdlViewport->UpdateSize(sdlEvent.window.data1, sdlEvent.window.data2);
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
327 }
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
328 else if (sdlEvent.type == SDL_WINDOWEVENT &&
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
329 (sdlEvent.window.event == SDL_WINDOWEVENT_SHOWN ||
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
330 sdlEvent.window.event == SDL_WINDOWEVENT_EXPOSED))
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
331 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
332 boost::shared_ptr<RtViewerView> view = GetViewFromWindowId(
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
333 views, sdlEvent.window.windowID);
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
334 boost::shared_ptr<SdlViewport> sdlViewport =
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
335 boost::dynamic_pointer_cast<SdlViewport>(view->GetViewport());
1576
92fca2b3ba3d sanitizing the handling of canvas size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
336
92fca2b3ba3d sanitizing the handling of canvas size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
337 {
1640
52b8b96cb55f cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1629
diff changeset
338 std::unique_ptr<IViewport::ILock> lock(sdlViewport->Lock());
1576
92fca2b3ba3d sanitizing the handling of canvas size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
339 lock->RefreshCanvasSize();
92fca2b3ba3d sanitizing the handling of canvas size
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1573
diff changeset
340 }
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
341 }
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
342 else if (sdlEvent.type == SDL_KEYDOWN &&
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
343 sdlEvent.key.repeat == 0 /* Ignore key bounce */)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
344 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
345 boost::shared_ptr<RtViewerView> view = GetViewFromWindowId(
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
346 views, sdlEvent.window.windowID);
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
347
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
348 switch (sdlEvent.key.keysym.sym)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
349 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
350 case SDLK_f:
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
351 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
352 boost::shared_ptr<SdlViewport> sdlViewport =
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
353 boost::dynamic_pointer_cast<SdlViewport>(view->GetViewport());
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
354 sdlViewport->ToggleMaximize();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
355 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
356 break;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
357
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
358 case SDLK_s:
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
359 {
1640
52b8b96cb55f cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1629
diff changeset
360 std::unique_ptr<IViewport::ILock> lock(view->GetViewport()->Lock());
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
361 lock->GetCompositor().FitContent(lock->GetController().GetScene());
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
362 lock->Invalidate();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
363 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
364 break;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
365
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
366 case SDLK_q:
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
367 stop = true;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
368 break;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
369
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
370 default:
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
371 break;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
372 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
373 }
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
374 else if (sdlEvent.type == SDL_MOUSEBUTTONDOWN ||
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
375 sdlEvent.type == SDL_MOUSEMOTION ||
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
376 sdlEvent.type == SDL_MOUSEBUTTONUP)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
377 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
378 boost::shared_ptr<RtViewerView> view = GetViewFromWindowId(
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
379 views, sdlEvent.window.windowID);
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
380
1640
52b8b96cb55f cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1629
diff changeset
381 std::unique_ptr<IViewport::ILock> lock(view->GetViewport()->Lock());
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
382 if (lock->HasCompositor())
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
383 {
1640
52b8b96cb55f cleaning namespaces
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1629
diff changeset
384 PointerEvent p;
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
385 OrthancStoneHelpers::GetPointerEvent(p, lock->GetCompositor(),
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
386 sdlEvent, keyboardState, scancodeCount);
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
387
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
388 switch (sdlEvent.type)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
389 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
390 case SDL_MOUSEBUTTONDOWN:
1535
301571299212 DefaultViewportInteractor::SetWindowingLayer()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1532
diff changeset
391 interactor.SetWindowingLayer(view->GetCtLayerIndex());
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
392 lock->GetController().HandleMousePress(interactor, p,
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
393 lock->GetCompositor().GetCanvasWidth(),
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
394 lock->GetCompositor().GetCanvasHeight());
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
395 lock->Invalidate();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
396 break;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
397
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
398 case SDL_MOUSEMOTION:
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
399 if (lock->GetController().HandleMouseMove(p))
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
400 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
401 lock->Invalidate();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
402 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
403 break;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
404
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
405 case SDL_MOUSEBUTTONUP:
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
406 lock->GetController().HandleMouseRelease(p);
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
407 lock->Invalidate();
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
408 break;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
409
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
410 default:
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
411 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
412 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
413 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
414 }
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
415 else if (sdlEvent.type == SDL_MOUSEWHEEL)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
416 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
417 boost::shared_ptr<RtViewerView> view = GetViewFromWindowId(
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
418 views, sdlEvent.window.windowID);
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
419
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
420 int delta = 0;
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
421 if (sdlEvent.wheel.y < 0)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
422 delta = -1;
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
423 if (sdlEvent.wheel.y > 0)
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
424 delta = 1;
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
425
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
426 view->Scroll(delta);
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
427 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
428 else
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
429 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
430 for (size_t i = 0; i < views.size(); ++i)
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
431 {
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
432 boost::shared_ptr<SdlViewport> sdlViewport =
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
433 boost::dynamic_pointer_cast<SdlViewport>(views[i]->GetViewport());
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
434 if (sdlViewport->IsRefreshEvent(sdlEvent))
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
435 {
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
436 sdlViewport->Paint();
1434
c6bfcc105414 Rewrite of the event loop to compact all refresh events. HUGE speedup when using the trackers, especially in Debug mode.
Benjamin Golinvaux <bgo@osimis.io>
parents: 1431
diff changeset
437 }
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
438 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
439 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
440 }
1408
875c9a28236e Fixed busy CPU in RtViewer
Benjamin Golinvaux <bgo@osimis.io>
parents: 1406
diff changeset
441 // Small delay to avoid using 100% of CPU
875c9a28236e Fixed busy CPU in RtViewer
Benjamin Golinvaux <bgo@osimis.io>
parents: 1406
diff changeset
442 SDL_Delay(1);
1406
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
443 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
444 }
5d7ee14dc1eb Mouse wheel handler is now OK in SDL and Wasm
Benjamin Golinvaux <bgo@osimis.io>
parents: 1404
diff changeset
445 }
1386
dfb48f0794b1 Ongoing splitting SDL vs WASM (preparing RtViewer WASM)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1384
diff changeset
446 }
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
447
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
448 boost::weak_ptr<OrthancStone::RtViewerApp> g_app;
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
449
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
450 /**
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
451 * IMPORTANT: The full arguments to "main()" are needed for SDL on
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
452 * Windows. Otherwise, one gets the linking error "undefined reference
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
453 * to `SDL_main'". https://wiki.libsdl.org/FAQWindows
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
454 **/
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
455 int main(int argc, char* argv[])
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
456 {
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
457 using namespace OrthancStone;
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
458
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
459 StoneInitialize();
1591
5887a4f8594b moving platform-specific files out of the "OrthancStone" folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1576
diff changeset
460 OrthancStone::SdlWindow::GlobalInitialize();
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
461
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
462 try
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
463 {
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
464 boost::shared_ptr<RtViewerApp> app = RtViewerApp::Create();
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
465 g_app = app;
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
466 app->RunSdl(argc,argv);
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
467 }
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
468 catch (Orthanc::OrthancException& e)
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
469 {
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
470 LOG(ERROR) << "EXCEPTION: " << e.What();
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
471 }
1591
5887a4f8594b moving platform-specific files out of the "OrthancStone" folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1576
diff changeset
472
5887a4f8594b moving platform-specific files out of the "OrthancStone" folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1576
diff changeset
473 OrthancStone::SdlWindow::GlobalFinalize();
1392
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
474 StoneFinalize();
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
475
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
476 return 0;
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
477 }
ffdb82850e98 Sdl run loop in /Common (might revert if need to customize)
Benjamin Golinvaux <bgo@osimis.io>
parents: 1389
diff changeset
478