annotate Applications/StoneApplicationContext.h @ 1006:4f28d9459e31 toa2019092001

Fixed unit tests and deprecated classes according to last API changes. UT all run ok.
author Benjamin Golinvaux <bgo@osimis.io>
date Fri, 20 Sep 2019 12:13:10 +0200
parents c35e98d22764
children e146743f6cdc 2d8ab34c8c91
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Stone of Orthanc
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
439
b70e9be013e4 preparing for 2019
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 418
diff changeset
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
0
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
47
28956ed68280 agpl license
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 40
diff changeset
8 * modify it under the terms of the GNU Affero General Public License
28956ed68280 agpl license
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 40
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
28956ed68280 agpl license
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 40
diff changeset
10 * the License, or (at your option) any later version.
0
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
47
28956ed68280 agpl license
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 40
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
28956ed68280 agpl license
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 40
diff changeset
15 * Affero General Public License for more details.
28956ed68280 agpl license
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 40
diff changeset
16 *
28956ed68280 agpl license
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 40
diff changeset
17 * You should have received a copy of the GNU Affero General Public License
0
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 **/
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 #pragma once
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23
732
c35e98d22764 move Deprecated classes to a separate folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
24 #include "../Framework/Deprecated/Toolbox/IWebService.h"
c35e98d22764 move Deprecated classes to a separate folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
25 #include "../Framework/Deprecated/Toolbox/IDelayedCallExecutor.h"
c35e98d22764 move Deprecated classes to a separate folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
26 #include "../Framework/Deprecated/Toolbox/OrthancApiClient.h"
c35e98d22764 move Deprecated classes to a separate folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 726
diff changeset
27 #include "../Framework/Deprecated/Viewport/WidgetViewport.h"
0
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28
466
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 440
diff changeset
29
566
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
30 #ifdef _MSC_VER
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
31 #if _MSC_VER > 1910
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
32 #define orthanc_override override
466
5055031f4a06 - Added browserify to build. This allows using require calls for modules that
bgo-osimis
parents: 440
diff changeset
33 #else
566
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
34 #define orthanc_override
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
35 #endif
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
36 #elif defined __GNUC__
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
37 #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
38 /* Test for GCC > 3.2.0 */
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
39 #if GCC_VERSION > 40900
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
40 #define orthanc_override override
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
41 #else
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
42 #define orthanc_override
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
43 #endif
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
44 #else
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
45 #define orthanc_override
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
46 #endif
ccd1a1ede305 fix previous merge
Alain Mazy <alain@mazy.be>
parents: 561
diff changeset
47
0
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 #include <list>
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 namespace OrthancStone
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 {
288
8c8da145fefa renamings and doc
am@osimis.io
parents: 271
diff changeset
52 // a StoneApplicationContext contains the services that a StoneApplication
8c8da145fefa renamings and doc
am@osimis.io
parents: 271
diff changeset
53 // uses and that depends on the environment in which the Application executes.
8c8da145fefa renamings and doc
am@osimis.io
parents: 271
diff changeset
54 // I.e, the StoneApplicationContext provides a WebService interface such that
8c8da145fefa renamings and doc
am@osimis.io
parents: 271
diff changeset
55 // the StoneApplication can perform HTTP requests. In a WASM environment,
8c8da145fefa renamings and doc
am@osimis.io
parents: 271
diff changeset
56 // the WebService is provided by the browser while, in a native environment,
8c8da145fefa renamings and doc
am@osimis.io
parents: 271
diff changeset
57 // the WebService is provided by the OracleWebService (a C++ Http client)
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
58
288
8c8da145fefa renamings and doc
am@osimis.io
parents: 271
diff changeset
59 class StoneApplicationContext : public boost::noncopyable
0
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 {
418
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
61 private:
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
62 MessageBroker& broker_;
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 566
diff changeset
63 Deprecated::IWebService* webService_;
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 566
diff changeset
64 Deprecated::IDelayedCallExecutor* delayedCallExecutor_;
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 566
diff changeset
65 std::auto_ptr<Deprecated::OrthancApiClient> orthanc_;
418
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
66 std::string orthancBaseUrl_;
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
67
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
68 void InitializeOrthanc();
0
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 public:
418
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
71 StoneApplicationContext(MessageBroker& broker) :
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
72 broker_(broker),
431
26b90b110719 added DelayedCallExecutor to avoid using sleep() in C++ that consumes 100% CPU once executed in WASM
am@osimis.io
parents: 418
diff changeset
73 webService_(NULL),
26b90b110719 added DelayedCallExecutor to avoid using sleep() in C++ that consumes 100% CPU once executed in WASM
am@osimis.io
parents: 418
diff changeset
74 delayedCallExecutor_(NULL)
242
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 231
diff changeset
75 {
092db46c6291 improved SDL/Wasm unification
am@osimis.io
parents: 231
diff changeset
76 }
53
c2dc924f1a63 removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 51
diff changeset
77
402
72355b637945 removed VolumeSlicerBase
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 288
diff changeset
78 virtual ~StoneApplicationContext()
72355b637945 removed VolumeSlicerBase
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 288
diff changeset
79 {
72355b637945 removed VolumeSlicerBase
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 288
diff changeset
80 }
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
81
418
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
82 MessageBroker& GetMessageBroker()
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
83 {
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
84 return broker_;
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
85 }
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
86
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
87 bool HasWebService() const
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
88 {
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
89 return webService_ != NULL;
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
90 }
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
91
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 566
diff changeset
92 Deprecated::IWebService& GetWebService();
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
93
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 566
diff changeset
94 Deprecated::OrthancApiClient& GetOrthancApiClient();
417
aee3d7941c9b preparing to load images using DICOMweb
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 402
diff changeset
95
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 566
diff changeset
96 void SetWebService(Deprecated::IWebService& webService);
418
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
97
c23df8b3433b refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 417
diff changeset
98 void SetOrthancBaseUrl(const std::string& baseUrl);
431
26b90b110719 added DelayedCallExecutor to avoid using sleep() in C++ that consumes 100% CPU once executed in WASM
am@osimis.io
parents: 418
diff changeset
99
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 566
diff changeset
100 void SetDelayedCallExecutor(Deprecated::IDelayedCallExecutor& delayedCallExecutor)
431
26b90b110719 added DelayedCallExecutor to avoid using sleep() in C++ that consumes 100% CPU once executed in WASM
am@osimis.io
parents: 418
diff changeset
101 {
26b90b110719 added DelayedCallExecutor to avoid using sleep() in C++ that consumes 100% CPU once executed in WASM
am@osimis.io
parents: 418
diff changeset
102 delayedCallExecutor_ = &delayedCallExecutor;
26b90b110719 added DelayedCallExecutor to avoid using sleep() in C++ that consumes 100% CPU once executed in WASM
am@osimis.io
parents: 418
diff changeset
103 }
26b90b110719 added DelayedCallExecutor to avoid using sleep() in C++ that consumes 100% CPU once executed in WASM
am@osimis.io
parents: 418
diff changeset
104
726
4f2416d519b4 moving layers, widgets and loaders to Deprecated namespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 566
diff changeset
105 Deprecated::IDelayedCallExecutor& GetDelayedCallExecutor()
431
26b90b110719 added DelayedCallExecutor to avoid using sleep() in C++ that consumes 100% CPU once executed in WASM
am@osimis.io
parents: 418
diff changeset
106 {
26b90b110719 added DelayedCallExecutor to avoid using sleep() in C++ that consumes 100% CPU once executed in WASM
am@osimis.io
parents: 418
diff changeset
107 return *delayedCallExecutor_;
26b90b110719 added DelayedCallExecutor to avoid using sleep() in C++ that consumes 100% CPU once executed in WASM
am@osimis.io
parents: 418
diff changeset
108 }
0
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 };
351ab0da0150 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 }