Mercurial > hg > orthanc-stone

annotate Samples/Sdl/Loader.cpp @ 647:6af3099ed8da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uncoupling OrthancStone::SlicesSorter from OrthancStone::Slice
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 13 May 2019 17:03:46 +0200
parents b4fe9642e83b
children 1088d4c4d78c
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
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
22 #include "../../Framework/Messages/ICallable.h"
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 #include "../../Framework/Messages/IMessage.h"
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
24 #include "../../Framework/Messages/IObservable.h"
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 #include "../../Framework/Messages/MessageBroker.h"
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
26 #include "../../Framework/StoneInitialization.h"
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
27 #include "../../Framework/Toolbox/GeometryToolbox.h"
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
28 #include "../../Framework/Volumes/ImageBuffer3D.h"
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 // From Orthanc framework
637
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
31 #include <Core/Compression/GzipCompressor.h>
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
32 #include <Core/Compression/ZlibCompressor.h>
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
33 #include <Core/DicomFormat/DicomArray.h>
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
34 #include <Core/DicomFormat/DicomImageInformation.h>
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
35 #include <Core/HttpClient.h>
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 #include <Core/IDynamicObject.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 #include <Core/Images/Image.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 #include <Core/Images/ImageProcessing.h>
637
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
39 #include <Core/Images/JpegReader.h>
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
40 #include <Core/Images/PamReader.h>
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
41 #include <Core/Images/PngReader.h>
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 #include <Core/Images/PngWriter.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 #include <Core/Logging.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 #include <Core/MultiThreading/SharedMessageQueue.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 #include <Core/OrthancException.h>
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
46 #include <Core/Toolbox.h>
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
47 #include <Core/SystemToolbox.h>
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 #include <json/reader.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 #include <json/value.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 #include <json/writer.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 #include <list>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 #include <stdio.h>
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
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 namespace Refactoring
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 class IOracleCommand : public boost::noncopyable
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 public:
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 enum Type
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 {
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
65 Type_OrthancRestApi,
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
66 Type_GetOrthancImage,
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
67 Type_GetOrthancWebViewerJpeg
619
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
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 virtual ~IOracleCommand()
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 virtual Type GetType() const = 0;
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
622
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
78 class IMessageEmitter : public boost::noncopyable
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
79 {
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
80 public:
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
81 virtual ~IMessageEmitter()
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
82 {
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
83 }
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
84
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
85 virtual void EmitMessage(const OrthancStone::IObserver& observer,
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
86 const OrthancStone::IMessage& message) = 0;
622
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
87 };
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
88
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
89
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 class IOracle : public boost::noncopyable
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 public:
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 virtual ~IOracle()
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
97 virtual void Schedule(const OrthancStone::IObserver& receiver,
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
98 IOracleCommand* command) = 0; // Takes ownership
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99 };
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101
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
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 class OracleCommandWithPayload : public IOracleCommand
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106 private:
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 std::auto_ptr<Orthanc::IDynamicObject> payload_;
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 public:
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 void SetPayload(Orthanc::IDynamicObject* payload)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 if (payload == NULL)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 else
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 payload_.reset(payload);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
120 }
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 bool HasPayload() const
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 return (payload_.get() != NULL);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 }
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 const Orthanc::IDynamicObject& GetPayload() const
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 if (HasPayload())
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131 return *payload_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 else
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
138 };
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
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
141
643
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
142 class OracleCommandExceptionMessage : public OrthancStone::IMessage
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
143 {
643
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
144 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
145
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
146 private:
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
147 const IOracleCommand& command_;
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
148 Orthanc::OrthancException exception_;
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
149
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
150 public:
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
151 OracleCommandExceptionMessage(const IOracleCommand& command,
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
152 const Orthanc::OrthancException& exception) :
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
153 command_(command),
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
154 exception_(exception)
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
155 {
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
156 }
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
157
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
158 OracleCommandExceptionMessage(const IOracleCommand& command,
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
159 const Orthanc::ErrorCode& error) :
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
160 command_(command),
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
161 exception_(error)
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
162 {
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
163 }
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
164
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
165 const IOracleCommand& GetCommand() const
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
166 {
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
167 return command_;
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
168 }
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
169
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
170 const Orthanc::OrthancException& GetException() const
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
171 {
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
172 return 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
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177 typedef std::map<std::string, std::string> HttpHeaders;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
179 class OrthancRestApiCommand : public OracleCommandWithPayload
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181 public:
643
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
182 class SuccessMessage : public OrthancStone::OriginMessage<OrthancRestApiCommand>
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 {
643
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
184 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
185
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186 private:
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187 HttpHeaders headers_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188 std::string answer_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 public:
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
191 SuccessMessage(const OrthancRestApiCommand& command,
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192 const HttpHeaders& answerHeaders,
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 std::string& answer /* will be swapped to avoid a memcpy() */) :
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 OriginMessage(command),
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195 headers_(answerHeaders),
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 answer_(answer)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 const std::string& GetAnswer() const
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 return answer_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
204
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
205 void ParseJsonBody(Json::Value& target) const
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
207 Json::Reader reader;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
208 if (!reader.parse(answer_, target))
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
209 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
210 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
211 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
212 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
213
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
214 const HttpHeaders& GetAnswerHeaders() const
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 return headers_;
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 };
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
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
221 private:
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
222 Orthanc::HttpMethod method_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
223 std::string uri_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
224 std::string body_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
225 HttpHeaders headers_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
226 unsigned int timeout_;
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 std::auto_ptr< OrthancStone::MessageHandler<SuccessMessage> > successCallback_;
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
229 std::auto_ptr< OrthancStone::MessageHandler<OracleCommandExceptionMessage> > failureCallback_;
619
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 public:
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
232 OrthancRestApiCommand() :
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
233 method_(Orthanc::HttpMethod_Get),
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
234 uri_("/"),
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
235 timeout_(10)
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 virtual Type GetType() const
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
240 {
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
241 return Type_OrthancRestApi;
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
242 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
243
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
244 void SetMethod(Orthanc::HttpMethod method)
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 method_ = method;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
247 }
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 void SetUri(const std::string& uri)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
250 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
251 uri_ = uri;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
252 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
253
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
254 void SetBody(const std::string& body)
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 body_ = body;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
257 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
258
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
259 void SetBody(const Json::Value& json)
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 Json::FastWriter writer;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
262 body_ = writer.write(json);
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
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
265 void SetHttpHeaders(const HttpHeaders& headers)
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
266 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
267 headers_ = headers;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
268 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
269
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
270 void SetHttpHeader(const std::string& key,
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
271 const std::string& value)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
272 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
273 headers_[key] = value;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
274 }
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 Orthanc::HttpMethod GetMethod() const
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
277 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
278 return method_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
279 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
280
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
281 const std::string& GetUri() const
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
282 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
283 return uri_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
284 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
285
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
286 const std::string& GetBody() const
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
287 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
288 if (method_ == Orthanc::HttpMethod_Post ||
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
289 method_ == Orthanc::HttpMethod_Put)
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 return body_;
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 else
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
294 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
295 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
296 }
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 HttpHeaders& GetHttpHeaders() 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 headers_;
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 void SetTimeout(unsigned int seconds)
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 timeout_ = seconds;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
307 }
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 unsigned int GetTimeout() const
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 return timeout_;
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 };
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
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
317
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
318 class GetOrthancImageCommand : public OracleCommandWithPayload
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
319 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
320 public:
643
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
321 class SuccessMessage : public OrthancStone::OriginMessage<GetOrthancImageCommand>
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
322 {
643
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
323 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
324
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
325 private:
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
326 std::auto_ptr<Orthanc::ImageAccessor> image_;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
327 Orthanc::MimeType mime_;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
328
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
329 public:
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
330 SuccessMessage(const GetOrthancImageCommand& command,
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
331 Orthanc::ImageAccessor* image, // Takes ownership
637
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
332 Orthanc::MimeType mime) :
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
333 OriginMessage(command),
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
334 image_(image),
637
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
335 mime_(mime)
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
336 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
337 if (image == NULL)
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
338 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
339 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
340 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
341 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
342
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
343 const Orthanc::ImageAccessor& GetImage() const
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
344 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
345 return *image_;
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
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
348 Orthanc::MimeType GetMimeType() const
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
349 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
350 return mime_;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
351 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
352 };
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
353
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 private:
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
356 std::string uri_;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
357 HttpHeaders headers_;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
358 unsigned int timeout_;
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 std::auto_ptr< OrthancStone::MessageHandler<SuccessMessage> > successCallback_;
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
361 std::auto_ptr< OrthancStone::MessageHandler<OracleCommandExceptionMessage> > failureCallback_;
636
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 public:
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
364 GetOrthancImageCommand() :
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
365 uri_("/"),
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
366 timeout_(10)
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 }
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 virtual Type GetType() const
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
371 {
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
372 return Type_GetOrthancImage;
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
373 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
374
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
375 void SetUri(const std::string& uri)
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
376 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
377 uri_ = uri;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
378 }
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 void SetHttpHeader(const std::string& key,
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
381 const std::string& value)
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 headers_[key] = value;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
384 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
385
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
386 const std::string& GetUri() const
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
387 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
388 return uri_;
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 const HttpHeaders& GetHttpHeaders() const
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
392 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
393 return headers_;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
394 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
395
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
396 void SetTimeout(unsigned int seconds)
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
397 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
398 timeout_ = seconds;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
399 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
400
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
401 unsigned int GetTimeout() const
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
402 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
403 return timeout_;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
404 }
640
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
405
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
406 void ProcessHttpAnswer(IMessageEmitter& emitter,
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
407 const OrthancStone::IObserver& receiver,
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
408 const std::string& answer,
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
409 const HttpHeaders& answerHeaders) const
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
410 {
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
411 Orthanc::MimeType contentType = Orthanc::MimeType_Binary;
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
412
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
413 for (HttpHeaders::const_iterator it = answerHeaders.begin();
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
414 it != answerHeaders.end(); ++it)
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
415 {
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
416 std::string s;
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
417 Orthanc::Toolbox::ToLowerCase(s, it->first);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
418
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
419 if (s == "content-type")
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
420 {
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
421 contentType = Orthanc::StringToMimeType(it->second);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
422 break;
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
423 }
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
424 }
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
425
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
426 std::auto_ptr<Orthanc::ImageAccessor> image;
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
427
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
428 switch (contentType)
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
429 {
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
430 case Orthanc::MimeType_Png:
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
431 {
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
432 image.reset(new Orthanc::PngReader);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
433 dynamic_cast<Orthanc::PngReader&>(*image).ReadFromMemory(answer);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
434 break;
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
435 }
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
436
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
437 case Orthanc::MimeType_Pam:
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
438 {
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
439 image.reset(new Orthanc::PamReader);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
440 dynamic_cast<Orthanc::PamReader&>(*image).ReadFromMemory(answer);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
441 break;
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
442 }
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
443
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
444 case Orthanc::MimeType_Jpeg:
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
445 {
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
446 image.reset(new Orthanc::JpegReader);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
447 dynamic_cast<Orthanc::JpegReader&>(*image).ReadFromMemory(answer);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
448 break;
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
449 }
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
450
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
451 default:
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
452 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol,
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
453 "Unsupported HTTP Content-Type for an image: " +
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
454 std::string(Orthanc::EnumerationToString(contentType)));
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
455 }
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
456
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
457 SuccessMessage message(*this, image.release(), contentType);
640
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
458 emitter.EmitMessage(receiver, message);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
459 }
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
460 };
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
461
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
462
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
463
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
464 class GetOrthancWebViewerJpegCommand : public OracleCommandWithPayload
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
465 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
466 public:
643
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
467 class SuccessMessage : public OrthancStone::OriginMessage<GetOrthancWebViewerJpegCommand>
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
468 {
643
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
469 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
f0008c55e5f7 getting rid of MessageType enumeration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 642
diff changeset
470
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
471 private:
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
472 std::auto_ptr<Orthanc::ImageAccessor> image_;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
473
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
474 public:
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
475 SuccessMessage(const GetOrthancWebViewerJpegCommand& command,
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
476 Orthanc::ImageAccessor* image) : // Takes ownership
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
477 OriginMessage(command),
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
478 image_(image)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
479 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
480 if (image == NULL)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
481 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
482 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
483 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
484 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
485
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
486 const Orthanc::ImageAccessor& GetImage() const
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
487 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
488 return *image_;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
489 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
490 };
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
491
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
492 private:
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
493 std::string instanceId_;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
494 unsigned int frame_;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
495 unsigned int quality_;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
496 HttpHeaders headers_;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
497 unsigned int timeout_;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
498 Orthanc::PixelFormat expectedFormat_;
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
499
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
500 std::auto_ptr< OrthancStone::MessageHandler<SuccessMessage> > successCallback_;
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
501 std::auto_ptr< OrthancStone::MessageHandler<OracleCommandExceptionMessage> > failureCallback_;
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
502
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
503 public:
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
504 GetOrthancWebViewerJpegCommand() :
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
505 frame_(0),
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
506 quality_(95),
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
507 timeout_(10),
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
508 expectedFormat_(Orthanc::PixelFormat_Grayscale8)
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
509 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
510 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
511
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
512 virtual Type GetType() const
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
513 {
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
514 return Type_GetOrthancWebViewerJpeg;
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
515 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
516
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
517 void SetExpectedFormat(Orthanc::PixelFormat format)
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
518 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
519 expectedFormat_ = format;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
520 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
521
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
522 void SetInstance(const std::string& instanceId)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
523 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
524 instanceId_ = instanceId;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
525 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
526
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
527 void SetFrame(unsigned int frame)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
528 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
529 frame_ = frame;
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
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
532 void SetQuality(unsigned int quality)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
533 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
534 if (quality <= 0 ||
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
535 quality > 100)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
536 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
537 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
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 else
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
540 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
541 quality_ = quality;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
542 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
543 }
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 void SetHttpHeader(const std::string& key,
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
546 const std::string& value)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
547 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
548 headers_[key] = value;
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
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
551 Orthanc::PixelFormat GetExpectedFormat() const
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
552 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
553 return expectedFormat_;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
554 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
555
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
556 const std::string& GetInstanceId() const
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
557 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
558 return instanceId_;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
559 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
560
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
561 unsigned int GetFrame() const
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
562 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
563 return frame_;
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
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
566 unsigned int GetQuality() const
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 return quality_;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
569 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
570
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
571 const HttpHeaders& GetHttpHeaders() const
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
572 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
573 return headers_;
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 void SetTimeout(unsigned int seconds)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
577 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
578 timeout_ = seconds;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
579 }
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 unsigned int GetTimeout() const
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
582 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
583 return timeout_;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
584 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
585
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
586 std::string GetUri() const
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
587 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
588 return ("/web-viewer/instances/jpeg" + boost::lexical_cast<std::string>(quality_) +
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
589 "-" + instanceId_ + "_" + boost::lexical_cast<std::string>(frame_));
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
590 }
640
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
591
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
592 void ProcessHttpAnswer(IMessageEmitter& emitter,
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
593 const OrthancStone::IObserver& receiver,
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
594 const std::string& answer) const
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
595 {
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
596 // This code comes from older "OrthancSlicesLoader::ParseSliceImageJpeg()"
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
597
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
598 Json::Value encoded;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
599
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
600 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
601 Json::Reader reader;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
602 if (!reader.parse(answer, encoded))
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
603 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
604 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
605 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
606 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
607
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
608 if (encoded.type() != Json::objectValue ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
609 !encoded.isMember("Orthanc") ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
610 encoded["Orthanc"].type() != Json::objectValue)
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
611 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
612 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
613 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
614
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
615 const Json::Value& info = encoded["Orthanc"];
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
616 if (!info.isMember("PixelData") ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
617 !info.isMember("Stretched") ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
618 !info.isMember("Compression") ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
619 info["Compression"].type() != Json::stringValue ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
620 info["PixelData"].type() != Json::stringValue ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
621 info["Stretched"].type() != Json::booleanValue ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
622 info["Compression"].asString() != "Jpeg")
640
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
623 {
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
624 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
625 }
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
626
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
627 bool isSigned = false;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
628 bool isStretched = info["Stretched"].asBool();
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
629
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
630 if (info.isMember("IsSigned"))
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
631 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
632 if (info["IsSigned"].type() != Json::booleanValue)
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
633 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
634 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
635 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
636 else
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
637 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
638 isSigned = info["IsSigned"].asBool();
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
639 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
640 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
641
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
642 std::auto_ptr<Orthanc::ImageAccessor> reader;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
643
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
644 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
645 std::string jpeg;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
646 Orthanc::Toolbox::DecodeBase64(jpeg, info["PixelData"].asString());
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
647
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
648 reader.reset(new Orthanc::JpegReader);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
649 dynamic_cast<Orthanc::JpegReader&>(*reader).ReadFromMemory(jpeg);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
650 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
651
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
652 if (reader->GetFormat() == Orthanc::PixelFormat_RGB24) // This is a color image
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
653 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
654 if (expectedFormat_ != Orthanc::PixelFormat_RGB24)
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
655 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
656 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
657 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
658
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
659 if (isSigned || isStretched)
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
660 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
661 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
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 else
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 SuccessMessage message(*this, reader.release());
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
666 emitter.EmitMessage(receiver, message);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
667 return;
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 }
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 if (reader->GetFormat() != Orthanc::PixelFormat_Grayscale8)
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 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
674 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
675
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
676 if (!isStretched)
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
677 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
678 if (expectedFormat_ != reader->GetFormat())
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 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
681 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
682 else
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
683 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
684 SuccessMessage message(*this, reader.release());
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
685 emitter.EmitMessage(receiver, message);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
686 return;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
687 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
688 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
689
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
690 int32_t stretchLow = 0;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
691 int32_t stretchHigh = 0;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
692
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
693 if (!info.isMember("StretchLow") ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
694 !info.isMember("StretchHigh") ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
695 info["StretchLow"].type() != Json::intValue ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
696 info["StretchHigh"].type() != Json::intValue)
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
697 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
698 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
699 }
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 stretchLow = info["StretchLow"].asInt();
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
702 stretchHigh = info["StretchHigh"].asInt();
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
703
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
704 if (stretchLow < -32768 ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
705 stretchHigh > 65535 ||
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
706 (stretchLow < 0 && stretchHigh > 32767))
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
707 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
708 // 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
709 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
710 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
711
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
712 // Decode a grayscale JPEG 8bpp image coming from the Web viewer
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
713 std::auto_ptr<Orthanc::ImageAccessor> image
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
714 (new Orthanc::Image(expectedFormat_, reader->GetWidth(), reader->GetHeight(), false));
640
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
715
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
716 Orthanc::ImageProcessing::Convert(*image, *reader);
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
717 reader.reset();
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 float scaling = static_cast<float>(stretchHigh - stretchLow) / 255.0f;
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 if (!OrthancStone::LinearAlgebra::IsCloseToZero(scaling))
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 float offset = static_cast<float>(stretchLow) / scaling;
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
724 Orthanc::ImageProcessing::ShiftScale(*image, offset, scaling, true);
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
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
727 SuccessMessage message(*this, image.release());
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
728 emitter.EmitMessage(receiver, message);
640
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
729 }
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
730 };
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
731
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
732
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
733
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
734
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
735
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
736 class NativeOracle : public IOracle
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
737 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
738 private:
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
739 class Item : public Orthanc::IDynamicObject
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
740 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
741 private:
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
742 const OrthancStone::IObserver& receiver_;
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
743 std::auto_ptr<IOracleCommand> command_;
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
744
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
745 public:
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
746 Item(const OrthancStone::IObserver& receiver,
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
747 IOracleCommand* command) :
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
748 receiver_(receiver),
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
749 command_(command)
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
750 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
751 if (command == NULL)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
752 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
753 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
754 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
755 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
756
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
757 const OrthancStone::IObserver& GetReceiver() const
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
758 {
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
759 return receiver_;
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
760 }
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
761
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
762 const IOracleCommand& GetCommand() const
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
763 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
764 assert(command_.get() != NULL);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
765 return *command_;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
766 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
767 };
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
768
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
769
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
770 enum State
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
771 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
772 State_Setup,
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
773 State_Running,
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
774 State_Stopped
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
775 };
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
776
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
777
622
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
778 IMessageEmitter& emitter_;
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
779 Orthanc::WebServiceParameters orthanc_;
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
780 Orthanc::SharedMessageQueue queue_;
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
781 State state_;
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
782 boost::mutex mutex_;
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
783 std::vector<boost::thread*> workers_;
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
784
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
785
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
786 void CopyHttpHeaders(Orthanc::HttpClient& client,
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
787 const HttpHeaders& headers)
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
788 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
789 for (HttpHeaders::const_iterator it = headers.begin(); it != headers.end(); it++ )
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
790 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
791 client.AddHeader(it->first, it->second);
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
792 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
793 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
794
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
795
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
796 void DecodeAnswer(std::string& answer,
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
797 const HttpHeaders& headers)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
798 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
799 Orthanc::HttpCompression contentEncoding = Orthanc::HttpCompression_None;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
800
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
801 for (HttpHeaders::const_iterator it = headers.begin();
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
802 it != headers.end(); ++it)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
803 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
804 std::string s;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
805 Orthanc::Toolbox::ToLowerCase(s, it->first);
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
806
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
807 if (s == "content-encoding")
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
808 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
809 if (it->second == "gzip")
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
810 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
811 contentEncoding = Orthanc::HttpCompression_Gzip;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
812 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
813 else
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
814 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
815 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol,
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
816 "Unsupported HTTP Content-Encoding: " + it->second);
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
817 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
818
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
819 break;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
820 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
821 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
822
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
823 if (contentEncoding == Orthanc::HttpCompression_Gzip)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
824 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
825 std::string compressed;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
826 answer.swap(compressed);
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
827
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
828 Orthanc::GzipCompressor compressor;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
829 compressor.Uncompress(answer, compressed.c_str(), compressed.size());
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
830 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
831 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
832
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
833
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
834 void Execute(const OrthancStone::IObserver& receiver,
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
835 const OrthancRestApiCommand& command)
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
836 {
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
837 Orthanc::HttpClient client(orthanc_, command.GetUri());
622
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
838 client.SetMethod(command.GetMethod());
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
839 client.SetTimeout(command.GetTimeout());
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
840
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
841 CopyHttpHeaders(client, command.GetHttpHeaders());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
842
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
843 if (command.GetMethod() == Orthanc::HttpMethod_Post ||
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
844 command.GetMethod() == Orthanc::HttpMethod_Put)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
845 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
846 client.SetBody(command.GetBody());
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
847 }
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
848
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
849 std::string answer;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
850 HttpHeaders answerHeaders;
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
851 client.ApplyAndThrowException(answer, answerHeaders);
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
852
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
853 DecodeAnswer(answer, answerHeaders);
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
854
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
855 OrthancRestApiCommand::SuccessMessage message(command, answerHeaders, answer);
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
856 emitter_.EmitMessage(receiver, message);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
857 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
858
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
859
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
860 void Execute(const OrthancStone::IObserver& receiver,
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
861 const GetOrthancImageCommand& command)
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
862 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
863 Orthanc::HttpClient client(orthanc_, command.GetUri());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
864 client.SetTimeout(command.GetTimeout());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
865
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
866 CopyHttpHeaders(client, command.GetHttpHeaders());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
867
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
868 std::string answer;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
869 HttpHeaders answerHeaders;
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
870 client.ApplyAndThrowException(answer, answerHeaders);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
871
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
872 DecodeAnswer(answer, answerHeaders);
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
873
640
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
874 command.ProcessHttpAnswer(emitter_, receiver, answer, answerHeaders);
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
875 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
876
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
877
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
878 void Execute(const OrthancStone::IObserver& receiver,
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
879 const GetOrthancWebViewerJpegCommand& command)
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
880 {
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
881 Orthanc::HttpClient client(orthanc_, command.GetUri());
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
882 client.SetTimeout(command.GetTimeout());
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
883
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
884 CopyHttpHeaders(client, command.GetHttpHeaders());
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
885
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
886 std::string answer;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
887 HttpHeaders answerHeaders;
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
888 client.ApplyAndThrowException(answer, answerHeaders);
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
889
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
890 DecodeAnswer(answer, answerHeaders);
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
891
640
e706188d6078 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 639
diff changeset
892 command.ProcessHttpAnswer(emitter_, receiver, answer);
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
893 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
894
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
895
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
896 void Step()
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
897 {
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
898 std::auto_ptr<Orthanc::IDynamicObject> object(queue_.Dequeue(100));
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
899
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
900 if (object.get() != NULL)
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
901 {
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
902 const Item& item = dynamic_cast<Item&>(*object);
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
903
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
904 try
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
905 {
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
906 switch (item.GetCommand().GetType())
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
907 {
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
908 case IOracleCommand::Type_OrthancRestApi:
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
909 Execute(item.GetReceiver(),
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
910 dynamic_cast<const OrthancRestApiCommand&>(item.GetCommand()));
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
911 break;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
912
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
913 case IOracleCommand::Type_GetOrthancImage:
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
914 Execute(item.GetReceiver(),
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
915 dynamic_cast<const GetOrthancImageCommand&>(item.GetCommand()));
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
916 break;
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
917
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
918 case IOracleCommand::Type_GetOrthancWebViewerJpeg:
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
919 Execute(item.GetReceiver(),
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
920 dynamic_cast<const GetOrthancWebViewerJpegCommand&>(item.GetCommand()));
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
921 break;
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
922
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
923 default:
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
924 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
925 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
926 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
927 catch (Orthanc::OrthancException& e)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
928 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
929 LOG(ERROR) << "Exception within the oracle: " << e.What();
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
930 emitter_.EmitMessage(item.GetReceiver(), OracleCommandExceptionMessage(item.GetCommand(), e));
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
931 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
932 catch (...)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
933 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
934 LOG(ERROR) << "Native exception within the oracle";
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
935 emitter_.EmitMessage(item.GetReceiver(), OracleCommandExceptionMessage
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
936 (item.GetCommand(), Orthanc::ErrorCode_InternalError));
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
937 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
938 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
939 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
940
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
941
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
942 static void Worker(NativeOracle* that)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
943 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
944 assert(that != NULL);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
945
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
946 for (;;)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
947 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
948 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
949 boost::mutex::scoped_lock lock(that->mutex_);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
950 if (that->state_ != State_Running)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
951 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
952 return;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
953 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
954 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
955
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
956 that->Step();
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
957 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
958 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
959
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
960
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
961 void StopInternal()
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
962 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
963 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
964 boost::mutex::scoped_lock lock(mutex_);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
965
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
966 if (state_ == State_Setup ||
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
967 state_ == State_Stopped)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
968 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
969 return;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
970 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
971 else
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
972 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
973 state_ = State_Stopped;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
974 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
975 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
976
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
977 for (size_t i = 0; i < workers_.size(); i++)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
978 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
979 if (workers_[i] != NULL)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
980 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
981 if (workers_[i]->joinable())
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
982 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
983 workers_[i]->join();
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
984 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
985
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
986 delete workers_[i];
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
987 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
988 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
989 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
990
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
991
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
992 public:
622
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
993 NativeOracle(IMessageEmitter& emitter) :
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
994 emitter_(emitter),
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
995 state_(State_Setup),
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
996 workers_(4)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
997 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
998 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
999
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1000 virtual ~NativeOracle()
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1001 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1002 StopInternal();
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1003 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1004
622
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1005 void SetOrthancParameters(const Orthanc::WebServiceParameters& orthanc)
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1006 {
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1007 boost::mutex::scoped_lock lock(mutex_);
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1008
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1009 if (state_ != State_Setup)
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1010 {
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1011 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1012 }
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1013 else
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1014 {
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1015 orthanc_ = orthanc;
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1016 }
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1017 }
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1018
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1019 void SetWorkersCount(unsigned int count)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1020 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1021 boost::mutex::scoped_lock lock(mutex_);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1022
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1023 if (count <= 0)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1024 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1025 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1026 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1027 else if (state_ != State_Setup)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1028 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1029 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1030 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1031 else
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1032 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1033 workers_.resize(count);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1034 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1035 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1036
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1037 void Start()
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1038 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1039 boost::mutex::scoped_lock lock(mutex_);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1040
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1041 if (state_ != State_Setup)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1042 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1043 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1044 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1045 else
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1046 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1047 state_ = State_Running;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1048
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1049 for (unsigned int i = 0; i < workers_.size(); i++)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1050 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1051 workers_[i] = new boost::thread(Worker, this);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1052 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1053 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1054 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1055
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1056 void Stop()
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1057 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1058 StopInternal();
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1059 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1060
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1061 virtual void Schedule(const OrthancStone::IObserver& receiver,
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1062 IOracleCommand* command)
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1063 {
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1064 queue_.Enqueue(new Item(receiver, command));
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1065 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1066 };
622
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1067
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1068
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1069
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1070 class NativeApplicationContext : public IMessageEmitter
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1071 {
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1072 private:
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1073 boost::shared_mutex mutex_;
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1074 OrthancStone::MessageBroker broker_;
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1075 OrthancStone::IObservable oracleObservable_;
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1076
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1077 public:
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1078 NativeApplicationContext() :
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1079 oracleObservable_(broker_)
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1080 {
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1081 }
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1082
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1083
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1084 virtual void EmitMessage(const OrthancStone::IObserver& observer,
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1085 const OrthancStone::IMessage& message)
622
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1086 {
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1087 try
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1088 {
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1089 boost::unique_lock<boost::shared_mutex> lock(mutex_);
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1090 oracleObservable_.EmitMessage(observer, message);
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1091 }
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1092 catch (Orthanc::OrthancException& e)
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1093 {
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1094 LOG(ERROR) << "Exception while emitting a message: " << e.What();
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1095 }
622
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1096 }
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1097
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1098
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1099 class ReaderLock : public boost::noncopyable
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1100 {
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1101 private:
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1102 NativeApplicationContext& that_;
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1103 boost::shared_lock<boost::shared_mutex> lock_;
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1104
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1105 public:
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1106 ReaderLock(NativeApplicationContext& that) :
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1107 that_(that),
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1108 lock_(that.mutex_)
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1109 {
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1110 }
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1111 };
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1112
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1113
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1114 class WriterLock : public boost::noncopyable
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1115 {
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1116 private:
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1117 NativeApplicationContext& that_;
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1118 boost::unique_lock<boost::shared_mutex> lock_;
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1119
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1120 public:
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1121 WriterLock(NativeApplicationContext& that) :
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1122 that_(that),
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1123 lock_(that.mutex_)
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1124 {
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1125 }
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1126
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1127 OrthancStone::MessageBroker& GetBroker()
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1128 {
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1129 return that_.broker_;
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1130 }
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1131
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1132 OrthancStone::IObservable& GetOracleObservable()
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1133 {
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1134 return that_.oracleObservable_;
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1135 }
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1136 };
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1137 };
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1138
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1139
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1140
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1141 class DicomInstanceParameters : public boost::noncopyable
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1142 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1143 private:
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1144 Orthanc::DicomImageInformation imageInformation_;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1145 OrthancStone::SopClassUid sopClassUid_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1146 double thickness_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1147 double pixelSpacingX_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1148 double pixelSpacingY_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1149 OrthancStone::CoordinateSystem3D geometry_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1150 OrthancStone::Vector frameOffsets_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1151 bool isColor_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1152 bool hasRescale_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1153 double rescaleOffset_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1154 double rescaleSlope_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1155 bool hasDefaultWindowing_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1156 float defaultWindowingCenter_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1157 float defaultWindowingWidth_;
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1158 Orthanc::PixelFormat expectedPixelFormat_;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1159
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1160 void ComputeDoseOffsets(const Orthanc::DicomMap& dicom)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1161 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1162 // http://dicom.nema.org/medical/Dicom/2016a/output/chtml/part03/sect_C.8.8.3.2.html
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1163
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 std::string increment;
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 if (dicom.CopyToString(increment, Orthanc::DICOM_TAG_FRAME_INCREMENT_POINTER, false))
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 Orthanc::Toolbox::ToUpperCase(increment);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1170 if (increment != "3004,000C") // This is the "Grid Frame Offset Vector" tag
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1171 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1172 LOG(ERROR) << "RT-DOSE: Bad value for the \"FrameIncrementPointer\" tag";
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1173 return;
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 }
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
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1178 if (!OrthancStone::LinearAlgebra::ParseVector(frameOffsets_, dicom, Orthanc::DICOM_TAG_GRID_FRAME_OFFSET_VECTOR) ||
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1179 frameOffsets_.size() < imageInformation_.GetNumberOfFrames())
625
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 LOG(ERROR) << "RT-DOSE: No information about the 3D location of some slice(s)";
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1182 frameOffsets_.clear();
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1183 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1184 else
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 if (frameOffsets_.size() >= 2)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1187 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1188 thickness_ = frameOffsets_[1] - frameOffsets_[0];
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1189
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1190 if (thickness_ < 0)
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 thickness_ = -thickness_;
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 }
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 public:
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1199 DicomInstanceParameters(const Orthanc::DicomMap& dicom) :
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1200 imageInformation_(dicom)
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1201 {
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1202 if (imageInformation_.GetNumberOfFrames() <= 0)
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 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
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
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1207 std::string s;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1208 if (!dicom.CopyToString(s, Orthanc::DICOM_TAG_SOP_CLASS_UID, false))
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1209 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1210 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1211 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1212 else
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1213 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1214 sopClassUid_ = OrthancStone::StringToSopClassUid(s);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1215 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1216
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1217 if (!dicom.ParseDouble(thickness_, Orthanc::DICOM_TAG_SLICE_THICKNESS))
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1218 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1219 thickness_ = 100.0 * std::numeric_limits<double>::epsilon();
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1220 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1221
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1222 OrthancStone::GeometryToolbox::GetPixelSpacing(pixelSpacingX_, pixelSpacingY_, dicom);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1223
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1224 std::string position, orientation;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1225 if (dicom.CopyToString(position, Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, false) &&
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1226 dicom.CopyToString(orientation, Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, false))
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1227 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1228 geometry_ = OrthancStone::CoordinateSystem3D(position, orientation);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1229 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1230
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1231 if (sopClassUid_ == OrthancStone::SopClassUid_RTDose)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1232 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1233 ComputeDoseOffsets(dicom);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1234 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1235
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1236 isColor_ = (imageInformation_.GetPhotometricInterpretation() != Orthanc::PhotometricInterpretation_Monochrome1 &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1237 imageInformation_.GetPhotometricInterpretation() != Orthanc::PhotometricInterpretation_Monochrome2);
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1238
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1239 double doseGridScaling;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1240
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1241 if (dicom.ParseDouble(rescaleOffset_, Orthanc::DICOM_TAG_RESCALE_INTERCEPT) &&
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1242 dicom.ParseDouble(rescaleSlope_, Orthanc::DICOM_TAG_RESCALE_SLOPE))
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1243 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1244 hasRescale_ = true;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1245 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1246 else if (dicom.ParseDouble(doseGridScaling, Orthanc::DICOM_TAG_DOSE_GRID_SCALING))
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1247 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1248 hasRescale_ = true;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1249 rescaleOffset_ = 0;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1250 rescaleSlope_ = doseGridScaling;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1251 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1252 else
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1253 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1254 hasRescale_ = false;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1255 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1256
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1257 OrthancStone::Vector c, w;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1258 if (OrthancStone::LinearAlgebra::ParseVector(c, dicom, Orthanc::DICOM_TAG_WINDOW_CENTER) &&
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1259 OrthancStone::LinearAlgebra::ParseVector(w, dicom, Orthanc::DICOM_TAG_WINDOW_WIDTH) &&
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1260 c.size() > 0 &&
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1261 w.size() > 0)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1262 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1263 hasDefaultWindowing_ = true;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1264 defaultWindowingCenter_ = static_cast<float>(c[0]);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1265 defaultWindowingWidth_ = static_cast<float>(w[0]);
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 else
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1268 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1269 hasDefaultWindowing_ = false;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1270 }
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1271
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1272 if (sopClassUid_ == OrthancStone::SopClassUid_RTDose)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1273 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1274 switch (imageInformation_.GetBitsStored())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1275 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1276 case 16:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1277 expectedPixelFormat_ = Orthanc::PixelFormat_Grayscale16;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1278 break;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1279
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1280 case 32:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1281 expectedPixelFormat_ = Orthanc::PixelFormat_Grayscale32;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1282 break;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1283
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1284 default:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1285 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1286 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1287 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1288 else if (isColor_)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1289 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1290 expectedPixelFormat_ = Orthanc::PixelFormat_RGB24;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1291 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1292 else if (imageInformation_.IsSigned())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1293 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1294 expectedPixelFormat_ = Orthanc::PixelFormat_SignedGrayscale16;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1295 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1296 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1297 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1298 expectedPixelFormat_ = Orthanc::PixelFormat_Grayscale16;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1299 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1300 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1301
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1302 const Orthanc::DicomImageInformation& GetImageInformation() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1303 {
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1304 return imageInformation_;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1305 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1306
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1307 OrthancStone::SopClassUid GetSopClassUid() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1308 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1309 return sopClassUid_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1310 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1311
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1312 double GetThickness() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1313 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1314 return thickness_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1315 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1316
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1317 double GetPixelSpacingX() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1318 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1319 return pixelSpacingX_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1320 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1321
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1322 double GetPixelSpacingY() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1323 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1324 return pixelSpacingY_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1325 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1326
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1327 const OrthancStone::CoordinateSystem3D& GetGeometry() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1328 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1329 return geometry_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1330 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1331
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1332 OrthancStone::CoordinateSystem3D GetFrameGeometry(unsigned int frame) const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1333 {
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1334 if (frame == 0)
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1335 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1336 return geometry_;
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1337 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1338 else if (frame >= imageInformation_.GetNumberOfFrames())
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1339 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1340 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1341 }
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1342 else if (sopClassUid_ == OrthancStone::SopClassUid_RTDose)
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1343 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1344 if (frame >= frameOffsets_.size())
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1345 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1346 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1347 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1348
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1349 return OrthancStone::CoordinateSystem3D(
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1350 geometry_.GetOrigin() + frameOffsets_[frame] * geometry_.GetNormal(),
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1351 geometry_.GetAxisX(),
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1352 geometry_.GetAxisY());
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1353 }
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1354 else
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1355 {
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1356 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1357 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1358 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1359
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1360 bool FrameContainsPlane(unsigned int frame,
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1361 const OrthancStone::CoordinateSystem3D& plane) const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1362 {
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1363 if (frame >= imageInformation_.GetNumberOfFrames())
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1364 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1365 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1366 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1367
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1368 OrthancStone::CoordinateSystem3D tmp = geometry_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1369
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1370 if (frame != 0)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1371 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1372 tmp = GetFrameGeometry(frame);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1373 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1374
647
6af3099ed8da uncoupling OrthancStone::SlicesSorter from OrthancStone::Slice
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 646
diff changeset
1375 double distance;
6af3099ed8da uncoupling OrthancStone::SlicesSorter from OrthancStone::Slice
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 646
diff changeset
1376
6af3099ed8da uncoupling OrthancStone::SlicesSorter from OrthancStone::Slice
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 646
diff changeset
1377 return (OrthancStone::CoordinateSystem3D::GetDistance(distance, tmp, plan) &&
6af3099ed8da uncoupling OrthancStone::SlicesSorter from OrthancStone::Slice
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 646
diff changeset
1378 OrthancStone::LinearAlgebra::IsNear(distance, thickness_ / 2.0));
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1379 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1380
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1381 bool IsColor() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1382 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1383 return isColor_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1384 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1385
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1386 bool HasRescale() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1387 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1388 return hasRescale_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1389 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1390
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1391 double GetRescaleOffset() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1392 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1393 if (hasRescale_)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1394 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1395 return rescaleOffset_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1396 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1397 else
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1398 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1399 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1400 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1401 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1402
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1403 double GetRescaleSlope() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1404 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1405 if (hasRescale_)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1406 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1407 return rescaleSlope_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1408 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1409 else
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1410 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1411 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1412 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1413 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1414
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1415 bool HasDefaultWindowing() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1416 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1417 return hasDefaultWindowing_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1418 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1419
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1420 float GetDefaultWindowingCenter() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1421 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1422 if (hasDefaultWindowing_)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1423 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1424 return defaultWindowingCenter_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1425 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1426 else
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1427 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1428 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1429 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1430 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1431
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1432 float GetDefaultWindowingWidth() const
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1433 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1434 if (hasDefaultWindowing_)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1435 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1436 return defaultWindowingWidth_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1437 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1438 else
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1439 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1440 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1441 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1442 }
626
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1443
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1444 Orthanc::PixelFormat GetExpectedPixelFormat() const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1445 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1446 return expectedPixelFormat_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 625
diff changeset
1447 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1448 };
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1449
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1450
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1451 class AxialVolumeOrthancLoader : public OrthancStone::IObserver
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1452 {
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1453 private:
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1454 class MessageHandler : public Orthanc::IDynamicObject
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1455 {
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1456 public:
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1457 virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message) const = 0;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1458 };
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1459
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1460 void Handle(const OrthancRestApiCommand::SuccessMessage& message)
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1461 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1462 dynamic_cast<const MessageHandler&>(message.GetOrigin().GetPayload()).Handle(message);
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1463 }
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1464
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1465
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1466 class LoadSeriesGeometryHandler : public MessageHandler
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1467 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1468 private:
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1469 AxialVolumeOrthancLoader& that_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1470
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1471 public:
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1472 LoadSeriesGeometryHandler(AxialVolumeOrthancLoader& that) :
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1473 that_(that)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1474 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1475 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1476
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1477 virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message) const
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1478 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1479 Json::Value value;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1480 message.ParseJsonBody(value);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1481
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1482 if (value.type() != Json::objectValue)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1483 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1484 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1485 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1486
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1487 Json::Value::Members instances = value.getMemberNames();
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1488
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1489 for (size_t i = 0; i < instances.size(); i++)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1490 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1491 Orthanc::DicomMap dicom;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1492 dicom.FromDicomAsJson(value[instances[i]]);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1493
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1494 DicomInstanceParameters instance(dicom);
647
6af3099ed8da uncoupling OrthancStone::SlicesSorter from OrthancStone::Slice
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 646
diff changeset
1495
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1496 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1497 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1498 };
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1499
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1500
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1501 class LoadInstanceGeometryHandler : public MessageHandler
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1502 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1503 private:
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1504 AxialVolumeOrthancLoader& that_;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1505
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1506 public:
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1507 LoadInstanceGeometryHandler(AxialVolumeOrthancLoader& that) :
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1508 that_(that)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1509 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1510 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1511
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1512 virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message) const
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1513 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1514 Json::Value value;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1515 message.ParseJsonBody(value);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1516
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1517 if (value.type() != Json::objectValue)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1518 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1519 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1520 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1521
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1522 Orthanc::DicomMap dicom;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1523 dicom.FromDicomAsJson(value);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1524
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1525 DicomInstanceParameters instance(dicom);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1526 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1527 };
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1528
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1529
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1530 bool active_;
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1531 std::auto_ptr<OrthancStone::ImageBuffer3D> image_;
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1532
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1533
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1534 public:
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1535 AxialVolumeOrthancLoader(OrthancStone::IObservable& oracle) :
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1536 IObserver(oracle.GetBroker()),
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1537 active_(false)
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1538 {
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1539 oracle.RegisterObserverCallback(
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1540 new OrthancStone::Callable<AxialVolumeOrthancLoader, OrthancRestApiCommand::SuccessMessage>
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1541 (*this, &AxialVolumeOrthancLoader::Handle));
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1542 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1543
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1544 void LoadSeries(IOracle& oracle,
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1545 const std::string& seriesId)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1546 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1547 if (active_)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1548 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1549 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1550 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1551
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1552 active_ = true;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1553
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1554 std::auto_ptr<Refactoring::OrthancRestApiCommand> command(new Refactoring::OrthancRestApiCommand);
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1555 command->SetUri("/series/" + seriesId + "/instances-tags");
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1556 command->SetPayload(new LoadSeriesGeometryHandler(*this));
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1557
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1558 oracle.Schedule(*this, command.release());
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1559 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1560
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1561 void LoadInstance(IOracle& oracle,
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1562 const std::string& instanceId)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1563 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1564 if (active_)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1565 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1566 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1567 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1568
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1569 active_ = true;
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1570
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1571 // Tag "3004-000c" is "Grid Frame Offset Vector", which is
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1572 // mandatory to read RT DOSE, but is too long to be returned by default
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1573
631
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 626
diff changeset
1574 // TODO => Should be part of a second call if needed
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 626
diff changeset
1575
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1576 std::auto_ptr<Refactoring::OrthancRestApiCommand> command(new Refactoring::OrthancRestApiCommand);
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1577 command->SetUri("/instances/" + instanceId + "/tags?ignore-length=3004-000c");
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1578 command->SetPayload(new LoadInstanceGeometryHandler(*this));
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1579
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1580 oracle.Schedule(*this, command.release());
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1581 }
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1582 };
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1583
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1584 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1585
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1586
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1587
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1588 class Toto : public OrthancStone::IObserver
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1589 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1590 private:
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1591 void Handle(const Refactoring::OrthancRestApiCommand::SuccessMessage& message)
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1592 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1593 Json::Value v;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1594 message.ParseJsonBody(v);
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1595
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1596 printf("ICI [%s]\n", v.toStyledString().c_str());
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1597 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1598
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
1599 void Handle(const Refactoring::GetOrthancImageCommand::SuccessMessage& message)
637
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
1600 {
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
1601 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
1602 }
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
1603
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1604 void Handle(const Refactoring::GetOrthancWebViewerJpegCommand::SuccessMessage& message)
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1605 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1606 printf("WebViewer %dx%d\n", message.GetImage().GetWidth(), message.GetImage().GetHeight());
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1607 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1608
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1609 void Handle(const Refactoring::OracleCommandExceptionMessage& message)
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1610 {
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1611 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
1612
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1613 switch (message.GetCommand().GetType())
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1614 {
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
1615 case Refactoring::IOracleCommand::Type_GetOrthancWebViewerJpeg:
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
1616 printf("URI: [%s]\n", dynamic_cast<const Refactoring::GetOrthancWebViewerJpegCommand&>
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1617 (message.GetCommand()).GetUri().c_str());
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1618 break;
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1619
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1620 default:
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1621 break;
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1622 }
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1623 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1624
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1625 public:
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1626 Toto(OrthancStone::IObservable& oracle) :
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1627 IObserver(oracle.GetBroker())
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1628 {
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1629 oracle.RegisterObserverCallback
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1630 (new OrthancStone::Callable
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1631 <Toto, Refactoring::OrthancRestApiCommand::SuccessMessage>(*this, &Toto::Handle));
637
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
1632
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
1633 oracle.RegisterObserverCallback
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
1634 (new OrthancStone::Callable
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
1635 <Toto, Refactoring::GetOrthancImageCommand::SuccessMessage>(*this, &Toto::Handle));
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1636
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1637 oracle.RegisterObserverCallback
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1638 (new OrthancStone::Callable
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1639 <Toto, Refactoring::GetOrthancWebViewerJpegCommand::SuccessMessage>(*this, &Toto::Handle));
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1640
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1641 oracle.RegisterObserverCallback
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1642 (new OrthancStone::Callable
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1643 <Toto, Refactoring::OracleCommandExceptionMessage>(*this, &Toto::Handle));
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1644 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1645 };
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1646
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1647
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1648 void Run(Refactoring::NativeApplicationContext& context)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1649 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1650 std::auto_ptr<Toto> toto;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1651 std::auto_ptr<Refactoring::AxialVolumeOrthancLoader> loader1, loader2;
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1652
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1653 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1654 Refactoring::NativeApplicationContext::WriterLock lock(context);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1655 toto.reset(new Toto(lock.GetOracleObservable()));
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1656 loader1.reset(new Refactoring::AxialVolumeOrthancLoader(lock.GetOracleObservable()));
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1657 loader2.reset(new Refactoring::AxialVolumeOrthancLoader(lock.GetOracleObservable()));
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1658 }
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1659
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1660 Refactoring::NativeOracle oracle(context);
622
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1661
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1662 {
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1663 Orthanc::WebServiceParameters p;
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1664 //p.SetUrl("http://localhost:8043/");
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1665 p.SetCredentials("orthanc", "orthanc");
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1666 oracle.SetOrthancParameters(p);
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1667 }
8a3a25f2d42c uncoupling oracle from context
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 619
diff changeset
1668
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1669 oracle.Start();
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1670
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1671 if (1)
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1672 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1673 Json::Value v = Json::objectValue;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1674 v["Level"] = "Series";
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1675 v["Query"] = Json::objectValue;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1676
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1677 std::auto_ptr<Refactoring::OrthancRestApiCommand> command(new Refactoring::OrthancRestApiCommand);
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1678 command->SetMethod(Orthanc::HttpMethod_Post);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1679 command->SetUri("/tools/find");
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1680 command->SetBody(v);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1681
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1682 oracle.Schedule(*toto, command.release());
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1683 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1684
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1685 if (1)
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1686 {
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
1687 std::auto_ptr<Refactoring::GetOrthancImageCommand> command(new Refactoring::GetOrthancImageCommand);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1688 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Jpeg)));
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1689 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/preview");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1690 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1691 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1692
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1693 if (1)
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1694 {
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
1695 std::auto_ptr<Refactoring::GetOrthancImageCommand> command(new Refactoring::GetOrthancImageCommand);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1696 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Png)));
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1697 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/preview");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1698 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1699 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1700
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1701 if (1)
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1702 {
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
1703 std::auto_ptr<Refactoring::GetOrthancImageCommand> command(new Refactoring::GetOrthancImageCommand);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1704 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Png)));
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1705 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1706 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1707 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1708
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1709 if (1)
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1710 {
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
1711 std::auto_ptr<Refactoring::GetOrthancImageCommand> command(new Refactoring::GetOrthancImageCommand);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1712 command->SetHttpHeader("Accept-Encoding", "gzip");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1713 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam)));
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1714 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1715 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1716 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1717
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1718 if (1)
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1719 {
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
1720 std::auto_ptr<Refactoring::GetOrthancImageCommand> command(new Refactoring::GetOrthancImageCommand);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1721 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam)));
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1722 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1723 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1724 }
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1725
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1726 if (1)
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1727 {
641
392783c90607 renames
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 640
diff changeset
1728 std::auto_ptr<Refactoring::GetOrthancWebViewerJpegCommand> command(new Refactoring::GetOrthancWebViewerJpegCommand);
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1729 command->SetHttpHeader("Accept-Encoding", "gzip");
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1730 command->SetInstance("e6c7c20b-c9f65d7e-0d76f2e2-830186f2-3e3c600e");
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1731 command->SetQuality(90);
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1732 oracle.Schedule(*toto, command.release());
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1733 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1734
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1735
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1736 // 2017-11-17-Anonymized
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1737 loader1->LoadSeries(oracle, "cb3ea4d1-d08f3856-ad7b6314-74d88d77-60b05618"); // CT
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1738 loader2->LoadInstance(oracle, "41029085-71718346-811efac4-420e2c15-d39f99b6"); // RT-DOSE
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1739
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1740 LOG(WARNING) << "...Waiting for Ctrl-C...";
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1741 Orthanc::SystemToolbox::ServerBarrier();
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1742 //boost::this_thread::sleep(boost::posix_time::seconds(1));
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1743
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1744 oracle.Stop();
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1745 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1746
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1747
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1748
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1749 /**
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1750 * IMPORTANT: The full arguments to "main()" are needed for SDL on
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1751 * Windows. Otherwise, one gets the linking error "undefined reference
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1752 * to `SDL_main'". https://wiki.libsdl.org/FAQWindows
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1753 **/
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1754 int main(int argc, char* argv[])
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1755 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1756 OrthancStone::StoneInitialize();
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1757 Orthanc::Logging::EnableInfoLevel(true);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1758
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1759 try
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1760 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1761 Refactoring::NativeApplicationContext context;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1762 Run(context);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1763 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1764 catch (Orthanc::OrthancException& e)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1765 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1766 LOG(ERROR) << "EXCEPTION: " << e.What();
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1767 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1768
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1769 OrthancStone::StoneFinalize();
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1770
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1771 return 0;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1772 }