Mercurial > hg > orthanc-stone
annotate Applications/BasicApplicationContext.cpp @ 89:f244018a4e4b wasm
BUGGY- trying to remove IVolumeSlicesObserver
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 26 May 2017 18:27:59 +0200 |
| parents | 02c3a7a4938f |
| children | fcec0ab44054 |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 2 * Stone of Orthanc | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
|
40
7207a407bcd8
shared copyright with osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
31
diff
changeset
|
5 * Copyright (C) 2017 Osimis, Belgium |
| 0 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 47 | 8 * modify it under the terms of the GNU Affero General Public License |
| 9 * as published by the Free Software Foundation, either version 3 of | |
| 10 * the License, or (at your option) any later version. | |
| 0 | 11 * |
| 12 * This program is distributed in the hope that it will be useful, but | |
| 13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 47 | 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 15 * Affero General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Affero General Public License | |
| 0 | 18 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 19 **/ | |
| 20 | |
| 21 | |
| 22 #include "BasicApplicationContext.h" | |
| 23 | |
| 51 | 24 #include "../../Framework/Toolbox/OrthancSeriesLoader.h" |
| 25 #include "../../Framework/Volumes/VolumeImageSimplePolicy.h" | |
| 26 #include "../../Framework/Volumes/VolumeImageProgressivePolicy.h" | |
| 0 | 27 |
| 28 namespace OrthancStone | |
| 29 { | |
|
53
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
30 void BasicApplicationContext::UpdateThread(BasicApplicationContext* that) |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
31 { |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
32 while (!that->stopped_) |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
33 { |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
34 { |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
35 ViewportLocker locker(*that); |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
36 locker.GetViewport().UpdateContent(); |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
37 } |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
38 |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
39 boost::this_thread::sleep(boost::posix_time::milliseconds(that->updateDelay_)); |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
40 } |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
41 } |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
42 |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
43 |
|
81
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
44 BasicApplicationContext::BasicApplicationContext(Orthanc::WebServiceParameters& orthanc) : |
|
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
45 oracle_(viewportMutex_, 4), // Use 4 threads to download |
|
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
46 webService_(oracle_, orthanc), |
|
53
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
47 stopped_(true), |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
48 updateDelay_(100) // By default, 100ms between each refresh of the content |
| 0 | 49 { |
|
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
50 srand(time(NULL)); |
| 0 | 51 } |
| 52 | |
| 53 | |
| 54 BasicApplicationContext::~BasicApplicationContext() | |
| 55 { | |
| 56 for (Interactors::iterator it = interactors_.begin(); it != interactors_.end(); ++it) | |
| 57 { | |
| 58 assert(*it != NULL); | |
| 59 delete *it; | |
| 60 } | |
| 61 | |
| 62 for (Volumes::iterator it = volumes_.begin(); it != volumes_.end(); ++it) | |
| 63 { | |
| 64 assert(*it != NULL); | |
| 65 delete *it; | |
| 66 } | |
| 67 | |
| 68 for (StructureSets::iterator it = structureSets_.begin(); it != structureSets_.end(); ++it) | |
| 69 { | |
| 70 assert(*it != NULL); | |
| 71 delete *it; | |
| 72 } | |
| 73 } | |
| 74 | |
| 75 | |
| 76 IWidget& BasicApplicationContext::SetCentralWidget(IWidget* widget) // Takes ownership | |
| 77 { | |
| 78 viewport_.SetCentralWidget(widget); | |
| 79 return *widget; | |
| 80 } | |
| 81 | |
| 82 | |
| 83 VolumeImage& BasicApplicationContext::AddSeriesVolume(const std::string& series, | |
| 84 bool isProgressiveDownload, | |
| 85 size_t downloadThreadCount) | |
| 86 { | |
|
81
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
87 /*std::auto_ptr<VolumeImage> volume |
| 57 | 88 (new VolumeImage(new OrthancSeriesLoader(GetWebService().GetConnection(), series))); |
| 0 | 89 |
| 90 if (isProgressiveDownload) | |
| 91 { | |
| 92 volume->SetDownloadPolicy(new VolumeImageProgressivePolicy); | |
| 93 } | |
| 94 else | |
| 95 { | |
| 96 volume->SetDownloadPolicy(new VolumeImageSimplePolicy); | |
| 97 } | |
| 98 | |
| 99 volume->SetThreadCount(downloadThreadCount); | |
| 100 | |
| 101 VolumeImage& result = *volume; | |
| 102 volumes_.push_back(volume.release()); | |
| 103 | |
|
81
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
104 return result;*/ |
|
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
105 |
|
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
106 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
| 0 | 107 } |
| 108 | |
| 109 | |
| 110 DicomStructureSet& BasicApplicationContext::AddStructureSet(const std::string& instance) | |
| 111 { | |
|
81
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
112 /*std::auto_ptr<DicomStructureSet> structureSet |
| 57 | 113 (new DicomStructureSet(GetWebService().GetConnection(), instance)); |
| 0 | 114 |
| 115 DicomStructureSet& result = *structureSet; | |
| 116 structureSets_.push_back(structureSet.release()); | |
| 117 | |
|
81
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
118 return result;*/ |
|
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
119 |
|
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
120 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
| 0 | 121 } |
| 122 | |
| 123 | |
| 124 IWorldSceneInteractor& BasicApplicationContext::AddInteractor(IWorldSceneInteractor* interactor) | |
| 125 { | |
| 126 if (interactor == NULL) | |
| 127 { | |
| 128 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 129 } | |
| 130 | |
| 131 interactors_.push_back(interactor); | |
| 132 | |
| 133 return *interactor; | |
| 134 } | |
| 135 | |
| 136 | |
| 137 void BasicApplicationContext::Start() | |
| 138 { | |
|
81
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
139 oracle_.Start(); |
|
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
140 |
|
86
02c3a7a4938f
removing of the Start() mechanism
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
81
diff
changeset
|
141 // TODO REMOVE THIS |
| 0 | 142 for (Volumes::iterator it = volumes_.begin(); it != volumes_.end(); ++it) |
| 143 { | |
| 144 assert(*it != NULL); | |
| 145 (*it)->Start(); | |
| 146 } | |
| 147 | |
|
53
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
148 if (viewport_.HasUpdateContent()) |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
149 { |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
150 stopped_ = false; |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
151 updateThread_ = boost::thread(UpdateThread, this); |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
152 } |
| 0 | 153 } |
| 154 | |
| 155 | |
| 156 void BasicApplicationContext::Stop() | |
| 157 { | |
|
53
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
158 stopped_ = true; |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
159 |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
160 if (updateThread_.joinable()) |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
161 { |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
162 updateThread_.join(); |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
163 } |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
164 |
|
86
02c3a7a4938f
removing of the Start() mechanism
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
81
diff
changeset
|
165 // TODO REMOVE THIS |
| 0 | 166 for (Volumes::iterator it = volumes_.begin(); it != volumes_.end(); ++it) |
| 167 { | |
| 168 assert(*it != NULL); | |
| 169 (*it)->Stop(); | |
| 170 } | |
|
81
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
171 |
|
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
172 oracle_.Stop(); |
| 0 | 173 } |
| 174 } |