Mercurial > hg > orthanc-stone
comparison Applications/Samples/SampleApplicationBase.h @ 242:092db46c6291 am
improved SDL/Wasm unification
author | am@osimis.io |
---|---|
date | Wed, 20 Jun 2018 14:20:55 +0200 |
parents | b4642964c355 |
children | dc1beee33134 |
comparison
equal
deleted
inserted
replaced
241:a4197519eb55 | 242:092db46c6291 |
---|---|
19 **/ | 19 **/ |
20 | 20 |
21 | 21 |
22 #pragma once | 22 #pragma once |
23 | 23 |
24 #if ORTHANC_ENABLE_SDL==1 | 24 //#if ORTHANC_ENABLE_SDL==1 |
25 #include "../../Applications/Sdl/BasicSdlApplication.h" | 25 //#include "../../Applications/Sdl/BasicSdlApplication.h" |
26 #else | 26 //#else |
27 #include "../../Applications/Wasm/BasicWasmApplication.h" | 27 //#include "../../Applications/Wasm/BasicWasmApplication.h" |
28 #endif | 28 //#endif |
29 #include "../../Applications/IBasicApplication.h" | |
29 #include "../../Framework/Viewport/WidgetViewport.h" | 30 #include "../../Framework/Viewport/WidgetViewport.h" |
30 #include "SampleApplicationContext.h" | 31 //#include "SampleApplicationContext.h" |
31 | 32 |
32 namespace OrthancStone | 33 namespace OrthancStone |
33 { | 34 { |
34 namespace Samples | 35 namespace Samples |
35 { | 36 { |
36 | 37 |
37 #if ORTHANC_ENABLE_SDL==1 | 38 //#if ORTHANC_ENABLE_SDL==1 |
38 class SampleSdlApplicationBase : public BasicSdlApplication { | 39 // class SampleSdlApplicationBase : public BasicSdlApplication { |
39 protected: | 40 // protected: |
40 std::unique_ptr<SampleApplicationContext> context_; | 41 // public: |
41 public: | 42 // virtual BasicApplicationContext& CreateApplicationContext(Orthanc::WebServiceParameters& orthanc, WidgetViewport* centralViewport) { |
42 virtual BasicApplicationContext& CreateApplicationContext(Orthanc::WebServiceParameters& orthanc, WidgetViewport* centralViewport) { | 43 // context_.reset(new SampleApplicationContext(orthanc, centralViewport)); |
43 context_.reset(new SampleApplicationContext(orthanc, centralViewport)); | |
44 | 44 |
45 return *context_; | 45 // return *context_; |
46 } | 46 // } |
47 }; | 47 // }; |
48 | 48 |
49 typedef SampleSdlApplicationBase SampleApplicationBase_; | 49 // typedef SampleSdlApplicationBase SampleApplicationBase_; |
50 #else | 50 //#else |
51 class SampleWasmApplicationBase : public BasicWasmApplication { | 51 // class SampleWasmApplicationBase : public BasicWasmApplication { |
52 protected: | 52 // protected: |
53 std::unique_ptr<SampleApplicationContext> context_; | 53 // std::unique_ptr<SampleApplicationContext> context_; |
54 public: | 54 // public: |
55 virtual BasicApplicationContext& CreateApplicationContext(IWebService& orthancWebService, std::shared_ptr<WidgetViewport> centralViewport) { | 55 // virtual BasicApplicationContext& CreateApplicationContext(IWebService& orthancWebService, std::shared_ptr<WidgetViewport> centralViewport) { |
56 context_.reset(new SampleApplicationContext(orthancWebService)); | 56 // context_.reset(new SampleApplicationContext(orthancWebService)); |
57 return *context_; | 57 // return *context_; |
58 } | 58 // } |
59 | 59 |
60 }; | 60 // }; |
61 | 61 |
62 typedef SampleWasmApplicationBase SampleApplicationBase_; | 62 // typedef SampleWasmApplicationBase SampleApplicationBase_; |
63 | 63 |
64 #endif | 64 //#endif |
65 | 65 |
66 class SampleApplicationBase : public SampleApplicationBase_ | 66 class SampleApplicationBase : public IBasicApplication |
67 { | 67 { |
68 public: | 68 public: |
69 virtual std::string GetTitle() const | 69 virtual std::string GetTitle() const |
70 { | 70 { |
71 return "Stone of Orthanc - Sample"; | 71 return "Stone of Orthanc - Sample"; |
72 } | 72 } |
73 | |
74 virtual void CustomInitialize() {} | |
75 | |
73 }; | 76 }; |
74 | 77 |
75 | 78 |
76 } | 79 } |
77 } | 80 } |