Mercurial > hg > orthanc-stone
comparison Applications/IBasicApplication.cpp @ 53:c2dc924f1a63 wasm
removing threading out of the framework
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 27 Apr 2017 16:57:49 +0200 |
parents | b340879da9bd |
children | d20e25cfcf3a |
comparison
equal
deleted
inserted
replaced
52:37e504582af6 | 53:c2dc924f1a63 |
---|---|
212 | 212 |
213 LogStatusBar statusBar; | 213 LogStatusBar statusBar; |
214 BasicApplicationContext context(orthanc); | 214 BasicApplicationContext context(orthanc); |
215 | 215 |
216 application.Initialize(context, statusBar, parameters); | 216 application.Initialize(context, statusBar, parameters); |
217 context.GetViewport().SetStatusBar(statusBar); | 217 |
218 { | |
219 BasicApplicationContext::ViewportLocker locker(context); | |
220 locker.GetViewport().SetStatusBar(statusBar); | |
221 } | |
218 | 222 |
219 std::string title = application.GetTitle(); | 223 std::string title = application.GetTitle(); |
220 if (title.empty()) | 224 if (title.empty()) |
221 { | 225 { |
222 title = "Stone of Orthanc"; | 226 title = "Stone of Orthanc"; |
230 **************************************************************/ | 234 **************************************************************/ |
231 | 235 |
232 LOG(WARNING) << "Starting the application"; | 236 LOG(WARNING) << "Starting the application"; |
233 | 237 |
234 SdlWindow window(title.c_str(), width, height, opengl); | 238 SdlWindow window(title.c_str(), width, height, opengl); |
235 SdlEngine sdl(window, context.GetViewport()); | 239 SdlEngine sdl(window, context); |
236 | 240 |
237 sdl.Run(); | 241 sdl.Run(); |
238 | 242 |
239 LOG(WARNING) << "Stopping the application"; | 243 LOG(WARNING) << "Stopping the application"; |
240 } | 244 } |
246 | 250 |
247 context.Stop(); | 251 context.Stop(); |
248 | 252 |
249 LOG(WARNING) << "The application has stopped"; | 253 LOG(WARNING) << "The application has stopped"; |
250 | 254 |
251 context.GetViewport().ResetStatusBar(); | 255 { |
256 BasicApplicationContext::ViewportLocker locker(context); | |
257 locker.GetViewport().ResetStatusBar(); | |
258 } | |
259 | |
252 application.Finalize(); | 260 application.Finalize(); |
253 } | 261 } |
254 catch (Orthanc::OrthancException& e) | 262 catch (Orthanc::OrthancException& e) |
255 { | 263 { |
256 LOG(ERROR) << "EXCEPTION: " << e.What(); | 264 LOG(ERROR) << "EXCEPTION: " << e.What(); |