Mercurial > hg > orthanc-stone

annotate Samples/Sdl/Loader.cpp @ 742:fa5febe0f0c2

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