Mercurial > hg > orthanc-stone
annotate Applications/BasicApplicationContext.cpp @ 124:5099aaa53bd0 wasm
removal of OrthancSeriesLoader
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Sun, 08 Oct 2017 10:52:24 +0200 |
| parents | 42c05a3baee3 |
| children | 1982d6c1d2ff |
| 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 | |
| 24 namespace OrthancStone | |
| 25 { | |
|
53
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
26 void BasicApplicationContext::UpdateThread(BasicApplicationContext* that) |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
27 { |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
28 while (!that->stopped_) |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
29 { |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
30 { |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
31 ViewportLocker locker(*that); |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
32 locker.GetViewport().UpdateContent(); |
|
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 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
|
36 } |
|
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 |
|
81
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
40 BasicApplicationContext::BasicApplicationContext(Orthanc::WebServiceParameters& orthanc) : |
|
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
41 oracle_(viewportMutex_, 4), // Use 4 threads to download |
|
117
42c05a3baee3
loading multi-frame instances as 3D volumes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
107
diff
changeset
|
42 //oracle_(viewportMutex_, 1), // Disable threading to be reproducible |
|
81
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
43 webService_(oracle_, orthanc), |
|
53
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
44 stopped_(true), |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
45 updateDelay_(100) // By default, 100ms between each refresh of the content |
| 0 | 46 { |
|
89
f244018a4e4b
BUGGY- trying to remove IVolumeSlicesObserver
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
86
diff
changeset
|
47 srand(time(NULL)); |
| 0 | 48 } |
| 49 | |
| 50 | |
| 51 BasicApplicationContext::~BasicApplicationContext() | |
| 52 { | |
| 53 for (Interactors::iterator it = interactors_.begin(); it != interactors_.end(); ++it) | |
| 54 { | |
| 55 assert(*it != NULL); | |
| 56 delete *it; | |
| 57 } | |
| 58 | |
| 59 for (Volumes::iterator it = volumes_.begin(); it != volumes_.end(); ++it) | |
| 60 { | |
| 61 assert(*it != NULL); | |
| 62 delete *it; | |
| 63 } | |
| 64 | |
| 65 for (StructureSets::iterator it = structureSets_.begin(); it != structureSets_.end(); ++it) | |
| 66 { | |
| 67 assert(*it != NULL); | |
| 68 delete *it; | |
| 69 } | |
| 70 } | |
| 71 | |
| 72 | |
| 73 IWidget& BasicApplicationContext::SetCentralWidget(IWidget* widget) // Takes ownership | |
| 74 { | |
| 75 viewport_.SetCentralWidget(widget); | |
| 76 return *widget; | |
| 77 } | |
| 78 | |
| 79 | |
| 102 | 80 ISlicedVolume& BasicApplicationContext::AddVolume(ISlicedVolume* volume) |
| 0 | 81 { |
| 102 | 82 if (volume == NULL) |
| 0 | 83 { |
| 102 | 84 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); |
| 0 | 85 } |
| 86 | |
| 102 | 87 volumes_.push_back(volume); |
| 88 return *volume; | |
| 0 | 89 } |
| 90 | |
| 91 DicomStructureSet& BasicApplicationContext::AddStructureSet(const std::string& instance) | |
| 92 { | |
|
81
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
93 /*std::auto_ptr<DicomStructureSet> structureSet |
| 57 | 94 (new DicomStructureSet(GetWebService().GetConnection(), instance)); |
| 0 | 95 |
| 96 DicomStructureSet& result = *structureSet; | |
| 97 structureSets_.push_back(structureSet.release()); | |
| 98 | |
|
81
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
99 return result;*/ |
|
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
100 |
|
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
101 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
| 0 | 102 } |
| 103 | |
| 104 | |
| 105 IWorldSceneInteractor& BasicApplicationContext::AddInteractor(IWorldSceneInteractor* interactor) | |
| 106 { | |
| 107 if (interactor == NULL) | |
| 108 { | |
| 102 | 109 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); |
| 0 | 110 } |
| 111 | |
| 112 interactors_.push_back(interactor); | |
| 113 | |
| 114 return *interactor; | |
| 115 } | |
| 116 | |
| 117 | |
| 118 void BasicApplicationContext::Start() | |
| 119 { | |
|
81
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
120 oracle_.Start(); |
|
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
121 |
|
53
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
122 if (viewport_.HasUpdateContent()) |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
123 { |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
124 stopped_ = false; |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
125 updateThread_ = boost::thread(UpdateThread, this); |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
126 } |
| 0 | 127 } |
| 128 | |
| 129 | |
| 130 void BasicApplicationContext::Stop() | |
| 131 { | |
|
53
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
132 stopped_ = true; |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
133 |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
134 if (updateThread_.joinable()) |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
135 { |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
136 updateThread_.join(); |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
137 } |
|
c2dc924f1a63
removing threading out of the framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
51
diff
changeset
|
138 |
|
81
8677d95753f8
switching to Oracle in SDL samples
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
69
diff
changeset
|
139 oracle_.Stop(); |
| 0 | 140 } |
| 141 } |