Mercurial > hg > orthanc-stone
annotate Samples/Sdl/SingleFrameViewer/SdlSimpleViewer.cpp @ 1407:9c5a8cb3d856
Fixed event loop in simple viewer
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Mon, 04 May 2020 13:17:11 +0200 |
| parents | 62dc0d737e7b |
| children | 1e132fe7090e |
| rev | line source |
|---|---|
| 1368 | 1 |
| 2 #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
|
3 #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
|
4 #include "../../Common/SampleHelpers.h" |
| 1368 | 5 |
| 6 #include <Framework/Loaders/GenericLoadersContext.h> | |
| 7 #include <Framework/StoneException.h> | |
| 8 #include <Framework/StoneEnumerations.h> | |
| 9 #include <Framework/StoneInitialization.h> | |
| 10 #include <Framework/Viewport/SdlViewport.h> | |
| 11 | |
|
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
|
12 #include <Core/OrthancException.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
|
13 |
|
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
|
14 #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
|
15 #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
|
16 |
|
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
|
17 #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
|
18 |
| 1368 | 19 |
|
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
20 std::string orthancUrl; |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
21 std::string instanceId; |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
22 int frameIndex = 0; |
| 1368 | 23 |
|
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
|
24 |
|
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
25 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
|
26 { |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
27 namespace po = boost::program_options; |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
28 po::options_description desc("Usage:"); |
| 1368 | 29 |
|
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
30 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
|
31 ("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
|
32 "You can choose WARNING, INFO or TRACE for the logging level: Errors and warnings will always be displayed. (default: WARNING)") |
| 1368 | 33 |
|
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
34 ("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
|
35 "Base URL of the Orthanc instance") |
| 1368 | 36 |
|
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
37 ("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
|
38 "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
|
39 |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
40 ("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
|
41 "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
|
42 ; |
| 1368 | 43 |
|
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
44 po::variables_map vm; |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
45 try |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
46 { |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
47 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
|
48 po::notify(vm); |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
49 } |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
50 catch (std::exception& e) |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
51 { |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
52 std::cerr << "Please check your command line options! (\"" << e.what() << "\")" << std::endl; |
| 1368 | 53 } |
| 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 if (vm.count("loglevel") > 0) |
| 1368 | 56 { |
|
1387
4ebf246f3919
Fixed big mistake (factoring the option parsing, which only adds noise to the people reading the code)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1383
diff
changeset
|
57 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
|
58 OrthancStoneHelpers::SetLogLevel(logLevel); |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
59 } |
| 1368 | 60 |
|
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
61 if (vm.count("orthanc") > 0) |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
62 { |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
63 // maybe check URL validity here |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
64 orthancUrl = vm["orthanc"].as<std::string>(); |
| 1368 | 65 } |
| 66 | |
|
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
67 if (vm.count("instance") > 0) |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
68 { |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
69 instanceId = vm["instance"].as<std::string>(); |
|
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 |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
72 if (vm.count("frame_index") > 0) |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
73 { |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
74 frameIndex = vm["frame_index"].as<int>(); |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
75 } |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
76 |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
77 } |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
78 |
| 1368 | 79 /** |
| 80 * IMPORTANT: The full arguments to "main()" are needed for SDL on | |
| 81 * Windows. Otherwise, one gets the linking error "undefined reference | |
| 82 * to `SDL_main'". https://wiki.libsdl.org/FAQWindows | |
| 83 **/ | |
| 84 int main(int argc, char* argv[]) | |
| 85 { | |
| 86 try | |
| 87 { | |
| 88 OrthancStone::StoneInitialize(); | |
|
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
89 |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
90 ProcessOptions(argc, argv); |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
91 |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
92 //Orthanc::Logging::EnableInfoLevel(true); |
| 1368 | 93 //Orthanc::Logging::EnableTraceLevel(true); |
| 94 | |
| 95 { | |
| 96 | |
| 97 #if 1 | |
|
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
98 boost::shared_ptr<OrthancStone::SdlViewport> viewport = |
| 1368 | 99 OrthancStone::SdlOpenGLViewport::Create("Stone of Orthanc", 800, 600); |
| 100 #else | |
| 101 boost::shared_ptr<OrthancStone::SdlViewport> viewport = | |
| 102 OrthancStone::SdlCairoViewport::Create("Stone of Orthanc", 800, 600); | |
| 103 #endif | |
| 104 | |
| 105 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
|
106 |
|
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
|
107 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
|
108 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
|
109 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
|
110 |
| 1368 | 111 context.StartOracle(); |
| 112 | |
| 113 { | |
| 114 | |
| 115 boost::shared_ptr<SdlSimpleViewerApplication> application( | |
| 116 SdlSimpleViewerApplication::Create(context, viewport)); | |
| 117 | |
| 118 OrthancStone::DicomSource source; | |
| 119 | |
| 120 application->LoadOrthancFrame(source, instanceId, frameIndex); | |
| 121 | |
| 122 OrthancStone::DefaultViewportInteractor interactor; | |
| 123 | |
| 124 { | |
| 125 int scancodeCount = 0; | |
| 126 const uint8_t* keyboardState = SDL_GetKeyboardState(&scancodeCount); | |
| 127 | |
| 128 bool stop = false; | |
| 129 while (!stop) | |
| 130 { | |
| 131 bool paint = false; | |
| 132 SDL_Event event; | |
| 133 while (SDL_PollEvent(&event)) | |
| 134 { | |
| 135 if (event.type == SDL_QUIT) | |
| 136 { | |
| 137 stop = true; | |
| 138 break; | |
| 139 } | |
| 140 else if (viewport->IsRefreshEvent(event)) | |
| 141 { | |
| 142 paint = true; | |
| 143 } | |
| 144 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
|
145 (event.window.event == SDL_WINDOWEVENT_RESIZED || |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
146 event.window.event == SDL_WINDOWEVENT_SIZE_CHANGED)) |
| 1368 | 147 { |
| 148 viewport->UpdateSize(event.window.data1, event.window.data2); | |
| 149 } | |
| 150 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
|
151 (event.window.event == SDL_WINDOWEVENT_SHOWN || |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
152 event.window.event == SDL_WINDOWEVENT_EXPOSED)) |
| 1368 | 153 { |
| 154 paint = true; | |
| 155 } | |
| 156 else if (event.type == SDL_KEYDOWN && | |
| 157 event.key.repeat == 0 /* Ignore key bounce */) | |
| 158 { | |
| 159 switch (event.key.keysym.sym) | |
| 160 { | |
| 161 case SDLK_f: | |
| 162 viewport->ToggleMaximize(); | |
| 163 break; | |
| 164 | |
| 165 case SDLK_s: | |
| 166 application->FitContent(); | |
| 167 break; | |
| 168 | |
| 169 case SDLK_q: | |
| 170 stop = true; | |
| 171 break; | |
| 172 | |
| 173 default: | |
| 174 break; | |
| 175 } | |
| 176 } | |
| 177 else if (event.type == SDL_MOUSEBUTTONDOWN || | |
| 178 event.type == SDL_MOUSEMOTION || | |
| 179 event.type == SDL_MOUSEBUTTONUP) | |
| 180 { | |
| 181 std::auto_ptr<OrthancStone::IViewport::ILock> lock(viewport->Lock()); | |
| 182 if (lock->HasCompositor()) | |
| 183 { | |
| 184 OrthancStone::PointerEvent p; | |
|
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
185 OrthancStoneHelpers::GetPointerEvent(p, lock->GetCompositor(), |
|
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
186 event, keyboardState, scancodeCount); |
| 1368 | 187 |
| 188 switch (event.type) | |
| 189 { | |
| 190 case SDL_MOUSEBUTTONDOWN: | |
| 191 lock->GetController().HandleMousePress(interactor, p, | |
| 192 lock->GetCompositor().GetCanvasWidth(), | |
| 193 lock->GetCompositor().GetCanvasHeight()); | |
| 194 lock->Invalidate(); | |
| 195 break; | |
| 196 | |
| 197 case SDL_MOUSEMOTION: | |
| 198 if (lock->GetController().HandleMouseMove(p)) | |
| 199 { | |
| 200 lock->Invalidate(); | |
| 201 } | |
| 202 break; | |
| 203 | |
| 204 case SDL_MOUSEBUTTONUP: | |
| 205 lock->GetController().HandleMouseRelease(p); | |
| 206 lock->Invalidate(); | |
| 207 break; | |
| 208 | |
| 209 default: | |
| 210 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 211 } | |
| 212 } | |
| 213 } | |
| 214 } | |
| 215 | |
| 216 if (paint) | |
| 217 { | |
| 218 viewport->Paint(); | |
| 219 } | |
| 220 | |
| 221 // Small delay to avoid using 100% of CPU | |
| 222 SDL_Delay(1); | |
| 223 } | |
| 224 } | |
| 225 context.StopOracle(); | |
| 226 } | |
| 227 } | |
| 228 | |
| 229 OrthancStone::StoneFinalize(); | |
| 230 return 0; | |
| 231 } | |
|
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
232 catch (Orthanc::OrthancException& e) |
| 1368 | 233 { |
| 234 auto test = e.What(); | |
| 235 fprintf(stdout, test); | |
| 236 LOG(ERROR) << "OrthancException: " << e.What(); | |
| 237 return -1; | |
| 238 } | |
|
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
239 catch (OrthancStone::StoneException& e) |
| 1368 | 240 { |
| 241 LOG(ERROR) << "StoneException: " << e.What(); | |
| 242 return -1; | |
| 243 } | |
|
1382
9d138883be66
Proper command-line parameter management for SDL sample
Benjamin Golinvaux <bgo@osimis.io>
parents:
1368
diff
changeset
|
244 catch (std::runtime_error& e) |
| 1368 | 245 { |
| 246 LOG(ERROR) << "Runtime error: " << e.what(); | |
| 247 return -1; | |
| 248 } | |
| 249 catch (...) | |
| 250 { | |
| 251 LOG(ERROR) << "Native exception"; | |
| 252 return -1; | |
| 253 } | |
| 254 } |