Mercurial > hg > orthanc-stone

annotate Samples/Sdl/Loader.cpp @ 745:c44c1d2d3598

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reorganization
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 22 May 2019 12:08:15 +0200
parents a4bfb420b869
children d716bfb3e07c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Stone of Orthanc
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * modify it under the terms of the GNU Affero General Public License
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * the License, or (at your option) any later version.
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * Affero General Public License for more details.
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 *
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * You should have received a copy of the GNU Affero General Public License
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 **/
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
21
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
22 #include "../../Framework/Oracle/SleepOracleCommand.h"
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
23 #include "../../Framework/Oracle/OracleCommandExceptionMessage.h"
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
24 #include "../../Framework/Messages/IMessageEmitter.h"
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
25 #include "../../Framework/Oracle/OracleCommandWithPayload.h"
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
26 #include "../../Framework/Oracle/IOracle.h"
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
27
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 // From Stone
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
29 #include "../../Framework/Loaders/BasicFetchingItemsSorter.h"
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
30 #include "../../Framework/Loaders/BasicFetchingStrategy.h"
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
31 #include "../../Framework/Messages/ICallable.h"
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 #include "../../Framework/Messages/IMessage.h"
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
33 #include "../../Framework/Messages/IObservable.h"
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 #include "../../Framework/Messages/MessageBroker.h"
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
35 #include "../../Framework/Scene2D/ColorTextureSceneLayer.h"
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
36 #include "../../Framework/Scene2D/FloatTextureSceneLayer.h"
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
37 #include "../../Framework/Scene2D/Scene2D.h"
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
38 #include "../../Framework/StoneInitialization.h"
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
39 #include "../../Framework/Toolbox/GeometryToolbox.h"
683
dbc1d8bfc68a reorganizing ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 681
diff changeset
40 #include "../../Framework/Toolbox/SlicesSorter.h"
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
41 #include "../../Framework/Volumes/ImageBuffer3D.h"
742
fa5febe0f0c2 moved OrientedBoundingBox in the Volumes folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 735
diff changeset
42 #include "../../Framework/Volumes/VolumeImageGeometry.h"
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 // From Orthanc framework
637
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
45 #include <Core/Compression/GzipCompressor.h>
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
46 #include <Core/Compression/ZlibCompressor.h>
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
47 #include <Core/DicomFormat/DicomArray.h>
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
48 #include <Core/DicomFormat/DicomImageInformation.h>
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
49 #include <Core/HttpClient.h>
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 #include <Core/IDynamicObject.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 #include <Core/Images/Image.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 #include <Core/Images/ImageProcessing.h>
637
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
53 #include <Core/Images/JpegReader.h>
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
54 #include <Core/Images/PamReader.h>
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
55 #include <Core/Images/PngReader.h>
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 #include <Core/Images/PngWriter.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 #include <Core/Logging.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 #include <Core/MultiThreading/SharedMessageQueue.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 #include <Core/OrthancException.h>
683
dbc1d8bfc68a reorganizing ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 681
diff changeset
60 #include <Core/SystemToolbox.h>
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
61 #include <Core/Toolbox.h>
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 #include <json/reader.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 #include <json/value.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 #include <json/writer.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 #include <list>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 #include <stdio.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
72 namespace OrthancStone
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 typedef std::map<std::string, std::string> HttpHeaders;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
76 class OrthancRestApiCommand : public OracleCommandWithPayload
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 public:
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
79 class SuccessMessage : public OriginMessage<OrthancRestApiCommand>
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 {
643
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
81 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
82
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 private:
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 HttpHeaders headers_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 std::string answer_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 public:
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
88 SuccessMessage(const OrthancRestApiCommand& command,
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 const HttpHeaders& answerHeaders,
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 std::string& answer /* will be swapped to avoid a memcpy() */) :
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 OriginMessage(command),
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 headers_(answerHeaders),
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 answer_(answer)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 const std::string& GetAnswer() const
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 return answer_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
102 void ParseJsonBody(Json::Value& target) const
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 Json::Reader reader;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 if (!reader.parse(answer_, target))
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 const HttpHeaders& GetAnswerHeaders() const
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 return headers_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 };
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 private:
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 Orthanc::HttpMethod method_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 std::string uri_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
121 std::string body_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 HttpHeaders headers_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 unsigned int timeout_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 public:
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
126 OrthancRestApiCommand() :
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127 method_(Orthanc::HttpMethod_Get),
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 uri_("/"),
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 timeout_(10)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 virtual Type GetType() const
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 {
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
135 return Type_OrthancRestApi;
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 void SetMethod(Orthanc::HttpMethod method)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
139 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
140 method_ = method;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143 void SetUri(const std::string& uri)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 uri_ = uri;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 void SetBody(const std::string& body)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150 body_ = body;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 void SetBody(const Json::Value& json)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155 Json::FastWriter writer;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 body_ = writer.write(json);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159 void SetHttpHeader(const std::string& key,
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 const std::string& value)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 headers_[key] = value;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165 Orthanc::HttpMethod GetMethod() const
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167 return method_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170 const std::string& GetUri() const
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172 return uri_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175 const std::string& GetBody() const
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177 if (method_ == Orthanc::HttpMethod_Post ||
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178 method_ == Orthanc::HttpMethod_Put)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 return body_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182 else
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188 const HttpHeaders& GetHttpHeaders() const
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 return headers_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 void SetTimeout(unsigned int seconds)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195 timeout_ = seconds;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 unsigned int GetTimeout() const
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 return timeout_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 };
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
205
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
206
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
207 class GetOrthancImageCommand : public OracleCommandWithPayload
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
208 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
209 public:
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
210 class SuccessMessage : public OriginMessage<GetOrthancImageCommand>
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
211 {
643
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
212 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
213
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
214 private:
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
215 std::auto_ptr<Orthanc::ImageAccessor> image_;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
216 Orthanc::MimeType mime_;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
217
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
218 public:
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
219 SuccessMessage(const GetOrthancImageCommand& command,
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
220 Orthanc::ImageAccessor* image, // Takes ownership
637
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
221 Orthanc::MimeType mime) :
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
222 OriginMessage(command),
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
223 image_(image),
637
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
224 mime_(mime)
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
225 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
226 if (image == NULL)
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
227 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
228 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
229 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
230 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
231
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
232 const Orthanc::ImageAccessor& GetImage() const
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
233 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
234 return *image_;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
235 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
236
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
237 Orthanc::MimeType GetMimeType() const
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
238 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
239 return mime_;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
240 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
241 };
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
242
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
243
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
244 private:
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
245 std::string uri_;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
246 HttpHeaders headers_;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
247 unsigned int timeout_;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
248 bool hasExpectedFormat_;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
249 Orthanc::PixelFormat expectedFormat_;
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
250
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
251 public:
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
252 GetOrthancImageCommand() :
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
253 uri_("/"),
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
254 timeout_(10),
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
255 hasExpectedFormat_(false)
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
256 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
257 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
258
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
259 virtual Type GetType() const
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
260 {
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
261 return Type_GetOrthancImage;
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
262 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
263
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
264 void SetExpectedPixelFormat(Orthanc::PixelFormat format)
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
265 {
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
266 hasExpectedFormat_ = true;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
267 expectedFormat_ = format;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
268 }
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
269
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
270 void SetUri(const std::string& uri)
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
271 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
272 uri_ = uri;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
273 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
274
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
275 void SetInstanceUri(const std::string& instance,
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
276 Orthanc::PixelFormat pixelFormat)
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
277 {
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
278 uri_ = "/instances/" + instance;
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
279
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
280 switch (pixelFormat)
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
281 {
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
282 case Orthanc::PixelFormat_RGB24:
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
283 uri_ += "/preview";
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
284 break;
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
285
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
286 case Orthanc::PixelFormat_Grayscale16:
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
287 uri_ += "/image-uint16";
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
288 break;
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
289
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
290 case Orthanc::PixelFormat_SignedGrayscale16:
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
291 uri_ += "/image-int16";
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
292 break;
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
293
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
294 default:
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
295 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
296 }
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
297 }
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
298
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
299 void SetHttpHeader(const std::string& key,
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
300 const std::string& value)
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
301 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
302 headers_[key] = value;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
303 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
304
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
305 const std::string& GetUri() const
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
306 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
307 return uri_;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
308 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
309
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
310 const HttpHeaders& GetHttpHeaders() const
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
311 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
312 return headers_;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
313 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
314
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
315 void SetTimeout(unsigned int seconds)
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
316 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
317 timeout_ = seconds;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
318 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
319
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
320 unsigned int GetTimeout() const
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
321 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
322 return timeout_;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
323 }
640
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
324
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
325 void ProcessHttpAnswer(IMessageEmitter& emitter,
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
326 const IObserver& receiver,
640
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
327 const std::string& answer,
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
328 const HttpHeaders& answerHeaders) const
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
329 {
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
330 Orthanc::MimeType contentType = Orthanc::MimeType_Binary;
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
331
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
332 for (HttpHeaders::const_iterator it = answerHeaders.begin();
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
333 it != answerHeaders.end(); ++it)
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
334 {
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
335 std::string s;
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
336 Orthanc::Toolbox::ToLowerCase(s, it->first);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
337
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
338 if (s == "content-type")
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
339 {
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
340 contentType = Orthanc::StringToMimeType(it->second);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
341 break;
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
342 }
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
343 }
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
344
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
345 std::auto_ptr<Orthanc::ImageAccessor> image;
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
346
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
347 switch (contentType)
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
348 {
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
349 case Orthanc::MimeType_Png:
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
350 {
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
351 image.reset(new Orthanc::PngReader);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
352 dynamic_cast<Orthanc::PngReader&>(*image).ReadFromMemory(answer);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
353 break;
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
354 }
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
355
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
356 case Orthanc::MimeType_Pam:
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
357 {
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
358 image.reset(new Orthanc::PamReader);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
359 dynamic_cast<Orthanc::PamReader&>(*image).ReadFromMemory(answer);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
360 break;
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
361 }
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
362
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
363 case Orthanc::MimeType_Jpeg:
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
364 {
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
365 image.reset(new Orthanc::JpegReader);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
366 dynamic_cast<Orthanc::JpegReader&>(*image).ReadFromMemory(answer);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
367 break;
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
368 }
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
369
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
370 default:
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
371 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol,
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
372 "Unsupported HTTP Content-Type for an image: " +
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
373 std::string(Orthanc::EnumerationToString(contentType)));
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
374 }
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
375
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
376 if (hasExpectedFormat_)
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
377 {
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
378 if (expectedFormat_ == Orthanc::PixelFormat_SignedGrayscale16 &&
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
379 image->GetFormat() == Orthanc::PixelFormat_Grayscale16)
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
380 {
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
381 image->SetFormat(Orthanc::PixelFormat_SignedGrayscale16);
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
382 }
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
383
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
384 if (expectedFormat_ != image->GetFormat())
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
385 {
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
386 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat);
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
387 }
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
388 }
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
389
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
390 SuccessMessage message(*this, image.release(), contentType);
640
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
391 emitter.EmitMessage(receiver, message);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
392 }
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
393 };
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
394
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
395
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
396
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
397 class GetOrthancWebViewerJpegCommand : public OracleCommandWithPayload
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
398 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
399 public:
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
400 class SuccessMessage : public OriginMessage<GetOrthancWebViewerJpegCommand>
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
401 {
643
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
402 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
403
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
404 private:
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
405 std::auto_ptr<Orthanc::ImageAccessor> image_;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
406
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
407 public:
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
408 SuccessMessage(const GetOrthancWebViewerJpegCommand& command,
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
409 Orthanc::ImageAccessor* image) : // Takes ownership
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
410 OriginMessage(command),
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
411 image_(image)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
412 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
413 if (image == NULL)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
414 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
415 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
416 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
417 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
418
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
419 const Orthanc::ImageAccessor& GetImage() const
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
420 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
421 return *image_;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
422 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
423 };
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
424
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
425 private:
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
426 std::string instanceId_;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
427 unsigned int frame_;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
428 unsigned int quality_;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
429 HttpHeaders headers_;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
430 unsigned int timeout_;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
431 Orthanc::PixelFormat expectedFormat_;
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
432
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
433 public:
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
434 GetOrthancWebViewerJpegCommand() :
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
435 frame_(0),
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
436 quality_(95),
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
437 timeout_(10),
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
438 expectedFormat_(Orthanc::PixelFormat_Grayscale8)
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
439 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
440 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
441
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
442 virtual Type GetType() const
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
443 {
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
444 return Type_GetOrthancWebViewerJpeg;
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
445 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
446
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
447 void SetExpectedPixelFormat(Orthanc::PixelFormat format)
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
448 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
449 expectedFormat_ = format;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
450 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
451
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
452 void SetInstance(const std::string& instanceId)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
453 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
454 instanceId_ = instanceId;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
455 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
456
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
457 void SetFrame(unsigned int frame)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
458 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
459 frame_ = frame;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
460 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
461
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
462 void SetQuality(unsigned int quality)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
463 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
464 if (quality <= 0 ||
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
465 quality > 100)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
466 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
467 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
468 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
469 else
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
470 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
471 quality_ = quality;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
472 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
473 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
474
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
475 void SetHttpHeader(const std::string& key,
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
476 const std::string& value)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
477 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
478 headers_[key] = value;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
479 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
480
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
481 Orthanc::PixelFormat GetExpectedPixelFormat() const
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
482 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
483 return expectedFormat_;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
484 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
485
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
486 const std::string& GetInstanceId() const
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
487 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
488 return instanceId_;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
489 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
490
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
491 unsigned int GetFrame() const
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
492 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
493 return frame_;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
494 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
495
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
496 unsigned int GetQuality() const
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
497 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
498 return quality_;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
499 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
500
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
501 const HttpHeaders& GetHttpHeaders() const
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
502 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
503 return headers_;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
504 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
505
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
506 void SetTimeout(unsigned int seconds)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
507 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
508 timeout_ = seconds;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
509 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
510
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
511 unsigned int GetTimeout() const
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
512 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
513 return timeout_;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
514 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
515
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
516 std::string GetUri() const
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
517 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
518 return ("/web-viewer/instances/jpeg" + boost::lexical_cast<std::string>(quality_) +
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
519 "-" + instanceId_ + "_" + boost::lexical_cast<std::string>(frame_));
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
520 }
640
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
521
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
522 void ProcessHttpAnswer(IMessageEmitter& emitter,
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
523 const IObserver& receiver,
640
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
524 const std::string& answer) const
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
525 {
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
526 // This code comes from older "OrthancSlicesLoader::ParseSliceImageJpeg()"
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
527
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
528 Json::Value encoded;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
529
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
530 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
531 Json::Reader reader;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
532 if (!reader.parse(answer, encoded))
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
533 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
534 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
535 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
536 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
537
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
538 if (encoded.type() != Json::objectValue ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
539 !encoded.isMember("Orthanc") ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
540 encoded["Orthanc"].type() != Json::objectValue)
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
541 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
542 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
543 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
544
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
545 const Json::Value& info = encoded["Orthanc"];
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
546 if (!info.isMember("PixelData") ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
547 !info.isMember("Stretched") ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
548 !info.isMember("Compression") ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
549 info["Compression"].type() != Json::stringValue ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
550 info["PixelData"].type() != Json::stringValue ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
551 info["Stretched"].type() != Json::booleanValue ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
552 info["Compression"].asString() != "Jpeg")
640
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
553 {
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
554 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
555 }
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
556
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
557 bool isSigned = false;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
558 bool isStretched = info["Stretched"].asBool();
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
559
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
560 if (info.isMember("IsSigned"))
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
561 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
562 if (info["IsSigned"].type() != Json::booleanValue)
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
563 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
564 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
565 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
566 else
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
567 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
568 isSigned = info["IsSigned"].asBool();
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
569 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
570 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
571
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
572 std::auto_ptr<Orthanc::ImageAccessor> reader;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
573
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
574 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
575 std::string jpeg;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
576 Orthanc::Toolbox::DecodeBase64(jpeg, info["PixelData"].asString());
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
577
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
578 reader.reset(new Orthanc::JpegReader);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
579 dynamic_cast<Orthanc::JpegReader&>(*reader).ReadFromMemory(jpeg);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
580 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
581
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
582 if (reader->GetFormat() == Orthanc::PixelFormat_RGB24) // This is a color image
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
583 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
584 if (expectedFormat_ != Orthanc::PixelFormat_RGB24)
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
585 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
586 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
587 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
588
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
589 if (isSigned || isStretched)
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
590 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
591 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
592 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
593 else
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
594 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
595 SuccessMessage message(*this, reader.release());
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
596 emitter.EmitMessage(receiver, message);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
597 return;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
598 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
599 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
600
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
601 if (reader->GetFormat() != Orthanc::PixelFormat_Grayscale8)
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
602 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
603 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
604 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
605
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
606 if (!isStretched)
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
607 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
608 if (expectedFormat_ != reader->GetFormat())
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
609 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
610 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
611 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
612 else
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
613 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
614 SuccessMessage message(*this, reader.release());
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
615 emitter.EmitMessage(receiver, message);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
616 return;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
617 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
618 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
619
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
620 int32_t stretchLow = 0;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
621 int32_t stretchHigh = 0;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
622
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
623 if (!info.isMember("StretchLow") ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
624 !info.isMember("StretchHigh") ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
625 info["StretchLow"].type() != Json::intValue ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
626 info["StretchHigh"].type() != Json::intValue)
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
627 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
628 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
629 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
630
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
631 stretchLow = info["StretchLow"].asInt();
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
632 stretchHigh = info["StretchHigh"].asInt();
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
633
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
634 if (stretchLow < -32768 ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
635 stretchHigh > 65535 ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
636 (stretchLow < 0 && stretchHigh > 32767))
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
637 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
638 // This range cannot be represented with a uint16_t or an int16_t
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
639 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
640 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
641
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
642 // Decode a grayscale JPEG 8bpp image coming from the Web viewer
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
643 std::auto_ptr<Orthanc::ImageAccessor> image
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
644 (new Orthanc::Image(expectedFormat_, reader->GetWidth(), reader->GetHeight(), false));
640
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
645
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
646 Orthanc::ImageProcessing::Convert(*image, *reader);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
647 reader.reset();
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
648
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
649 float scaling = static_cast<float>(stretchHigh - stretchLow) / 255.0f;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
650
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
651 if (!LinearAlgebra::IsCloseToZero(scaling))
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
652 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
653 float offset = static_cast<float>(stretchLow) / scaling;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
654 Orthanc::ImageProcessing::ShiftScale(*image, offset, scaling, true);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
655 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
656
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
657 SuccessMessage message(*this, image.release());
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
658 emitter.EmitMessage(receiver, message);
640
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
659 }
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
660 };
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
661
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
662
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
663
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
664
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
665
648
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 647
diff changeset
666 class DicomInstanceParameters :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 647
diff changeset
667 public Orthanc::IDynamicObject /* to be used as a payload of SlicesSorter */
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
668 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
669 private:
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
670 struct Data // Struct to ease the copy constructor
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
671 {
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
672 std::string orthancInstanceId_;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
673 std::string studyInstanceUid_;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
674 std::string seriesInstanceUid_;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
675 std::string sopInstanceUid_;
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
676 Orthanc::DicomImageInformation imageInformation_;
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
677 SopClassUid sopClassUid_;
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
678 double thickness_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
679 double pixelSpacingX_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
680 double pixelSpacingY_;
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
681 CoordinateSystem3D geometry_;
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
682 Vector frameOffsets_;
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
683 bool isColor_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
684 bool hasRescale_;
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
685 double rescaleIntercept_;
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
686 double rescaleSlope_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
687 bool hasDefaultWindowing_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
688 float defaultWindowingCenter_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
689 float defaultWindowingWidth_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
690 Orthanc::PixelFormat expectedPixelFormat_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
691
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
692 void ComputeDoseOffsets(const Orthanc::DicomMap& dicom)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
693 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
694 // http://dicom.nema.org/medical/Dicom/2016a/output/chtml/part03/sect_C.8.8.3.2.html
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
695
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
696 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
697 std::string increment;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
698
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
699 if (dicom.CopyToString(increment, Orthanc::DICOM_TAG_FRAME_INCREMENT_POINTER, false))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
700 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
701 Orthanc::Toolbox::ToUpperCase(increment);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
702 if (increment != "3004,000C") // This is the "Grid Frame Offset Vector" tag
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
703 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
704 LOG(ERROR) << "RT-DOSE: Bad value for the \"FrameIncrementPointer\" tag";
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
705 return;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
706 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
707 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
708 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
709
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
710 if (!LinearAlgebra::ParseVector(frameOffsets_, dicom, Orthanc::DICOM_TAG_GRID_FRAME_OFFSET_VECTOR) ||
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
711 frameOffsets_.size() < imageInformation_.GetNumberOfFrames())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
712 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
713 LOG(ERROR) << "RT-DOSE: No information about the 3D location of some slice(s)";
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
714 frameOffsets_.clear();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
715 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
716 else
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
717 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
718 if (frameOffsets_.size() >= 2)
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
719 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
720 thickness_ = frameOffsets_[1] - frameOffsets_[0];
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
721
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
722 if (thickness_ < 0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
723 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
724 thickness_ = -thickness_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
725 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
726 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
727 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
728 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
729
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
730 Data(const Orthanc::DicomMap& dicom) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
731 imageInformation_(dicom)
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
732 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
733 if (imageInformation_.GetNumberOfFrames() <= 0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
734 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
735 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
736 }
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
737
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
738 if (!dicom.CopyToString(studyInstanceUid_, Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, false) ||
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
739 !dicom.CopyToString(seriesInstanceUid_, Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, false) ||
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
740 !dicom.CopyToString(sopInstanceUid_, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false))
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
741 {
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
742 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
743 }
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
744
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
745 std::string s;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
746 if (!dicom.CopyToString(s, Orthanc::DICOM_TAG_SOP_CLASS_UID, false))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
747 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
748 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
749 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
750 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
751 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
752 sopClassUid_ = StringToSopClassUid(s);
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
753 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
754
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
755 if (!dicom.ParseDouble(thickness_, Orthanc::DICOM_TAG_SLICE_THICKNESS))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
756 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
757 thickness_ = 100.0 * std::numeric_limits<double>::epsilon();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
758 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
759
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
760 GeometryToolbox::GetPixelSpacing(pixelSpacingX_, pixelSpacingY_, dicom);
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
761
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
762 std::string position, orientation;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
763 if (dicom.CopyToString(position, Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, false) &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
764 dicom.CopyToString(orientation, Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, false))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
765 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
766 geometry_ = CoordinateSystem3D(position, orientation);
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
767 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
768
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
769 if (sopClassUid_ == SopClassUid_RTDose)
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
770 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
771 ComputeDoseOffsets(dicom);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
772 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
773
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
774 isColor_ = (imageInformation_.GetPhotometricInterpretation() != Orthanc::PhotometricInterpretation_Monochrome1 &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
775 imageInformation_.GetPhotometricInterpretation() != Orthanc::PhotometricInterpretation_Monochrome2);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
776
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
777 double doseGridScaling;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
778
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
779 if (dicom.ParseDouble(rescaleIntercept_, Orthanc::DICOM_TAG_RESCALE_INTERCEPT) &&
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
780 dicom.ParseDouble(rescaleSlope_, Orthanc::DICOM_TAG_RESCALE_SLOPE))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
781 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
782 hasRescale_ = true;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
783 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
784 else if (dicom.ParseDouble(doseGridScaling, Orthanc::DICOM_TAG_DOSE_GRID_SCALING))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
785 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
786 hasRescale_ = true;
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
787 rescaleIntercept_ = 0;
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
788 rescaleSlope_ = doseGridScaling;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
789 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
790 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
791 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
792 hasRescale_ = false;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
793 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
794
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
795 Vector c, w;
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
796 if (LinearAlgebra::ParseVector(c, dicom, Orthanc::DICOM_TAG_WINDOW_CENTER) &&
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
797 LinearAlgebra::ParseVector(w, dicom, Orthanc::DICOM_TAG_WINDOW_WIDTH) &&
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
798 c.size() > 0 &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
799 w.size() > 0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
800 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
801 hasDefaultWindowing_ = true;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
802 defaultWindowingCenter_ = static_cast<float>(c[0]);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
803 defaultWindowingWidth_ = static_cast<float>(w[0]);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
804 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
805 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
806 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
807 hasDefaultWindowing_ = false;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
808 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
809
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
810 if (sopClassUid_ == SopClassUid_RTDose)
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
811 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
812 switch (imageInformation_.GetBitsStored())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
813 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
814 case 16:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
815 expectedPixelFormat_ = Orthanc::PixelFormat_Grayscale16;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
816 break;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
817
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
818 case 32:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
819 expectedPixelFormat_ = Orthanc::PixelFormat_Grayscale32;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
820 break;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
821
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
822 default:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
823 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
824 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
825 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
826 else if (isColor_)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
827 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
828 expectedPixelFormat_ = Orthanc::PixelFormat_RGB24;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
829 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
830 else if (imageInformation_.IsSigned())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
831 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
832 expectedPixelFormat_ = Orthanc::PixelFormat_SignedGrayscale16;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
833 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
834 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
835 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
836 expectedPixelFormat_ = Orthanc::PixelFormat_Grayscale16;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
837 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
838 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
839
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
840 CoordinateSystem3D GetFrameGeometry(unsigned int frame) const
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
841 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
842 if (frame == 0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
843 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
844 return geometry_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
845 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
846 else if (frame >= imageInformation_.GetNumberOfFrames())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
847 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
848 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
849 }
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
850 else if (sopClassUid_ == SopClassUid_RTDose)
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
851 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
852 if (frame >= frameOffsets_.size())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
853 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
854 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
855 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
856
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
857 return CoordinateSystem3D(
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
858 geometry_.GetOrigin() + frameOffsets_[frame] * geometry_.GetNormal(),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
859 geometry_.GetAxisX(),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
860 geometry_.GetAxisY());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
861 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
862 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
863 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
864 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
865 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
866 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
867
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
868 // TODO - Is this necessary?
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
869 bool FrameContainsPlane(unsigned int frame,
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
870 const CoordinateSystem3D& plane) const
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
871 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
872 if (frame >= imageInformation_.GetNumberOfFrames())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
873 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
874 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
875 }
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
876
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
877 CoordinateSystem3D tmp = geometry_;
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
878
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
879 if (frame != 0)
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
880 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
881 tmp = GetFrameGeometry(frame);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
882 }
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
883
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
884 double distance;
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
885
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
886 return (CoordinateSystem3D::GetDistance(distance, tmp, plane) &&
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
887 distance <= thickness_ / 2.0);
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
888 }
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
889
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
890
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
891 void ApplyRescale(Orthanc::ImageAccessor& image,
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
892 bool useDouble) const
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
893 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
894 if (image.GetFormat() != Orthanc::PixelFormat_Float32)
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
895 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
896 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat);
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
897 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
898
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
899 if (hasRescale_)
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
900 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
901 const unsigned int width = image.GetWidth();
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
902 const unsigned int height = image.GetHeight();
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
903
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
904 for (unsigned int y = 0; y < height; y++)
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
905 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
906 float* p = reinterpret_cast<float*>(image.GetRow(y));
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
907
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
908 if (useDouble)
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
909 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
910 // Slower, accurate implementation using double
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
911 for (unsigned int x = 0; x < width; x++, p++)
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
912 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
913 double value = static_cast<double>(*p);
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
914 *p = static_cast<float>(value * rescaleSlope_ + rescaleIntercept_);
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
915 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
916 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
917 else
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
918 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
919 // Fast, approximate implementation using float
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
920 for (unsigned int x = 0; x < width; x++, p++)
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
921 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
922 *p = (*p) * static_cast<float>(rescaleSlope_) + static_cast<float>(rescaleIntercept_);
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
923 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
924 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
925 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
926 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
927 }
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
928 };
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
929
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
930
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
931 Data data_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
932
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
933
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
934 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
935 DicomInstanceParameters(const DicomInstanceParameters& other) :
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
936 data_(other.data_)
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
937 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
938 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
939
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
940 DicomInstanceParameters(const Orthanc::DicomMap& dicom) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
941 data_(dicom)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
942 {
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
943 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
944
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
945 void SetOrthancInstanceIdentifier(const std::string& id)
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
946 {
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
947 data_.orthancInstanceId_ = id;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
948 }
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
949
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
950 const std::string& GetOrthancInstanceIdentifier() const
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
951 {
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
952 return data_.orthancInstanceId_;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
953 }
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
954
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
955 const Orthanc::DicomImageInformation& GetImageInformation() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
956 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
957 return data_.imageInformation_;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
958 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
959
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
960 const std::string& GetStudyInstanceUid() const
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
961 {
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
962 return data_.studyInstanceUid_;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
963 }
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
964
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
965 const std::string& GetSeriesInstanceUid() const
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
966 {
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
967 return data_.seriesInstanceUid_;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
968 }
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
969
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
970 const std::string& GetSopInstanceUid() const
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
971 {
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
972 return data_.sopInstanceUid_;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
973 }
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
974
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
975 SopClassUid GetSopClassUid() const
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
976 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
977 return data_.sopClassUid_;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
978 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
979
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
980 double GetThickness() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
981 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
982 return data_.thickness_;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
983 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
984
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
985 double GetPixelSpacingX() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
986 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
987 return data_.pixelSpacingX_;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
988 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
989
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
990 double GetPixelSpacingY() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
991 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
992 return data_.pixelSpacingY_;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
993 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
994
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
995 const CoordinateSystem3D& GetGeometry() const
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
996 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
997 return data_.geometry_;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
998 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
999
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1000 CoordinateSystem3D GetFrameGeometry(unsigned int frame) const
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1001 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1002 return data_.GetFrameGeometry(frame);
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1003 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1004
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1005 // TODO - Is this necessary?
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1006 bool FrameContainsPlane(unsigned int frame,
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1007 const CoordinateSystem3D& plane) const
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1008 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1009 return data_.FrameContainsPlane(frame, plane);
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1010 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1011
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1012 bool IsColor() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1013 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1014 return data_.isColor_;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1015 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1016
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1017 bool HasRescale() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1018 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1019 return data_.hasRescale_;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1020 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1021
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1022 double GetRescaleIntercept() const
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1023 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1024 if (data_.hasRescale_)
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1025 {
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1026 return data_.rescaleIntercept_;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1027 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1028 else
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1029 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1030 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1031 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1032 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1033
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1034 double GetRescaleSlope() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1035 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1036 if (data_.hasRescale_)
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1037 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1038 return data_.rescaleSlope_;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1039 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1040 else
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1041 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1042 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1043 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1044 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1045
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1046 bool HasDefaultWindowing() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1047 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1048 return data_.hasDefaultWindowing_;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1049 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1050
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1051 float GetDefaultWindowingCenter() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1052 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1053 if (data_.hasDefaultWindowing_)
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1054 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1055 return data_.defaultWindowingCenter_;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1056 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1057 else
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1058 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1059 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1060 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1061 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1062
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1063 float GetDefaultWindowingWidth() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1064 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1065 if (data_.hasDefaultWindowing_)
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1066 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1067 return data_.defaultWindowingWidth_;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1068 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1069 else
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1070 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1071 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1072 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1073 }
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1074
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1075 Orthanc::PixelFormat GetExpectedPixelFormat() const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1076 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1077 return data_.expectedPixelFormat_;
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1078 }
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1079
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1080
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1081 TextureBaseSceneLayer* CreateTexture(const Orthanc::ImageAccessor& source) const
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1082 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1083 assert(sizeof(float) == 4);
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1084
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1085 Orthanc::PixelFormat sourceFormat = source.GetFormat();
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1086
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1087 if (sourceFormat != GetExpectedPixelFormat())
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1088 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1089 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat);
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1090 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1091
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1092 if (sourceFormat == Orthanc::PixelFormat_RGB24)
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1093 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1094 // This is the case of a color image. No conversion has to be done.
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1095 return new ColorTextureSceneLayer(source);
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1096 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1097 else
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1098 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1099 if (sourceFormat != Orthanc::PixelFormat_Grayscale16 &&
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1100 sourceFormat != Orthanc::PixelFormat_Grayscale32 &&
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1101 sourceFormat != Orthanc::PixelFormat_SignedGrayscale16)
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1102 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1103 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1104 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1105
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1106 std::auto_ptr<FloatTextureSceneLayer> texture;
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1107
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1108 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1109 // This is the case of a grayscale frame. Convert it to Float32.
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1110 std::auto_ptr<Orthanc::Image> converted(new Orthanc::Image(Orthanc::PixelFormat_Float32,
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1111 source.GetWidth(),
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1112 source.GetHeight(),
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1113 false));
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1114 Orthanc::ImageProcessing::Convert(*converted, source);
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1115
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1116 // Correct rescale slope/intercept if need be
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1117 data_.ApplyRescale(*converted, (sourceFormat == Orthanc::PixelFormat_Grayscale32));
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1118
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1119 texture.reset(new FloatTextureSceneLayer(*converted));
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1120 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1121
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1122 if (data_.hasDefaultWindowing_)
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1123 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1124 texture->SetCustomWindowing(data_.defaultWindowingCenter_,
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1125 data_.defaultWindowingWidth_);
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1126 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1127
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1128 return texture.release();
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1129 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1130 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1131 };
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1132
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1133
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1134 class DicomVolumeImage : public boost::noncopyable
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1135 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1136 private:
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1137 std::auto_ptr<ImageBuffer3D> image_;
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1138 std::auto_ptr<VolumeImageGeometry> geometry_;
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1139 std::vector<DicomInstanceParameters*> slices_;
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1140 uint64_t revision_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1141 std::vector<uint64_t> slicesRevision_;
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1142 std::vector<unsigned int> slicesQuality_;
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1143
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1144 void CheckSlice(size_t index,
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1145 const DicomInstanceParameters& reference) const
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1146 {
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1147 const DicomInstanceParameters& slice = *slices_[index];
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1148
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1149 if (!GeometryToolbox::IsParallel(
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1150 reference.GetGeometry().GetNormal(),
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1151 slice.GetGeometry().GetNormal()))
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1152 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1153 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry,
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1154 "A slice in the volume image is not parallel to the others");
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1155 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1156
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1157 if (reference.GetExpectedPixelFormat() != slice.GetExpectedPixelFormat())
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1158 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1159 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat,
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1160 "The pixel format changes across the slices of the volume image");
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1161 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1162
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1163 if (reference.GetImageInformation().GetWidth() != slice.GetImageInformation().GetWidth() ||
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1164 reference.GetImageInformation().GetHeight() != slice.GetImageInformation().GetHeight())
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1165 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1166 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize,
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1167 "The width/height of slices are not constant in the volume image");
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1168 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1169
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1170 if (!LinearAlgebra::IsNear(reference.GetPixelSpacingX(), slice.GetPixelSpacingX()) ||
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1171 !LinearAlgebra::IsNear(reference.GetPixelSpacingY(), slice.GetPixelSpacingY()))
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1172 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1173 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry,
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1174 "The pixel spacing of the slices change across the volume image");
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1175 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1176 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1177
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1178
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1179 void CheckVolume() const
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1180 {
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1181 for (size_t i = 0; i < slices_.size(); i++)
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1182 {
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1183 assert(slices_[i] != NULL);
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1184 if (slices_[i]->GetImageInformation().GetNumberOfFrames() != 1)
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1185 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1186 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1187 "This class does not support multi-frame images");
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1188 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1189 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1190
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1191 if (slices_.size() != 0)
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1192 {
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1193 const DicomInstanceParameters& reference = *slices_[0];
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1194
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1195 for (size_t i = 1; i < slices_.size(); i++)
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1196 {
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1197 CheckSlice(i, reference);
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1198 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1199 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1200 }
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1201
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1202
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1203 void Clear()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1204 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1205 image_.reset();
735
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1206 geometry_.reset();
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1207
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1208 for (size_t i = 0; i < slices_.size(); i++)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1209 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1210 assert(slices_[i] != NULL);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1211 delete slices_[i];
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1212 }
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1213
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1214 slices_.clear();
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1215 slicesRevision_.clear();
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1216 slicesQuality_.clear();
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1217 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1218
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1219
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1220 void CheckSliceIndex(size_t index) const
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1221 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1222 assert(slices_.size() == image_->GetDepth() &&
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1223 slices_.size() == slicesRevision_.size());
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1224
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1225 if (!HasGeometry())
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1226 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1227 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1228 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1229 else if (index >= slices_.size())
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1230 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1231 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1232 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1233 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1234
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1235
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1236 public:
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1237 DicomVolumeImage()
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1238 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1239 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1240
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1241 ~DicomVolumeImage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1242 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1243 Clear();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1244 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1245
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1246 // WARNING: The payload of "slices" must be of class "DicomInstanceParameters"
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1247 void SetGeometry(SlicesSorter& slices)
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1248 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1249 Clear();
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1250
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1251 if (!slices.Sort())
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1252 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1253 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange,
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1254 "Cannot sort the 3D slices of a DICOM series");
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1255 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1256
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1257 geometry_.reset(new VolumeImageGeometry);
735
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1258
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1259 if (slices.GetSlicesCount() == 0)
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1260 {
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1261 // Empty volume
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1262 image_.reset(new ImageBuffer3D(Orthanc::PixelFormat_Grayscale8, 0, 0, 0,
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1263 false /* don't compute range */));
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1264 }
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1265 else
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1266 {
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1267 slices_.reserve(slices.GetSlicesCount());
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1268 slicesRevision_.resize(slices.GetSlicesCount(), 0);
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1269 slicesQuality_.resize(slices.GetSlicesCount(), 0);
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1270
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1271 for (size_t i = 0; i < slices.GetSlicesCount(); i++)
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1272 {
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1273 const DicomInstanceParameters& slice =
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1274 dynamic_cast<const DicomInstanceParameters&>(slices.GetSlicePayload(i));
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1275 slices_.push_back(new DicomInstanceParameters(slice));
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1276 }
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1277
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1278 CheckVolume();
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1279
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1280 const double spacingZ = slices.ComputeSpacingBetweenSlices();
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1281 LOG(INFO) << "Computed spacing between slices: " << spacingZ << "mm";
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1282
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1283 const DicomInstanceParameters& parameters = *slices_[0];
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1284
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1285 image_.reset(new ImageBuffer3D(parameters.GetExpectedPixelFormat(),
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1286 parameters.GetImageInformation().GetWidth(),
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1287 parameters.GetImageInformation().GetHeight(),
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1288 slices.GetSlicesCount(), false /* don't compute range */));
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1289
735
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1290 geometry_->SetSize(image_->GetWidth(), image_->GetHeight(), image_->GetDepth());
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1291 geometry_->SetAxialGeometry(slices.GetSliceGeometry(0));
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1292 geometry_->SetVoxelDimensions(parameters.GetPixelSpacingX(),
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1293 parameters.GetPixelSpacingY(), spacingZ);
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1294 }
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1295
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1296 image_->Clear();
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1297
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1298 revision_++;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1299 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1300
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1301 uint64_t GetRevision() const
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1302 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1303 return revision_;
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1304 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1305
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1306 bool HasGeometry() const
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1307 {
735
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1308 return (image_.get() != NULL &&
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1309 geometry_.get() != NULL);
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1310 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1311
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1312 const ImageBuffer3D& GetImage() const
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1313 {
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1314 if (!HasGeometry())
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1315 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1316 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1317 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1318 else
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1319 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1320 return *image_;
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1321 }
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1322 }
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1323
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1324 const VolumeImageGeometry& GetGeometry() const
735
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1325 {
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1326 if (!HasGeometry())
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1327 {
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1328 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1329 }
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1330 else
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1331 {
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1332 return *geometry_;
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1333 }
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1334 }
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
1335
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1336 size_t GetSlicesCount() const
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1337 {
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1338 if (!HasGeometry())
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1339 {
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1340 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1341 }
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1342 else
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1343 {
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1344 return slices_.size();
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1345 }
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1346 }
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1347
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1348 const DicomInstanceParameters& GetSliceParameters(size_t index) const
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1349 {
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1350 CheckSliceIndex(index);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1351 return *slices_[index];
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1352 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1353
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1354 uint64_t GetSliceRevision(size_t index) const
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1355 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1356 CheckSliceIndex(index);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1357 return slicesRevision_[index];
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
1358 }
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1359
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1360 void SetSliceContent(size_t index,
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1361 const Orthanc::ImageAccessor& image,
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1362 unsigned int quality)
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1363 {
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1364 CheckSliceIndex(index);
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1365
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1366 // If a better image quality is already available, don't update the content
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1367 if (quality >= slicesQuality_[index])
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1368 {
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1369 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1370 ImageBuffer3D::SliceWriter writer
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1371 (*image_, VolumeProjection_Axial, index);
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1372 Orthanc::ImageProcessing::Copy(writer.GetAccessor(), image);
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1373 }
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1374
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1375 revision_ ++;
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1376 slicesRevision_[index] += 1;
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1377 }
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1378 }
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1379 };
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1380
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1381
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1382
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1383 class IDicomVolumeSource : public boost::noncopyable
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1384 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1385 public:
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1386 virtual ~IDicomVolumeSource()
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1387 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1388 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1389
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1390 virtual const DicomVolumeImage& GetVolume() const = 0;
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1391
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1392 virtual void NotifyAxialSliceAccessed(unsigned int sliceIndex) = 0;
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1393 };
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1394
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1395
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
1396
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1397 class VolumeSeriesOrthancLoader :
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1398 public IObserver,
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1399 public IDicomVolumeSource
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1400 {
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1401 private:
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1402 static const unsigned int LOW_QUALITY = 0;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1403 static const unsigned int MIDDLE_QUALITY = 1;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1404 static const unsigned int BEST_QUALITY = 2;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1405
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1406
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1407 static unsigned int GetSliceIndexPayload(const OracleCommandWithPayload& command)
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1408 {
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1409 return dynamic_cast< const Orthanc::SingleValueObject<unsigned int>& >(command.GetPayload()).GetValue();
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1410 }
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1411
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1412
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1413 void ScheduleNextSliceDownload()
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1414 {
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1415 assert(strategy_.get() != NULL);
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1416
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1417 unsigned int sliceIndex, quality;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1418
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1419 if (strategy_->GetNext(sliceIndex, quality))
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1420 {
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1421 assert(quality <= BEST_QUALITY);
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1422
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1423 const DicomInstanceParameters& slice = volume_.GetSliceParameters(sliceIndex);
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1424
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1425 const std::string& instance = slice.GetOrthancInstanceIdentifier();
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1426 if (instance.empty())
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1427 {
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1428 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1429 }
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1430
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1431 std::auto_ptr<OracleCommandWithPayload> command;
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1432
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1433 if (quality == BEST_QUALITY)
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1434 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1435 std::auto_ptr<GetOrthancImageCommand> tmp(new GetOrthancImageCommand);
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1436 tmp->SetHttpHeader("Accept-Encoding", "gzip");
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1437 tmp->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam)));
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1438 tmp->SetInstanceUri(instance, slice.GetExpectedPixelFormat());
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1439 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat());
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1440 command.reset(tmp.release());
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1441 }
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1442 else
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1443 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1444 std::auto_ptr<GetOrthancWebViewerJpegCommand> tmp(new GetOrthancWebViewerJpegCommand);
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1445 tmp->SetHttpHeader("Accept-Encoding", "gzip");
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1446 tmp->SetInstance(instance);
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1447 tmp->SetQuality((quality == 0 ? 50 : 90));
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1448 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat());
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1449 command.reset(tmp.release());
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1450 }
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1451
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1452 command->SetPayload(new Orthanc::SingleValueObject<unsigned int>(sliceIndex));
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1453 oracle_.Schedule(*this, command.release());
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1454 }
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1455 }
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1456
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1457
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1458 void LoadGeometry(const OrthancRestApiCommand::SuccessMessage& message)
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1459 {
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1460 Json::Value body;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1461 message.ParseJsonBody(body);
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1462
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1463 if (body.type() != Json::objectValue)
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1464 {
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1465 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol);
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1466 }
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1467
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1468 {
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1469 Json::Value::Members instances = body.getMemberNames();
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1470
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1471 SlicesSorter slices;
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1472
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1473 for (size_t i = 0; i < instances.size(); i++)
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1474 {
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1475 Orthanc::DicomMap dicom;
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1476 dicom.FromDicomAsJson(body[instances[i]]);
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1477
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1478 std::auto_ptr<DicomInstanceParameters> instance(new DicomInstanceParameters(dicom));
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1479 instance->SetOrthancInstanceIdentifier(instances[i]);
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1480
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1481 CoordinateSystem3D geometry = instance->GetGeometry();
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1482 slices.AddSlice(geometry, instance.release());
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1483 }
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1484
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1485 volume_.SetGeometry(slices);
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1486 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1487
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1488 if (volume_.GetSlicesCount() != 0)
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1489 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1490 strategy_.reset(new BasicFetchingStrategy(
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1491 new BasicFetchingItemsSorter(volume_.GetSlicesCount()), BEST_QUALITY));
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1492
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1493 for (unsigned int i = 0; i < 4; i++) // Schedule up to 4 simultaneous downloads (TODO - parameter)
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1494 {
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1495 ScheduleNextSliceDownload();
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1496 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1497 }
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1498 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1499
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1500
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1501 void LoadBestQualitySliceContent(const GetOrthancImageCommand::SuccessMessage& message)
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1502 {
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1503 volume_.SetSliceContent(GetSliceIndexPayload(message.GetOrigin()),
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1504 message.GetImage(), BEST_QUALITY);
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1505
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1506 ScheduleNextSliceDownload();
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1507 }
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1508
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1509
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1510 void LoadJpegSliceContent(const GetOrthancWebViewerJpegCommand::SuccessMessage& message)
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1511 {
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1512 unsigned int quality;
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1513
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1514 switch (message.GetOrigin().GetQuality())
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1515 {
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1516 case 50:
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1517 quality = LOW_QUALITY;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1518 break;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1519
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1520 case 90:
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1521 quality = MIDDLE_QUALITY;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1522 break;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1523
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1524 default:
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1525 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1526 }
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1527
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1528 volume_.SetSliceContent(GetSliceIndexPayload(message.GetOrigin()), message.GetImage(), quality);
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1529
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1530 ScheduleNextSliceDownload();
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1531 }
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1532
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1533
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1534 IOracle& oracle_;
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
1535 bool active_;
683
dbc1d8bfc68a reorganizing ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 681
diff changeset
1536 DicomVolumeImage volume_;
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
1537
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1538 std::auto_ptr<IFetchingStrategy> strategy_;
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1539
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1540 public:
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1541 VolumeSeriesOrthancLoader(IOracle& oracle,
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1542 IObservable& oracleObservable) :
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1543 IObserver(oracleObservable.GetBroker()),
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1544 oracle_(oracle),
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1545 active_(false)
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1546 {
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1547 oracleObservable.RegisterObserverCallback(
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1548 new Callable<VolumeSeriesOrthancLoader, OrthancRestApiCommand::SuccessMessage>
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1549 (*this, &VolumeSeriesOrthancLoader::LoadGeometry));
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1550
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1551 oracleObservable.RegisterObserverCallback(
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1552 new Callable<VolumeSeriesOrthancLoader, GetOrthancImageCommand::SuccessMessage>
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1553 (*this, &VolumeSeriesOrthancLoader::LoadBestQualitySliceContent));
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1554
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1555 oracleObservable.RegisterObserverCallback(
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1556 new Callable<VolumeSeriesOrthancLoader, GetOrthancWebViewerJpegCommand::SuccessMessage>
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1557 (*this, &VolumeSeriesOrthancLoader::LoadJpegSliceContent));
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1558 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1559
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1560 void LoadSeries(const std::string& seriesId)
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1561 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1562 if (active_)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1563 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1564 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1565 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1566
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1567 active_ = true;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1568
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1569 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1570 command->SetUri("/series/" + seriesId + "/instances-tags");
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1571
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1572 oracle_.Schedule(*this, command.release());
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1573 }
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1574
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1575
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1576 virtual const DicomVolumeImage& GetVolume() const
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1577 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1578 return volume_;
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1579 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1580
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1581
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1582 virtual void NotifyAxialSliceAccessed(unsigned int sliceIndex)
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1583 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1584 if (strategy_.get() == NULL)
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1585 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1586 // Should have called GetVolume().HasGeometry() before
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1587 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1588 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1589 else
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1590 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1591 strategy_->SetCurrent(sliceIndex);
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1592 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1593 }
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1594 };
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1595
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1596
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1597
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1598 #if 0
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1599 void LoadInstance(const std::string& instanceId)
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1600 {
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1601 if (active_)
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1602 {
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1603 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1604 }
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1605
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1606 active_ = true;
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1607
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1608 // Tag "3004-000c" is "Grid Frame Offset Vector", which is
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1609 // mandatory to read RT DOSE, but is too long to be returned by default
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1610
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1611 // TODO => Should be part of a second call if needed
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1612
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1613 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1614 command->SetUri("/instances/" + instanceId + "/tags?ignore-length=3004-000c");
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1615 command->SetPayload(new LoadInstanceGeometryHandler(*this));
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1616
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1617 oracle_.Schedule(*this, command.release());
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1618 }
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1619 #endif
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
1620
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1621
692
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1622 /* class VolumeSlicerBase : public IVolumeSlicer
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1623 {
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1624 private:
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1625 Scene2D& scene_;
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1626 int layerDepth_;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1627 bool first_;
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1628 CoordinateSystem3D lastPlane_;
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1629
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1630 protected:
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1631 bool HasViewportPlaneChanged(const CoordinateSystem3D& plane) const
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1632 {
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1633 if (first_ ||
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1634 !LinearAlgebra::IsCloseToZero(
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1635 boost::numeric::ublas::norm_2(lastPlane_.GetNormal() - plane.GetNormal())))
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1636 {
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1637 // This is the first rendering, or the plane has not the same orientation
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1638 return false;
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1639 }
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1640 else
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1641 {
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1642 double offset1 = lastPlane_.ProjectAlongNormal(plane.GetOrigin());
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1643 double offset2 = lastPlane_.ProjectAlongNormal(lastPlane_.GetOrigin());
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1644 return LinearAlgebra::IsCloseToZero(offset2 - offset1);
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1645 }
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1646 }
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1647
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1648 void SetLastViewportPlane(const CoordinateSystem3D& plane)
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1649 {
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1650 first_ = false;
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1651 lastPlane_ = plane;
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1652 }
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1653
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1654 void SetLayer(ISceneLayer* layer)
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1655 {
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1656 scene_.SetLayer(layerDepth_, layer);
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1657 }
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1658
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1659 void DeleteLayer()
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1660 {
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1661 scene_.DeleteLayer(layerDepth_);
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1662 }
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1663
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1664 public:
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1665 VolumeSlicerBase(Scene2D& scene,
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1666 int layerDepth) :
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1667 scene_(scene),
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1668 layerDepth_(layerDepth),
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1669 first_(true)
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1670 {
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1671 }
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
1672 };*/
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1673
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1674
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1675
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1676 class IVolumeSlicer : public boost::noncopyable
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1677 {
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1678 public:
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1679 virtual ~IVolumeSlicer()
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1680 {
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1681 }
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1682
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1683 virtual void SetViewportPlane(const CoordinateSystem3D& plane) = 0;
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1684 };
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1685
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1686
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1687 class DicomVolumeMPRSlicer : public IVolumeSlicer
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1688 {
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1689 private:
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1690 bool linearInterpolation_;
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1691 Scene2D& scene_;
692
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1692 int layerDepth_;
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1693 IDicomVolumeSource& source_;
692
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1694 bool first_;
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1695 VolumeProjection lastProjection_;
692
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1696 unsigned int lastSliceIndex_;
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1697 uint64_t lastSliceRevision_;
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1698
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1699 public:
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1700 DicomVolumeMPRSlicer(Scene2D& scene,
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1701 int layerDepth,
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1702 IDicomVolumeSource& source) :
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1703 linearInterpolation_(false),
692
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1704 scene_(scene),
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1705 layerDepth_(layerDepth),
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1706 source_(source),
692
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1707 first_(true)
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1708 {
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1709 }
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1710
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1711 void SetLinearInterpolation(bool enabled)
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1712 {
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1713 linearInterpolation_ = enabled;
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1714 }
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1715
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1716 bool IsLinearInterpolation() const
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1717 {
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1718 return linearInterpolation_;
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1719 }
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1720
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1721 virtual void SetViewportPlane(const CoordinateSystem3D& plane)
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1722 {
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1723 if (!source_.GetVolume().HasGeometry() ||
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1724 source_.GetVolume().GetSlicesCount() == 0)
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1725 {
692
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1726 scene_.DeleteLayer(layerDepth_);
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1727 return;
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1728 }
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1729
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1730 const VolumeImageGeometry& geometry = source_.GetVolume().GetGeometry();
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1731
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1732 VolumeProjection projection;
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1733 unsigned int sliceIndex;
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1734 if (!geometry.DetectSlice(projection, sliceIndex, plane))
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1735 {
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1736 // The cutting plane is neither axial, nor coronal, nor
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1737 // sagittal. Could use "VolumeReslicer" here.
692
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1738 scene_.DeleteLayer(layerDepth_);
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1739 return;
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1740 }
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1741
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1742 uint64_t sliceRevision;
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1743 if (projection == VolumeProjection_Axial)
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1744 {
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1745 sliceRevision = source_.GetVolume().GetSliceRevision(sliceIndex);
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1746
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1747 if (first_ ||
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1748 lastSliceIndex_ != sliceIndex)
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1749 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1750 // Reorder the prefetching queue
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1751 source_.NotifyAxialSliceAccessed(sliceIndex);
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1752 }
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1753 }
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1754 else
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1755 {
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1756 // For coronal and sagittal projections, we take the global
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1757 // revision of the volume
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1758 sliceRevision = source_.GetVolume().GetRevision();
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1759 }
692
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1760
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1761 if (first_ ||
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1762 lastProjection_ != projection ||
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1763 lastSliceIndex_ != sliceIndex ||
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1764 lastSliceRevision_ != sliceRevision)
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1765 {
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1766 // Either the viewport plane, or the content of the slice have not
692
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1767 // changed since the last time the layer was set: Update is needed
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1768
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1769 first_ = false;
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1770 lastProjection_ = projection;
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1771 lastSliceIndex_ = sliceIndex;
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1772 lastSliceRevision_ = sliceRevision;
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1773
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1774 std::auto_ptr<TextureBaseSceneLayer> texture;
692
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1775
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1776 {
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1777 const DicomInstanceParameters& parameters = source_.GetVolume().GetSliceParameters
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1778 (projection == VolumeProjection_Axial ? sliceIndex : 0);
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1779
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1780 ImageBuffer3D::SliceReader reader(source_.GetVolume().GetImage(), projection, sliceIndex);
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1781 texture.reset(parameters.CreateTexture(reader.GetAccessor()));
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1782 }
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1783
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1784 const CoordinateSystem3D& system = geometry.GetProjectionGeometry(projection);
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1785
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1786 double x0, y0, x1, y1;
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1787 system.ProjectPoint(x0, y0, system.GetOrigin());
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1788 system.ProjectPoint(x0, y0, system.GetOrigin() + system.GetAxisX());
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1789 texture->SetOrigin(x0, y0);
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1790
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1791 double dx = x1 - x0;
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1792 double dy = y1 - y0;
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1793 if (!LinearAlgebra::IsCloseToZero(dx) ||
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1794 !LinearAlgebra::IsCloseToZero(dy))
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1795 {
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1796 texture->SetAngle(atan2(dy, dx));
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1797 }
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1798
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1799 Vector tmp;
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1800 geometry.GetVoxelDimensions(projection);
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1801 texture->SetPixelSpacing(tmp[0], tmp[1]);
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1802
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1803 texture->SetLinearInterpolation(linearInterpolation_);
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1804
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1805 scene_.SetLayer(layerDepth_, texture.release());
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1806 }
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1807 }
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1808 };
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1809
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1810
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1811
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1812
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1813
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1814 class ThreadedOracle : public IOracle
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1815 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1816 private:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1817 class Item : public Orthanc::IDynamicObject
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1818 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1819 private:
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1820 const IObserver& receiver_;
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1821 std::auto_ptr<IOracleCommand> command_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1822
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1823 public:
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1824 Item(const IObserver& receiver,
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1825 IOracleCommand* command) :
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1826 receiver_(receiver),
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1827 command_(command)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1828 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1829 if (command == NULL)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1830 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1831 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1832 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1833 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1834
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1835 const IObserver& GetReceiver() const
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1836 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1837 return receiver_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1838 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1839
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1840 IOracleCommand& GetCommand()
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1841 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1842 assert(command_.get() != NULL);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1843 return *command_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1844 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1845 };
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1846
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1847
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1848 enum State
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1849 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1850 State_Setup,
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1851 State_Running,
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1852 State_Stopped
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1853 };
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1854
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1855
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1856 class SleepingCommands : public boost::noncopyable
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1857 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1858 private:
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1859 class Item
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1860 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1861 private:
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1862 const IObserver& receiver_;
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1863 std::auto_ptr<SleepOracleCommand> command_;
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1864 boost::posix_time::ptime expiration_;
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1865
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1866 public:
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1867 Item(const IObserver& receiver,
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1868 SleepOracleCommand* command) :
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1869 receiver_(receiver),
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1870 command_(command)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1871 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1872 if (command == NULL)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1873 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1874 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1875 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1876
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1877 expiration_ = (boost::posix_time::second_clock::local_time() +
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1878 boost::posix_time::milliseconds(command_->GetDelay()));
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1879 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1880
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1881 const boost::posix_time::ptime& GetExpirationTime() const
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1882 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1883 return expiration_;
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1884 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1885
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1886 void Awake(IMessageEmitter& emitter)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1887 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1888 assert(command_.get() != NULL);
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1889
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1890 SleepOracleCommand::TimeoutMessage message(*command_);
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1891 emitter.EmitMessage(receiver_, message);
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1892 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1893 };
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1894
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1895 typedef std::list<Item*> Content;
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1896
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1897 boost::mutex mutex_;
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1898 Content content_;
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1899
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1900 public:
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1901 ~SleepingCommands()
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1902 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1903 for (Content::iterator it = content_.begin(); it != content_.end(); ++it)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1904 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1905 if (*it != NULL)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1906 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1907 delete *it;
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1908 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1909 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1910 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1911
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1912 void Add(const IObserver& receiver,
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1913 SleepOracleCommand* command) // Takes ownership
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1914 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1915 boost::mutex::scoped_lock lock(mutex_);
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1916
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1917 content_.push_back(new Item(receiver, command));
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1918 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1919
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1920 void AwakeExpired(IMessageEmitter& emitter)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1921 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1922 boost::mutex::scoped_lock lock(mutex_);
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1923
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1924 const boost::posix_time::ptime now = boost::posix_time::second_clock::local_time();
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1925
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1926 Content stillSleeping;
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1927
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1928 for (Content::iterator it = content_.begin(); it != content_.end(); ++it)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1929 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1930 if (*it != NULL &&
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1931 (*it)->GetExpirationTime() <= now)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1932 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1933 (*it)->Awake(emitter);
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1934 delete *it;
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1935 *it = NULL;
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1936 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1937 else
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1938 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1939 stillSleeping.push_back(*it);
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1940 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1941 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1942
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1943 // Compact the still-sleeping commands
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1944 content_ = stillSleeping;
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1945 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1946 };
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1947
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1948
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1949 IMessageEmitter& emitter_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1950 Orthanc::WebServiceParameters orthanc_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1951 Orthanc::SharedMessageQueue queue_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1952 State state_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1953 boost::mutex mutex_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1954 std::vector<boost::thread*> workers_;
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1955 SleepingCommands sleepingCommands_;
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1956 boost::thread sleepingWorker_;
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1957 unsigned int sleepingTimeResolution_;
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1958
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1959 void CopyHttpHeaders(Orthanc::HttpClient& client,
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1960 const HttpHeaders& headers)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1961 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1962 for (HttpHeaders::const_iterator it = headers.begin(); it != headers.end(); it++ )
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1963 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1964 client.AddHeader(it->first, it->second);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1965 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1966 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1967
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1968
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1969 void DecodeAnswer(std::string& answer,
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1970 const HttpHeaders& headers)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1971 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1972 Orthanc::HttpCompression contentEncoding = Orthanc::HttpCompression_None;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1973
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1974 for (HttpHeaders::const_iterator it = headers.begin();
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1975 it != headers.end(); ++it)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1976 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1977 std::string s;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1978 Orthanc::Toolbox::ToLowerCase(s, it->first);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1979
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1980 if (s == "content-encoding")
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1981 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1982 if (it->second == "gzip")
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1983 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1984 contentEncoding = Orthanc::HttpCompression_Gzip;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1985 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1986 else
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1987 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1988 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol,
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1989 "Unsupported HTTP Content-Encoding: " + it->second);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1990 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1991
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1992 break;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1993 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1994 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1995
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1996 if (contentEncoding == Orthanc::HttpCompression_Gzip)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1997 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1998 std::string compressed;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1999 answer.swap(compressed);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2000
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2001 Orthanc::GzipCompressor compressor;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2002 compressor.Uncompress(answer, compressed.c_str(), compressed.size());
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2003 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2004 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2005
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2006
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2007 void Execute(const IObserver& receiver,
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2008 SleepOracleCommand& command)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2009 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2010 std::auto_ptr<SleepOracleCommand> copy(new SleepOracleCommand(command.GetDelay()));
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2011
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2012 if (command.HasPayload())
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2013 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2014 copy->SetPayload(command.ReleasePayload());
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2015 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2016
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2017 sleepingCommands_.Add(receiver, copy.release());
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2018 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2019
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2020
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2021 void Execute(const IObserver& receiver,
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2022 const OrthancRestApiCommand& command)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2023 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2024 Orthanc::HttpClient client(orthanc_, command.GetUri());
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2025 client.SetMethod(command.GetMethod());
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2026 client.SetTimeout(command.GetTimeout());
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2027
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2028 CopyHttpHeaders(client, command.GetHttpHeaders());
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2029
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2030 if (command.GetMethod() == Orthanc::HttpMethod_Post ||
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2031 command.GetMethod() == Orthanc::HttpMethod_Put)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2032 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2033 client.SetBody(command.GetBody());
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2034 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2035
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2036 std::string answer;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2037 HttpHeaders answerHeaders;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2038 client.ApplyAndThrowException(answer, answerHeaders);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2039
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2040 DecodeAnswer(answer, answerHeaders);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2041
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2042 OrthancRestApiCommand::SuccessMessage message(command, answerHeaders, answer);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2043 emitter_.EmitMessage(receiver, message);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2044 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2045
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2046
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2047 void Execute(const IObserver& receiver,
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2048 const GetOrthancImageCommand& command)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2049 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2050 Orthanc::HttpClient client(orthanc_, command.GetUri());
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2051 client.SetTimeout(command.GetTimeout());
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2052
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2053 CopyHttpHeaders(client, command.GetHttpHeaders());
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2054
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2055 std::string answer;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2056 HttpHeaders answerHeaders;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2057 client.ApplyAndThrowException(answer, answerHeaders);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2058
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2059 DecodeAnswer(answer, answerHeaders);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2060
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2061 command.ProcessHttpAnswer(emitter_, receiver, answer, answerHeaders);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2062 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2063
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2064
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2065 void Execute(const IObserver& receiver,
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2066 const GetOrthancWebViewerJpegCommand& command)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2067 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2068 Orthanc::HttpClient client(orthanc_, command.GetUri());
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2069 client.SetTimeout(command.GetTimeout());
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2070
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2071 CopyHttpHeaders(client, command.GetHttpHeaders());
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2072
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2073 std::string answer;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2074 HttpHeaders answerHeaders;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2075 client.ApplyAndThrowException(answer, answerHeaders);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2076
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2077 DecodeAnswer(answer, answerHeaders);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2078
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2079 command.ProcessHttpAnswer(emitter_, receiver, answer);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2080 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2081
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2082
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2083 void Step()
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2084 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2085 std::auto_ptr<Orthanc::IDynamicObject> object(queue_.Dequeue(100));
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2086
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2087 if (object.get() != NULL)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2088 {
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2089 Item& item = dynamic_cast<Item&>(*object);
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2090
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2091 try
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2092 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2093 switch (item.GetCommand().GetType())
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2094 {
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2095 case IOracleCommand::Type_Sleep:
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2096 Execute(item.GetReceiver(),
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2097 dynamic_cast<SleepOracleCommand&>(item.GetCommand()));
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2098 break;
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2099
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2100 case IOracleCommand::Type_OrthancRestApi:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2101 Execute(item.GetReceiver(),
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2102 dynamic_cast<const OrthancRestApiCommand&>(item.GetCommand()));
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2103 break;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2104
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2105 case IOracleCommand::Type_GetOrthancImage:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2106 Execute(item.GetReceiver(),
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2107 dynamic_cast<const GetOrthancImageCommand&>(item.GetCommand()));
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2108 break;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2109
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2110 case IOracleCommand::Type_GetOrthancWebViewerJpeg:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2111 Execute(item.GetReceiver(),
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2112 dynamic_cast<const GetOrthancWebViewerJpegCommand&>(item.GetCommand()));
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2113 break;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2114
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2115 default:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2116 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2117 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2118 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2119 catch (Orthanc::OrthancException& e)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2120 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2121 LOG(ERROR) << "Exception within the oracle: " << e.What();
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2122 emitter_.EmitMessage(item.GetReceiver(), OracleCommandExceptionMessage(item.GetCommand(), e));
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2123 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2124 catch (...)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2125 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2126 LOG(ERROR) << "Native exception within the oracle";
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2127 emitter_.EmitMessage(item.GetReceiver(), OracleCommandExceptionMessage
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2128 (item.GetCommand(), Orthanc::ErrorCode_InternalError));
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2129 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2130 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2131 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2132
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2133
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2134 static void Worker(ThreadedOracle* that)
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2135 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2136 assert(that != NULL);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2137
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2138 for (;;)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2139 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2140 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2141 boost::mutex::scoped_lock lock(that->mutex_);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2142 if (that->state_ != State_Running)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2143 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2144 return;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2145 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2146 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2147
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2148 that->Step();
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2149 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2150 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2151
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2152
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2153 static void SleepingWorker(ThreadedOracle* that)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2154 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2155 assert(that != NULL);
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2156
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2157 for (;;)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2158 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2159 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2160 boost::mutex::scoped_lock lock(that->mutex_);
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2161 if (that->state_ != State_Running)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2162 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2163 return;
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2164 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2165 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2166
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2167 that->sleepingCommands_.AwakeExpired(that->emitter_);
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2168
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2169 boost::this_thread::sleep(boost::posix_time::milliseconds(that->sleepingTimeResolution_));
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2170 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2171 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2172
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2173
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2174 void StopInternal()
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2175 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2176 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2177 boost::mutex::scoped_lock lock(mutex_);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2178
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2179 if (state_ == State_Setup ||
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2180 state_ == State_Stopped)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2181 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2182 return;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2183 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2184 else
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2185 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2186 state_ = State_Stopped;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2187 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2188 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2189
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2190 if (sleepingWorker_.joinable())
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2191 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2192 sleepingWorker_.join();
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2193 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2194
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2195 for (size_t i = 0; i < workers_.size(); i++)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2196 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2197 if (workers_[i] != NULL)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2198 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2199 if (workers_[i]->joinable())
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2200 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2201 workers_[i]->join();
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2202 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2203
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2204 delete workers_[i];
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2205 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2206 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2207 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2208
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2209
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2210 public:
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2211 ThreadedOracle(IMessageEmitter& emitter) :
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2212 emitter_(emitter),
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2213 state_(State_Setup),
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2214 workers_(4),
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2215 sleepingTimeResolution_(50) // By default, time resolution of 50ms
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2216 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2217 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2218
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2219 virtual ~ThreadedOracle()
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2220 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2221 StopInternal();
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2222 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2223
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2224 void SetOrthancParameters(const Orthanc::WebServiceParameters& orthanc)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2225 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2226 boost::mutex::scoped_lock lock(mutex_);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2227
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2228 if (state_ != State_Setup)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2229 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2230 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2231 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2232 else
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2233 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2234 orthanc_ = orthanc;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2235 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2236 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2237
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2238 void SetWorkersCount(unsigned int count)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2239 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2240 boost::mutex::scoped_lock lock(mutex_);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2241
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2242 if (count <= 0)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2243 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2244 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2245 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2246 else if (state_ != State_Setup)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2247 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2248 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2249 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2250 else
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2251 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2252 workers_.resize(count);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2253 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2254 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2255
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2256 void SetSleepingTimeResolution(unsigned int milliseconds)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2257 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2258 boost::mutex::scoped_lock lock(mutex_);
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2259
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2260 if (milliseconds <= 0)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2261 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2262 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2263 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2264 else if (state_ != State_Setup)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2265 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2266 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2267 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2268 else
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2269 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2270 sleepingTimeResolution_ = milliseconds;
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2271 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2272 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2273
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2274 void Start()
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2275 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2276 boost::mutex::scoped_lock lock(mutex_);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2277
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2278 if (state_ != State_Setup)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2279 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2280 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2281 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2282 else
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2283 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2284 state_ = State_Running;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2285
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2286 for (unsigned int i = 0; i < workers_.size(); i++)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2287 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2288 workers_[i] = new boost::thread(Worker, this);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2289 }
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2290
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2291 sleepingWorker_ = boost::thread(SleepingWorker, this);
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2292 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2293 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2294
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2295 void Stop()
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2296 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2297 StopInternal();
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2298 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2299
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2300 virtual void Schedule(const IObserver& receiver,
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2301 IOracleCommand* command)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2302 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2303 queue_.Enqueue(new Item(receiver, command));
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2304 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2305 };
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2306
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2307
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2308 class NativeApplicationContext : public IMessageEmitter
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2309 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2310 private:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2311 boost::shared_mutex mutex_;
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2312 MessageBroker broker_;
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2313 IObservable oracleObservable_;
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2314
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2315 public:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2316 NativeApplicationContext() :
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2317 oracleObservable_(broker_)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2318 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2319 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2320
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2321
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2322 virtual void EmitMessage(const IObserver& observer,
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2323 const IMessage& message)
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2324 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2325 try
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2326 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2327 boost::unique_lock<boost::shared_mutex> lock(mutex_);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2328 oracleObservable_.EmitMessage(observer, message);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2329 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2330 catch (Orthanc::OrthancException& e)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2331 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2332 LOG(ERROR) << "Exception while emitting a message: " << e.What();
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2333 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2334 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2335
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2336
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2337 class ReaderLock : public boost::noncopyable
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2338 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2339 private:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2340 NativeApplicationContext& that_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2341 boost::shared_lock<boost::shared_mutex> lock_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2342
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2343 public:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2344 ReaderLock(NativeApplicationContext& that) :
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2345 that_(that),
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2346 lock_(that.mutex_)
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2347 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2348 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2349 };
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2350
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2351
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2352 class WriterLock : public boost::noncopyable
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2353 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2354 private:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2355 NativeApplicationContext& that_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2356 boost::unique_lock<boost::shared_mutex> lock_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2357
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2358 public:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2359 WriterLock(NativeApplicationContext& that) :
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2360 that_(that),
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2361 lock_(that.mutex_)
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2362 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2363 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2364
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2365 MessageBroker& GetBroker()
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2366 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2367 return that_.broker_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2368 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2369
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2370 IObservable& GetOracleObservable()
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2371 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2372 return that_.oracleObservable_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2373 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2374 };
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
2375 };
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2376 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2377
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2378
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2379
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2380 class Toto : public OrthancStone::IObserver
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2381 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2382 private:
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2383 void Handle(const OrthancStone::SleepOracleCommand::TimeoutMessage& message)
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2384 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2385 printf("TIMEOUT! %d\n", dynamic_cast<const Orthanc::SingleValueObject<unsigned int>& >(message.GetOrigin().GetPayload()).GetValue());
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2386 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2387
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2388 void Handle(const OrthancStone::OrthancRestApiCommand::SuccessMessage& message)
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2389 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2390 Json::Value v;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
2391 message.ParseJsonBody(v);
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2392
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2393 printf("ICI [%s]\n", v.toStyledString().c_str());
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2394 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2395
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2396 void Handle(const OrthancStone::GetOrthancImageCommand::SuccessMessage& message)
637
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
2397 {
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
2398 printf("IMAGE %dx%d\n", message.GetImage().GetWidth(), message.GetImage().GetHeight());
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
2399 }
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
2400
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2401 void Handle(const OrthancStone::GetOrthancWebViewerJpegCommand::SuccessMessage& message)
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
2402 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
2403 printf("WebViewer %dx%d\n", message.GetImage().GetWidth(), message.GetImage().GetHeight());
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
2404 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
2405
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2406 void Handle(const OrthancStone::OracleCommandExceptionMessage& message)
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2407 {
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
2408 printf("EXCEPTION: [%s] on command type %d\n", message.GetException().What(), message.GetCommand().GetType());
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
2409
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
2410 switch (message.GetCommand().GetType())
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
2411 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2412 case OrthancStone::IOracleCommand::Type_GetOrthancWebViewerJpeg:
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2413 printf("URI: [%s]\n", dynamic_cast<const OrthancStone::GetOrthancWebViewerJpegCommand&>
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
2414 (message.GetCommand()).GetUri().c_str());
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
2415 break;
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
2416
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
2417 default:
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
2418 break;
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
2419 }
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2420 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2421
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2422 public:
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2423 Toto(OrthancStone::IObservable& oracle) :
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2424 IObserver(oracle.GetBroker())
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2425 {
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
2426 oracle.RegisterObserverCallback
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
2427 (new OrthancStone::Callable
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2428 <Toto, OrthancStone::SleepOracleCommand::TimeoutMessage>(*this, &Toto::Handle));
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2429
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2430 oracle.RegisterObserverCallback
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2431 (new OrthancStone::Callable
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2432 <Toto, OrthancStone::OrthancRestApiCommand::SuccessMessage>(*this, &Toto::Handle));
637
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
2433
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
2434 oracle.RegisterObserverCallback
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
2435 (new OrthancStone::Callable
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2436 <Toto, OrthancStone::GetOrthancImageCommand::SuccessMessage>(*this, &Toto::Handle));
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
2437
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
2438 oracle.RegisterObserverCallback
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
2439 (new OrthancStone::Callable
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2440 <Toto, OrthancStone::GetOrthancWebViewerJpegCommand::SuccessMessage>(*this, &Toto::Handle));
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
2441
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
2442 oracle.RegisterObserverCallback
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
2443 (new OrthancStone::Callable
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2444 <Toto, OrthancStone::OracleCommandExceptionMessage>(*this, &Toto::Handle));
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2445 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2446 };
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2447
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2448
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2449 void Run(OrthancStone::NativeApplicationContext& context,
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2450 OrthancStone::IOracle& oracle)
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2451 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2452 std::auto_ptr<Toto> toto;
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2453 std::auto_ptr<OrthancStone::VolumeSeriesOrthancLoader> loader1, loader2;
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2454
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2455 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2456 OrthancStone::NativeApplicationContext::WriterLock lock(context);
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2457 toto.reset(new Toto(lock.GetOracleObservable()));
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2458 loader1.reset(new OrthancStone::VolumeSeriesOrthancLoader(oracle, lock.GetOracleObservable()));
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2459 loader2.reset(new OrthancStone::VolumeSeriesOrthancLoader(oracle, lock.GetOracleObservable()));
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
2460 }
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
2461
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2462 if (0)
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2463 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2464 Json::Value v = Json::objectValue;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2465 v["Level"] = "Series";
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2466 v["Query"] = Json::objectValue;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2467
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2468 std::auto_ptr<OrthancStone::OrthancRestApiCommand> command(new OrthancStone::OrthancRestApiCommand);
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2469 command->SetMethod(Orthanc::HttpMethod_Post);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2470 command->SetUri("/tools/find");
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2471 command->SetBody(v);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2472
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
2473 oracle.Schedule(*toto, command.release());
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2474 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
2475
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2476 if (0)
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2477 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2478 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2479 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Jpeg)));
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2480 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/preview");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2481 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2482 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2483
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2484 if (0)
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2485 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2486 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2487 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Png)));
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2488 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/preview");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2489 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2490 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2491
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2492 if (0)
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2493 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2494 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2495 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Png)));
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2496 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2497 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2498 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2499
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2500 if (0)
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2501 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2502 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2503 command->SetHttpHeader("Accept-Encoding", "gzip");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2504 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam)));
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2505 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2506 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2507 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2508
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2509 if (0)
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2510 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2511 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2512 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam)));
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2513 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2514 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
2515 }
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
2516
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2517 if (0)
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
2518 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2519 std::auto_ptr<OrthancStone::GetOrthancWebViewerJpegCommand> command(new OrthancStone::GetOrthancWebViewerJpegCommand);
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
2520 command->SetHttpHeader("Accept-Encoding", "gzip");
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
2521 command->SetInstance("e6c7c20b-c9f65d7e-0d76f2e2-830186f2-3e3c600e");
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
2522 command->SetQuality(90);
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
2523 oracle.Schedule(*toto, command.release());
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
2524 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
2525
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
2526
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2527 if (0)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2528 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2529 for (unsigned int i = 0; i < 10; i++)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2530 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2531 std::auto_ptr<OrthancStone::SleepOracleCommand> command(new OrthancStone::SleepOracleCommand(i * 1000));
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2532 command->SetPayload(new Orthanc::SingleValueObject<unsigned int>(42 * i));
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2533 oracle.Schedule(*toto, command.release());
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2534 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2535 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2536
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
2537 // 2017-11-17-Anonymized
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
2538 //loader1->LoadSeries("cb3ea4d1-d08f3856-ad7b6314-74d88d77-60b05618"); // CT
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
2539 //loader2->LoadInstance("41029085-71718346-811efac4-420e2c15-d39f99b6"); // RT-DOSE
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2540
661
970949ff868a fix warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 648
diff changeset
2541 // Delphine
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2542 //loader1->LoadSeries("5990e39c-51e5f201-fe87a54c-31a55943-e59ef80e"); // CT
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
2543 loader1->LoadSeries("67f1b334-02c16752-45026e40-a5b60b6b-030ecab5"); // Lung 1/10mm
661
970949ff868a fix warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 648
diff changeset
2544
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
2545 LOG(WARNING) << "...Waiting for Ctrl-C...";
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
2546 Orthanc::SystemToolbox::ServerBarrier();
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
2547 //boost::this_thread::sleep(boost::posix_time::seconds(1));
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2548 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2549
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2550
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2551
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2552 /**
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2553 * IMPORTANT: The full arguments to "main()" are needed for SDL on
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2554 * Windows. Otherwise, one gets the linking error "undefined reference
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2555 * to `SDL_main'". https://wiki.libsdl.org/FAQWindows
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2556 **/
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2557 int main(int argc, char* argv[])
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2558 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2559 OrthancStone::StoneInitialize();
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2560 Orthanc::Logging::EnableInfoLevel(true);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2561
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2562 try
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2563 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2564 OrthancStone::NativeApplicationContext context;
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2565
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
2566 OrthancStone::ThreadedOracle oracle(context);
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
2567
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
2568 {
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
2569 Orthanc::WebServiceParameters p;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
2570 //p.SetUrl("http://localhost:8043/");
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
2571 p.SetCredentials("orthanc", "orthanc");
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
2572 oracle.SetOrthancParameters(p);
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
2573 }
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
2574
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
2575 oracle.Start();
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
2576
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
2577 Run(context, oracle);
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
2578
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
2579 oracle.Stop();
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2580 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2581 catch (Orthanc::OrthancException& e)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2582 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2583 LOG(ERROR) << "EXCEPTION: " << e.What();
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2584 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2585
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2586 OrthancStone::StoneFinalize();
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2587
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2588 return 0;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2589 }