Mercurial > hg > orthanc-stone

annotate Samples/Sdl/Loader.cpp @ 780:f81655ed96ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cont
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 27 May 2019 10:39:35 +0200
parents e72a9fef3d19
children 2bb72826fa3f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Stone of Orthanc
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * modify it under the terms of the GNU Affero General Public License
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * the License, or (at your option) any later version.
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * Affero General Public License for more details.
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 *
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * You should have received a copy of the GNU Affero General Public License
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * along with this program. If not, see <http://www.gnu.org/licenses/>.
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 **/
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
21
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 745
diff changeset
22 #include "../../Framework/Toolbox/DicomInstanceParameters.h"
748
ab236bb5dbc7 ThreadedOracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 746
diff changeset
23 #include "../../Framework/Oracle/ThreadedOracle.h"
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 745
diff changeset
24 #include "../../Framework/Oracle/GetOrthancWebViewerJpegCommand.h"
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 745
diff changeset
25 #include "../../Framework/Oracle/GetOrthancImageCommand.h"
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 745
diff changeset
26 #include "../../Framework/Oracle/OrthancRestApiCommand.h"
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
27 #include "../../Framework/Oracle/SleepOracleCommand.h"
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
28 #include "../../Framework/Oracle/OracleCommandExceptionMessage.h"
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
29
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 // From Stone
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
31 #include "../../Framework/Loaders/BasicFetchingItemsSorter.h"
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
32 #include "../../Framework/Loaders/BasicFetchingStrategy.h"
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
33 #include "../../Framework/Scene2D/CairoCompositor.h"
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
34 #include "../../Framework/Scene2D/Scene2D.h"
767
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
35 #include "../../Framework/Scene2D/PolylineSceneLayer.h"
768
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 767
diff changeset
36 #include "../../Framework/Scene2D/LookupTableTextureSceneLayer.h"
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
37 #include "../../Framework/StoneInitialization.h"
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
38 #include "../../Framework/Toolbox/GeometryToolbox.h"
683
dbc1d8bfc68a reorganizing ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 681
diff changeset
39 #include "../../Framework/Toolbox/SlicesSorter.h"
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
40 #include "../../Framework/Volumes/ImageBuffer3D.h"
742
fa5febe0f0c2 moved OrientedBoundingBox in the Volumes folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 735
diff changeset
41 #include "../../Framework/Volumes/VolumeImageGeometry.h"
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 // From Orthanc framework
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
44 #include <Core/DicomFormat/DicomArray.h>
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
45 #include <Core/Images/Image.h>
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 #include <Core/Images/ImageProcessing.h>
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
47 #include <Core/Images/PngWriter.h>
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 #include <Core/Logging.h>
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 #include <Core/OrthancException.h>
683
dbc1d8bfc68a reorganizing ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 681
diff changeset
50 #include <Core/SystemToolbox.h>
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
51 #include <Core/Toolbox.h>
619
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
768
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 767
diff changeset
54 #include <EmbeddedResources.h>
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 767
diff changeset
55
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 767
diff changeset
56
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
57 namespace OrthancStone
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 {
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
59 // Application-configurable, can be shared between 3D/2D
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
60 class ILayerStyleConfigurator
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
61 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
62 public:
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
63 virtual ~ILayerStyleConfigurator()
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
64 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
65 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
66
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
67 virtual uint64_t GetRevision() const = 0;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
68
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
69 virtual ISceneLayer* CreateFromImage(const Orthanc::ImageAccessor& image) const = 0;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
70
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
71 virtual ISceneLayer* CreateFromDicomImage(const Orthanc::ImageAccessor& frame,
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
72 const DicomInstanceParameters& parameters) const = 0;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
73
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
74 virtual void ApplyStyle(ISceneLayer& layer) const = 0;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
75 };
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
76
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
77
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
78
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
79 class LookupTableStyleConfigurator : public ILayerStyleConfigurator
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
80 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
81 private:
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
82 uint64_t revision_;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
83 bool hasLut_;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
84 std::string lut_;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
85 bool hasRange_;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
86 float minValue_;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
87 float maxValue_;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
88
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
89 public:
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
90 LookupTableStyleConfigurator() :
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
91 revision_(0),
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
92 hasLut_(false),
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
93 hasRange_(false)
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
94 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
95 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
96
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
97 void SetLookupTable(Orthanc::EmbeddedResources::FileResourceId resource)
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
98 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
99 hasLut_ = true;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
100 Orthanc::EmbeddedResources::GetFileResource(lut_, resource);
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
101 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
102
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
103 void SetLookupTable(const std::string& lut)
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
104 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
105 hasLut_ = true;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
106 lut_ = lut;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
107 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
108
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
109 void SetRange(float minValue,
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
110 float maxValue)
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
111 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
112 if (minValue > maxValue)
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
113 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
114 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
115 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
116 else
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
117 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
118 hasRange_ = true;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
119 minValue_ = minValue;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
120 maxValue_ = maxValue;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
121 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
122 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
123
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
124 virtual uint64_t GetRevision() const
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
125 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
126 return revision_;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
127 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
128
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
129 virtual ISceneLayer* CreateFromImage(const Orthanc::ImageAccessor& image) const
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
130 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
131 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
132 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
133
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
134 virtual ISceneLayer* CreateFromDicomImage(const Orthanc::ImageAccessor& frame,
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
135 const DicomInstanceParameters& parameters) const
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
136 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
137 return parameters.CreateLookupTableTexture(frame);
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
138 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
139
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
140 virtual void ApplyStyle(ISceneLayer& layer) const
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
141 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
142 LookupTableTextureSceneLayer& l = dynamic_cast<LookupTableTextureSceneLayer&>(layer);
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
143
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
144 if (hasLut_)
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
145 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
146 l.SetLookupTable(lut_);
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
147 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
148
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
149 if (hasRange_)
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
150 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
151 l.SetRange(minValue_, maxValue_);
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
152 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
153 else
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
154 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
155 l.FitRange();
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
156 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
157 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
158 };
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
159
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
160
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
161 class GrayscaleStyleConfigurator : public ILayerStyleConfigurator
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
162 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
163 private:
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
164 uint64_t revision_;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
165
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
166 public:
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
167 GrayscaleStyleConfigurator() :
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
168 revision_(0)
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
169 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
170 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
171
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
172 virtual uint64_t GetRevision() const
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
173 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
174 return revision_;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
175 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
176
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
177 virtual ISceneLayer* CreateFromImage(const Orthanc::ImageAccessor& image) const
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
178 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
179 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
180 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
181
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
182 virtual ISceneLayer* CreateFromDicomImage(const Orthanc::ImageAccessor& frame,
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
183 const DicomInstanceParameters& parameters) const
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
184 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
185 return parameters.CreateTexture(frame);
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
186 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
187
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
188 virtual void ApplyStyle(ISceneLayer& layer) const
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
189 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
190 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
191 };
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
192
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
193
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
194 class IVolumeSlicer : public boost::noncopyable
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
195 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
196 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
197 class ExtractedSlice : public boost::noncopyable
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
198 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
199 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
200 virtual ~ExtractedSlice()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
201 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
202 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
203
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
204 virtual bool IsValid() = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
205
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
206 // Must be a cheap call
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
207 virtual uint64_t GetRevision() = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
208
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
209 // This call can take some time
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
210 virtual ISceneLayer* CreateSceneLayer(const ILayerStyleConfigurator* configurator, // possibly absent
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
211 const CoordinateSystem3D& cuttingPlane) = 0;
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
212 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
213
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
214 virtual ~IVolumeSlicer()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
215 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
216 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
217
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
218 virtual ExtractedSlice* ExtractSlice(const CoordinateSystem3D& cuttingPlane) const = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
219 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
221
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
222
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
223 class VolumeGeometryReadyMessage : public OriginMessage<IVolumeSlicer>
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
224 {
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
225 ORTHANC_STONE_MESSAGE(__FILE__, __LINE__);
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
226
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
227 private:
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
228 const VolumeImageGeometry& geometry_;
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
229
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
230 public:
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
231 VolumeGeometryReadyMessage(const IVolumeSlicer& slicer,
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
232 const VolumeImageGeometry& geometry) :
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
233 OriginMessage(slicer),
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
234 geometry_(geometry)
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
235 {
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
236 }
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
237
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
238 const VolumeImageGeometry& GetGeometry() const
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
239 {
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
240 return geometry_;
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
241 }
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
242 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
243
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
244
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
245
759
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
246 class InvalidExtractedSlice : public IVolumeSlicer::ExtractedSlice
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
247 {
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
248 public:
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
249 virtual bool IsValid()
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
250 {
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
251 return false;
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
252 }
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
253
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
254 virtual uint64_t GetRevision()
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
255 {
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
256 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
257 }
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
258
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
259 virtual ISceneLayer* CreateSceneLayer(const ILayerStyleConfigurator* configurator,
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
260 const CoordinateSystem3D& cuttingPlane)
759
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
261 {
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
262 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
263 }
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
264 };
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
265
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
266
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
267 class DicomVolumeImageOrthogonalSlice : public IVolumeSlicer::ExtractedSlice
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
268 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
269 private:
759
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
270 const ImageBuffer3D& image_;
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
271 const VolumeImageGeometry& geometry_;
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
272 bool valid_;
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
273 VolumeProjection projection_;
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
274 unsigned int sliceIndex_;
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
275
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
276 void CheckValid() const
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
277 {
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
278 if (!valid_)
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
279 {
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
280 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
281 }
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
282 }
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
283
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
284 protected:
759
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
285 virtual uint64_t GetRevisionInternal(VolumeProjection projection,
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
286 unsigned int sliceIndex) const = 0;
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
287
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
288 virtual const DicomInstanceParameters& GetDicomParameters(VolumeProjection projection,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
289 unsigned int sliceIndex) const = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
290
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
291 public:
759
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
292 DicomVolumeImageOrthogonalSlice(const ImageBuffer3D& image,
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
293 const VolumeImageGeometry& geometry,
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
294 const CoordinateSystem3D& cuttingPlane) :
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
295 image_(image),
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
296 geometry_(geometry)
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
297 {
759
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
298 valid_ = geometry_.DetectSlice(projection_, sliceIndex_, cuttingPlane);
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
299 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
300
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
301 VolumeProjection GetProjection() const
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
302 {
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
303 CheckValid();
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
304 return projection_;
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
305 }
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
306
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
307 unsigned int GetSliceIndex() const
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
308 {
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
309 CheckValid();
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
310 return sliceIndex_;
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
311 }
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
312
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
313 virtual bool IsValid()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
314 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
315 return valid_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
316 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
317
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
318 virtual uint64_t GetRevision()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
319 {
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
320 CheckValid();
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
321 return GetRevisionInternal(projection_, sliceIndex_);
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
322 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
323
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
324 virtual ISceneLayer* CreateSceneLayer(const ILayerStyleConfigurator* configurator,
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
325 const CoordinateSystem3D& cuttingPlane)
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
326 {
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
327 CheckValid();
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
328
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
329 if (configurator == NULL)
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
330 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
331 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer,
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
332 "A style configurator is mandatory for textures");
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
333 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
334
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
335 std::auto_ptr<TextureBaseSceneLayer> texture;
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
336
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
337 {
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
338 const DicomInstanceParameters& parameters = GetDicomParameters(projection_, sliceIndex_);
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
339 ImageBuffer3D::SliceReader reader(image_, projection_, sliceIndex_);
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
340 texture.reset(dynamic_cast<TextureBaseSceneLayer*>
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
341 (configurator->CreateFromDicomImage(reader.GetAccessor(), parameters)));
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
342 }
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
343
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
344 const CoordinateSystem3D& system = geometry_.GetProjectionGeometry(projection_);
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
345
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
346 double x0, y0, x1, y1;
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
347 cuttingPlane.ProjectPoint(x0, y0, system.GetOrigin());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
348 cuttingPlane.ProjectPoint(x1, y1, system.GetOrigin() + system.GetAxisX());
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
349 texture->SetOrigin(x0, y0);
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
350
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
351 double dx = x1 - x0;
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
352 double dy = y1 - y0;
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
353 if (!LinearAlgebra::IsCloseToZero(dx) ||
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
354 !LinearAlgebra::IsCloseToZero(dy))
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
355 {
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
356 texture->SetAngle(atan2(dy, dx));
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
357 }
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
358
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
359 Vector tmp = geometry_.GetVoxelDimensions(projection_);
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
360 texture->SetPixelSpacing(tmp[0], tmp[1]);
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
361
767
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
362 return texture.release();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
363
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
364 #if 0
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
365 double w = texture->GetTexture().GetWidth() * tmp[0];
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
366 double h = texture->GetTexture().GetHeight() * tmp[1];
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
367 printf("%.1f %.1f %.1f => %.1f %.1f => %.1f %.1f\n",
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
368 system.GetOrigin() [0],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
369 system.GetOrigin() [1],
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
370 system.GetOrigin() [2],
767
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
371 x0, y0, x0 + w, y0 + h);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
372
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
373 std::auto_ptr<PolylineSceneLayer> toto(new PolylineSceneLayer);
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
374
767
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
375 PolylineSceneLayer::Chain c;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
376 c.push_back(ScenePoint2D(x0, y0));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
377 c.push_back(ScenePoint2D(x0 + w, y0));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
378 c.push_back(ScenePoint2D(x0 + w, y0 + h));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
379 c.push_back(ScenePoint2D(x0, y0 + h));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
380
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
381 toto->AddChain(c, true);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
382
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
383 return toto.release();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
384 #endif
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
385 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
386 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
387
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
388
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
389 // This class combines a 3D image buffer, a 3D volume geometry and
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
390 // information about the DICOM parameters of each slice.
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
391 class DicomSeriesVolumeImage : public boost::noncopyable
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
392 {
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
393 public:
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
394 class ExtractedOrthogonalSlice : public DicomVolumeImageOrthogonalSlice
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
395 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
396 private:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
397 const DicomSeriesVolumeImage& that_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
398
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
399 protected:
759
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
400 virtual uint64_t GetRevisionInternal(VolumeProjection projection,
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
401 unsigned int sliceIndex) const
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
402 {
759
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
403 if (projection == VolumeProjection_Axial)
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
404 {
759
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
405 return that_.GetSliceRevision(sliceIndex);
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
406 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
407 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
408 {
759
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
409 // For coronal and sagittal projections, we take the global
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
410 // revision of the volume
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
411 return that_.GetRevision();
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
412 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
413 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
414
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
415 virtual const DicomInstanceParameters& GetDicomParameters(VolumeProjection projection,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
416 unsigned int sliceIndex) const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
417 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
418 return that_.GetSliceParameters(projection == VolumeProjection_Axial ? sliceIndex : 0);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
419 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
420
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
421 public:
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
422 ExtractedOrthogonalSlice(const DicomSeriesVolumeImage& that,
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
423 const CoordinateSystem3D& plane) :
759
774681b2c77c simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 757
diff changeset
424 DicomVolumeImageOrthogonalSlice(that.GetImage(), that.GetGeometry(), plane),
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
425 that_(that)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
426 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
427 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
428 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
429
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
430
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
431 private:
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 745
diff changeset
432 std::auto_ptr<ImageBuffer3D> image_;
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 745
diff changeset
433 std::auto_ptr<VolumeImageGeometry> geometry_;
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 745
diff changeset
434 std::vector<DicomInstanceParameters*> slices_;
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 745
diff changeset
435 uint64_t revision_;
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 745
diff changeset
436 std::vector<uint64_t> slicesRevision_;
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 745
diff changeset
437 std::vector<unsigned int> slicesQuality_;
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
438
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
439 void CheckSlice(size_t index,
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
440 const DicomInstanceParameters& reference) const
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
441 {
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
442 const DicomInstanceParameters& slice = *slices_[index];
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
443
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
444 if (!GeometryToolbox::IsParallel(
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
445 reference.GetGeometry().GetNormal(),
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
446 slice.GetGeometry().GetNormal()))
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
447 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
448 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry,
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
449 "A slice in the volume image is not parallel to the others");
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
450 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
451
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
452 if (reference.GetExpectedPixelFormat() != slice.GetExpectedPixelFormat())
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
453 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
454 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat,
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
455 "The pixel format changes across the slices of the volume image");
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
456 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
457
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
458 if (reference.GetImageInformation().GetWidth() != slice.GetImageInformation().GetWidth() ||
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
459 reference.GetImageInformation().GetHeight() != slice.GetImageInformation().GetHeight())
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
460 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
461 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize,
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
462 "The width/height of slices are not constant in the volume image");
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
463 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
464
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
465 if (!LinearAlgebra::IsNear(reference.GetPixelSpacingX(), slice.GetPixelSpacingX()) ||
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
466 !LinearAlgebra::IsNear(reference.GetPixelSpacingY(), slice.GetPixelSpacingY()))
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
467 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
468 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry,
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
469 "The pixel spacing of the slices change across the volume image");
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
470 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
471 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
472
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
473
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
474 void CheckVolume() const
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
475 {
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
476 for (size_t i = 0; i < slices_.size(); i++)
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
477 {
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
478 assert(slices_[i] != NULL);
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
479 if (slices_[i]->GetImageInformation().GetNumberOfFrames() != 1)
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
480 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
481 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
482 "This class does not support multi-frame images");
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
483 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
484 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
485
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
486 if (slices_.size() != 0)
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
487 {
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
488 const DicomInstanceParameters& reference = *slices_[0];
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
489
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
490 for (size_t i = 1; i < slices_.size(); i++)
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
491 {
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
492 CheckSlice(i, reference);
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
493 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
494 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
495 }
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
496
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
497
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
498 void Clear()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
499 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
500 image_.reset();
735
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
501 geometry_.reset();
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
502
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
503 for (size_t i = 0; i < slices_.size(); i++)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
504 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
505 assert(slices_[i] != NULL);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
506 delete slices_[i];
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
507 }
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
508
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
509 slices_.clear();
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
510 slicesRevision_.clear();
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
511 slicesQuality_.clear();
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
512 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
513
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
514
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
515 void CheckSliceIndex(size_t index) const
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
516 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
517 assert(slices_.size() == image_->GetDepth() &&
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
518 slices_.size() == slicesRevision_.size());
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
519
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
520 if (!HasGeometry())
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
521 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
522 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
523 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
524 else if (index >= slices_.size())
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
525 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
526 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
527 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
528 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
529
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
530
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
531 public:
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
532 DicomSeriesVolumeImage() :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
533 revision_(0)
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
534 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
535 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
536
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
537 ~DicomSeriesVolumeImage()
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
538 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
539 Clear();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
540 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
541
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
542 // WARNING: The payload of "slices" must be of class "DicomInstanceParameters"
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
543 void SetGeometry(SlicesSorter& slices)
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
544 {
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
545 Clear();
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
546
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
547 if (!slices.Sort())
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
548 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
549 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange,
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
550 "Cannot sort the 3D slices of a DICOM series");
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
551 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
552
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
553 geometry_.reset(new VolumeImageGeometry);
735
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
554
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
555 if (slices.GetSlicesCount() == 0)
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
556 {
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
557 // Empty volume
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
558 image_.reset(new ImageBuffer3D(Orthanc::PixelFormat_Grayscale8, 0, 0, 0,
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
559 false /* don't compute range */));
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
560 }
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
561 else
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
562 {
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
563 slices_.reserve(slices.GetSlicesCount());
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
564 slicesRevision_.resize(slices.GetSlicesCount(), 0);
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
565 slicesQuality_.resize(slices.GetSlicesCount(), 0);
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
566
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
567 for (size_t i = 0; i < slices.GetSlicesCount(); i++)
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
568 {
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
569 const DicomInstanceParameters& slice =
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
570 dynamic_cast<const DicomInstanceParameters&>(slices.GetSlicePayload(i));
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
571 slices_.push_back(new DicomInstanceParameters(slice));
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
572 }
669
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 667
diff changeset
573
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
574 CheckVolume();
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
575
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
576 const double spacingZ = slices.ComputeSpacingBetweenSlices();
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
577 LOG(INFO) << "Computed spacing between slices: " << spacingZ << "mm";
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
578
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
579 const DicomInstanceParameters& parameters = *slices_[0];
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
580
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
581 image_.reset(new ImageBuffer3D(parameters.GetExpectedPixelFormat(),
761
07adcffba38c truncation warning fixes + CRLF -> LF + random measuring tool creation (keyb
Benjamin Golinvaux <bgo@osimis.io>
parents: 760
diff changeset
582 parameters.GetImageInformation().GetWidth(),
07adcffba38c truncation warning fixes + CRLF -> LF + random measuring tool creation (keyb
Benjamin Golinvaux <bgo@osimis.io>
parents: 760
diff changeset
583 parameters.GetImageInformation().GetHeight(),
07adcffba38c truncation warning fixes + CRLF -> LF + random measuring tool creation (keyb
Benjamin Golinvaux <bgo@osimis.io>
parents: 760
diff changeset
584 static_cast<unsigned int>(slices.GetSlicesCount()),
07adcffba38c truncation warning fixes + CRLF -> LF + random measuring tool creation (keyb
Benjamin Golinvaux <bgo@osimis.io>
parents: 760
diff changeset
585 false /* don't compute range */));
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
586
735
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
587 geometry_->SetSize(image_->GetWidth(), image_->GetHeight(), image_->GetDepth());
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
588 geometry_->SetAxialGeometry(slices.GetSliceGeometry(0));
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
589 geometry_->SetVoxelDimensions(parameters.GetPixelSpacingX(),
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
590 parameters.GetPixelSpacingY(), spacingZ);
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
591 }
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
592
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
593 image_->Clear();
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
594
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
595 revision_++;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
596 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
597
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
598 uint64_t GetRevision() const
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
599 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
600 return revision_;
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
601 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
602
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
603 bool HasGeometry() const
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
604 {
735
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
605 return (image_.get() != NULL &&
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
606 geometry_.get() != NULL);
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
607 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
608
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
609 const ImageBuffer3D& GetImage() const
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
610 {
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
611 if (!HasGeometry())
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
612 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
613 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
614 }
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
615 else
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
616 {
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
617 return *image_;
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
618 }
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
619 }
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
620
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
621 const VolumeImageGeometry& GetGeometry() const
735
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
622 {
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
623 if (!HasGeometry())
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
624 {
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
625 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
626 }
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
627 else
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
628 {
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
629 return *geometry_;
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
630 }
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
631 }
c3bbb130abc4 removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 713
diff changeset
632
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
633 size_t GetSlicesCount() const
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
634 {
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
635 if (!HasGeometry())
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
636 {
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
637 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
638 }
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
639 else
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
640 {
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
641 return slices_.size();
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
642 }
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
643 }
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
644
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
645 const DicomInstanceParameters& GetSliceParameters(size_t index) const
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
646 {
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
647 CheckSliceIndex(index);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
648 return *slices_[index];
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
649 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
650
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
651 uint64_t GetSliceRevision(size_t index) const
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
652 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
653 CheckSliceIndex(index);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
654 return slicesRevision_[index];
678
6f10f9a6676a turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 669
diff changeset
655 }
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
656
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
657 void SetSliceContent(size_t index,
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
658 const Orthanc::ImageAccessor& image,
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
659 unsigned int quality)
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
660 {
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
661 CheckSliceIndex(index);
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
662
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
663 // If a better image quality is already available, don't update the content
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
664 if (quality >= slicesQuality_[index])
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
665 {
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
666 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
667 ImageBuffer3D::SliceWriter writer
761
07adcffba38c truncation warning fixes + CRLF -> LF + random measuring tool creation (keyb
Benjamin Golinvaux <bgo@osimis.io>
parents: 760
diff changeset
668 (*image_, VolumeProjection_Axial, static_cast<unsigned int>(index));
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
669 Orthanc::ImageProcessing::Copy(writer.GetAccessor(), image);
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
670 }
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
671
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
672 revision_ ++;
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
673 slicesRevision_[index] += 1;
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
674 }
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
675 }
667
e9339f2b5de7 refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 661
diff changeset
676 };
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
677
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
678
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
679
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
680 class OrthancSeriesVolumeProgressiveLoader :
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
681 public IObserver,
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
682 public IObservable,
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
683 public IVolumeSlicer
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
684 {
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
685 private:
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
686 static const unsigned int LOW_QUALITY = 0;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
687 static const unsigned int MIDDLE_QUALITY = 1;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
688 static const unsigned int BEST_QUALITY = 2;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
689
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
690
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
691 static unsigned int GetSliceIndexPayload(const OracleCommandWithPayload& command)
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
692 {
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
693 return dynamic_cast< const Orthanc::SingleValueObject<unsigned int>& >(command.GetPayload()).GetValue();
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
694 }
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
695
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
696
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
697 void ScheduleNextSliceDownload()
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
698 {
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
699 assert(strategy_.get() != NULL);
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
700
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
701 unsigned int sliceIndex, quality;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
702
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
703 if (strategy_->GetNext(sliceIndex, quality))
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
704 {
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
705 assert(quality <= BEST_QUALITY);
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
706
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
707 const DicomInstanceParameters& slice = volume_.GetSliceParameters(sliceIndex);
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
708
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
709 const std::string& instance = slice.GetOrthancInstanceIdentifier();
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
710 if (instance.empty())
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
711 {
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
712 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
713 }
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
714
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
715 std::auto_ptr<OracleCommandWithPayload> command;
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
716
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
717 if (quality == BEST_QUALITY)
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
718 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
719 std::auto_ptr<GetOrthancImageCommand> tmp(new GetOrthancImageCommand);
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
720 tmp->SetHttpHeader("Accept-Encoding", "gzip");
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
721 tmp->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam)));
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
722 tmp->SetInstanceUri(instance, slice.GetExpectedPixelFormat());
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
723 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat());
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
724 command.reset(tmp.release());
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
725 }
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
726 else
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
727 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
728 std::auto_ptr<GetOrthancWebViewerJpegCommand> tmp(new GetOrthancWebViewerJpegCommand);
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
729 tmp->SetHttpHeader("Accept-Encoding", "gzip");
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
730 tmp->SetInstance(instance);
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
731 tmp->SetQuality((quality == 0 ? 50 : 90));
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
732 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat());
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
733 command.reset(tmp.release());
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
734 }
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
735
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
736 command->SetPayload(new Orthanc::SingleValueObject<unsigned int>(sliceIndex));
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
737 oracle_.Schedule(*this, command.release());
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
738 }
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
739 }
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
740
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
741
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
742 void LoadGeometry(const OrthancRestApiCommand::SuccessMessage& message)
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
743 {
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
744 Json::Value body;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
745 message.ParseJsonBody(body);
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
746
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
747 if (body.type() != Json::objectValue)
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
748 {
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
749 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol);
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
750 }
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
751
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
752 {
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
753 Json::Value::Members instances = body.getMemberNames();
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
754
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
755 SlicesSorter slices;
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
756
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
757 for (size_t i = 0; i < instances.size(); i++)
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
758 {
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
759 Orthanc::DicomMap dicom;
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
760 dicom.FromDicomAsJson(body[instances[i]]);
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
761
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
762 std::auto_ptr<DicomInstanceParameters> instance(new DicomInstanceParameters(dicom));
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
763 instance->SetOrthancInstanceIdentifier(instances[i]);
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
764
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
765 CoordinateSystem3D geometry = instance->GetGeometry();
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
766 slices.AddSlice(geometry, instance.release());
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
767 }
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
768
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
769 volume_.SetGeometry(slices);
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
770 }
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
771
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
772 if (volume_.GetSlicesCount() != 0)
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
773 {
761
07adcffba38c truncation warning fixes + CRLF -> LF + random measuring tool creation (keyb
Benjamin Golinvaux <bgo@osimis.io>
parents: 760
diff changeset
774 strategy_.reset(new BasicFetchingStrategy(sorter_->CreateSorter(
07adcffba38c truncation warning fixes + CRLF -> LF + random measuring tool creation (keyb
Benjamin Golinvaux <bgo@osimis.io>
parents: 760
diff changeset
775 static_cast<unsigned int>(volume_.GetSlicesCount())), BEST_QUALITY));
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
776
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
777 assert(simultaneousDownloads_ != 0);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
778 for (unsigned int i = 0; i < simultaneousDownloads_; i++)
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
779 {
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
780 ScheduleNextSliceDownload();
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
781 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
782 }
779
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
783
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
784 BroadcastMessage(VolumeGeometryReadyMessage(*this, volume_.GetGeometry()));
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
785 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
786
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
787
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
788 void LoadBestQualitySliceContent(const GetOrthancImageCommand::SuccessMessage& message)
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
789 {
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
790 volume_.SetSliceContent(GetSliceIndexPayload(message.GetOrigin()),
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
791 message.GetImage(), BEST_QUALITY);
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
792
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
793 ScheduleNextSliceDownload();
709
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
794 }
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
795
7457b4ee1f29 VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 692
diff changeset
796
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
797 void LoadJpegSliceContent(const GetOrthancWebViewerJpegCommand::SuccessMessage& message)
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
798 {
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
799 unsigned int quality;
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
800
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
801 switch (message.GetOrigin().GetQuality())
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
802 {
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
803 case 50:
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
804 quality = LOW_QUALITY;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
805 break;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
806
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
807 case 90:
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
808 quality = MIDDLE_QUALITY;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
809 break;
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
810
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
811 default:
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
812 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
813 }
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
814
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
815 volume_.SetSliceContent(GetSliceIndexPayload(message.GetOrigin()), message.GetImage(), quality);
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
816
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
817 ScheduleNextSliceDownload();
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
818 }
711
70d1c28560b3 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 710
diff changeset
819
710
3046a603eebf reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 709
diff changeset
820
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
821 IOracle& oracle_;
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
822 bool active_;
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
823 DicomSeriesVolumeImage volume_;
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
824 unsigned int simultaneousDownloads_;
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
825
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
826 std::auto_ptr<IFetchingItemsSorter::IFactory> sorter_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
827 std::auto_ptr<IFetchingStrategy> strategy_;
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
828
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
829
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
830 public:
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
831 OrthancSeriesVolumeProgressiveLoader(IOracle& oracle,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
832 IObservable& oracleObservable) :
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
833 IObserver(oracleObservable.GetBroker()),
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
834 IObservable(oracleObservable.GetBroker()),
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
835 oracle_(oracle),
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
836 active_(false),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
837 simultaneousDownloads_(4),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
838 sorter_(new BasicFetchingItemsSorter::Factory)
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
839 {
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
840 oracleObservable.RegisterObserverCallback(
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
841 new Callable<OrthancSeriesVolumeProgressiveLoader, OrthancRestApiCommand::SuccessMessage>
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
842 (*this, &OrthancSeriesVolumeProgressiveLoader::LoadGeometry));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
843
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
844 oracleObservable.RegisterObserverCallback(
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
845 new Callable<OrthancSeriesVolumeProgressiveLoader, GetOrthancImageCommand::SuccessMessage>
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
846 (*this, &OrthancSeriesVolumeProgressiveLoader::LoadBestQualitySliceContent));
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
847
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
848 oracleObservable.RegisterObserverCallback(
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
849 new Callable<OrthancSeriesVolumeProgressiveLoader, GetOrthancWebViewerJpegCommand::SuccessMessage>
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
850 (*this, &OrthancSeriesVolumeProgressiveLoader::LoadJpegSliceContent));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
851 }
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
852
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
853 void SetSimultaneousDownloads(unsigned int count)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
854 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
855 if (active_)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
856 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
857 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
858 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
859 else if (count == 0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
860 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
861 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
862 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
863 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
864 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
865 simultaneousDownloads_ = count;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
866 }
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
867 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
868
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
869 void LoadSeries(const std::string& seriesId)
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
870 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
871 if (active_)
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
872 {
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
873 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
874 }
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
875 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
876 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
877 active_ = true;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
878
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
879 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
880 command->SetUri("/series/" + seriesId + "/instances-tags");
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
881
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
882 oracle_.Schedule(*this, command.release());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
883 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
884 }
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
885
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
886
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
887 const DicomSeriesVolumeImage& GetVolume() const
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
888 {
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
889 return volume_;
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
890 }
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
891
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
892
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
893 virtual ExtractedSlice* ExtractSlice(const CoordinateSystem3D& cuttingPlane) const
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
894 {
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
895 if (volume_.HasGeometry() &&
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
896 volume_.GetSlicesCount() != 0)
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
897 {
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
898 std::auto_ptr<DicomVolumeImageOrthogonalSlice> slice
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
899 (new DicomSeriesVolumeImage::ExtractedOrthogonalSlice(volume_, cuttingPlane));
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
900
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
901 assert(slice.get() != NULL &&
779
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
902 strategy_.get() != NULL);
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
903
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
904 if (slice->IsValid() &&
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
905 slice->GetProjection() == VolumeProjection_Axial)
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
906 {
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
907 strategy_->SetCurrent(slice->GetSliceIndex());
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
908 }
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
909
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
910 return slice.release();
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
911 }
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
912 else
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
913 {
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
914 return new InvalidExtractedSlice;
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
915 }
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
916 }
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
917 };
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
918
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
919
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
920
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
921 class OrthancMultiframeVolumeLoader :
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
922 public IObserver,
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
923 public IObservable,
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
924 public IVolumeSlicer
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
925 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
926 private:
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
927 class State : public Orthanc::IDynamicObject
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
928 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
929 private:
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
930 OrthancMultiframeVolumeLoader& that_;
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
931
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
932 protected:
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
933 void Schedule(OrthancRestApiCommand* command) const
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
934 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
935 that_.oracle_.Schedule(that_, command);
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
936 }
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
937
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
938 OrthancMultiframeVolumeLoader& GetTarget() const
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
939 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
940 return that_;
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
941 }
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
942
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
943 public:
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
944 State(OrthancMultiframeVolumeLoader& that) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
945 that_(that)
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
946 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
947 }
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
948
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
949 virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message) const = 0;
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
950 };
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
951
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
952 void Handle(const OrthancRestApiCommand::SuccessMessage& message)
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
953 {
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
954 dynamic_cast<const State&>(message.GetOrigin().GetPayload()).Handle(message);
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
955 }
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
956
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
957
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
958 class LoadRTDoseGeometry : public State
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
959 {
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
960 private:
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
961 std::auto_ptr<Orthanc::DicomMap> dicom_;
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
962
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
963 public:
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
964 LoadRTDoseGeometry(OrthancMultiframeVolumeLoader& that,
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
965 Orthanc::DicomMap* dicom) :
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
966 State(that),
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
967 dicom_(dicom)
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
968 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
969 if (dicom == NULL)
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
970 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
971 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
972 }
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
973 }
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
974
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
975 virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message) const
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
976 {
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
977 // Complete the DICOM tags with just-received "Grid Frame Offset Vector"
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
978 std::string s = Orthanc::Toolbox::StripSpaces(message.GetAnswer());
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
979 dicom_->SetValue(Orthanc::DICOM_TAG_GRID_FRAME_OFFSET_VECTOR, s, false);
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
980
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
981 GetTarget().SetGeometry(*dicom_);
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
982 }
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
983 };
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
984
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
985
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
986 static std::string GetSopClassUid(const Orthanc::DicomMap& dicom)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
987 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
988 std::string s;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
989 if (!dicom.CopyToString(s, Orthanc::DICOM_TAG_SOP_CLASS_UID, false))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
990 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
991 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
992 "DICOM file without SOP class UID");
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
993 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
994 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
995 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
996 return s;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
997 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
998 }
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
999
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1000
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1001 class LoadGeometry : public State
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1002 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1003 public:
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1004 LoadGeometry(OrthancMultiframeVolumeLoader& that) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1005 State(that)
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1006 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1007 }
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1008
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1009 virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message) const
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1010 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1011 Json::Value body;
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1012 message.ParseJsonBody(body);
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1013
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1014 if (body.type() != Json::objectValue)
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1015 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1016 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol);
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1017 }
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1018
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1019 std::auto_ptr<Orthanc::DicomMap> dicom(new Orthanc::DicomMap);
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1020 dicom->FromDicomAsJson(body);
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1021
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1022 if (StringToSopClassUid(GetSopClassUid(*dicom)) == SopClassUid_RTDose)
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1023 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1024 // Download the "Grid Frame Offset Vector" DICOM tag, that is
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1025 // mandatory for RT-DOSE, but is too long to be returned by default
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1026
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1027 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1028 command->SetUri("/instances/" + GetTarget().GetInstanceId() + "/content/" +
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1029 Orthanc::DICOM_TAG_GRID_FRAME_OFFSET_VECTOR.Format());
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1030 command->SetPayload(new LoadRTDoseGeometry(GetTarget(), dicom.release()));
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1031
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1032 Schedule(command.release());
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1033 }
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1034 else
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1035 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1036 GetTarget().SetGeometry(*dicom);
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1037 }
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1038 }
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1039 };
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1040
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1041
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1042
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1043 class LoadTransferSyntax : public State
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1044 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1045 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1046 LoadTransferSyntax(OrthancMultiframeVolumeLoader& that) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1047 State(that)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1048 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1049 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1050
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1051 virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message) const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1052 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1053 GetTarget().SetTransferSyntax(message.GetAnswer());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1054 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1055 };
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1056
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1057
765
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1058 class LoadUncompressedPixelData : public State
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1059 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1060 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1061 LoadUncompressedPixelData(OrthancMultiframeVolumeLoader& that) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1062 State(that)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1063 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1064 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1065
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1066 virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message) const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1067 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1068 GetTarget().SetUncompressedPixelData(message.GetAnswer());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1069 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1070 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1071
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1072
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1073
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1074 IOracle& oracle_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1075 bool active_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1076 std::string instanceId_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1077 std::string transferSyntaxUid_;
765
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1078 uint64_t revision_;
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1079
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1080 std::auto_ptr<DicomInstanceParameters> dicom_;
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1081 std::auto_ptr<VolumeImageGeometry> geometry_;
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1082 std::auto_ptr<ImageBuffer3D> image_;
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1083
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1084
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1085 const std::string& GetInstanceId() const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1086 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1087 if (active_)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1088 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1089 return instanceId_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1090 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1091 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1092 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1093 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1094 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1095 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1096
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1097
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1098 void ScheduleFrameDownloads()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1099 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1100 if (transferSyntaxUid_.empty() ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1101 !HasGeometry())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1102 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1103 return;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1104 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1105
765
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1106 if (transferSyntaxUid_ == "1.2.840.10008.1.2" ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1107 transferSyntaxUid_ == "1.2.840.10008.1.2.1" ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1108 transferSyntaxUid_ == "1.2.840.10008.1.2.2")
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1109 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1110 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1111 command->SetHttpHeader("Accept-Encoding", "gzip");
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1112 command->SetUri("/instances/" + instanceId_ + "/content/" +
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1113 Orthanc::DICOM_TAG_PIXEL_DATA.Format() + "/0");
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1114 command->SetPayload(new LoadUncompressedPixelData(*this));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1115 oracle_.Schedule(*this, command.release());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1116 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1117 else
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1118 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1119 throw Orthanc::OrthancException(
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1120 Orthanc::ErrorCode_NotImplemented,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1121 "No support for multiframe instances with transfer syntax: " + transferSyntaxUid_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1122 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1123 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1124
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1125
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1126 void SetTransferSyntax(const std::string& transferSyntax)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1127 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1128 transferSyntaxUid_ = Orthanc::Toolbox::StripSpaces(transferSyntax);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1129 ScheduleFrameDownloads();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1130 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1131
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1132
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1133 void SetGeometry(const Orthanc::DicomMap& dicom)
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1134 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1135 dicom_.reset(new DicomInstanceParameters(dicom));
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1136
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1137 Orthanc::PixelFormat format;
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1138 if (!dicom_->GetImageInformation().ExtractPixelFormat(format, true))
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1139 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1140 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1141 }
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1142
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1143 double spacingZ;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1144 switch (dicom_->GetSopClassUid())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1145 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1146 case SopClassUid_RTDose:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1147 spacingZ = dicom_->GetThickness();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1148 break;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1149
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1150 default:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1151 throw Orthanc::OrthancException(
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1152 Orthanc::ErrorCode_NotImplemented,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1153 "No support for multiframe instances with SOP class UID: " + GetSopClassUid(dicom));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1154 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1155
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1156 const unsigned int width = dicom_->GetImageInformation().GetWidth();
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1157 const unsigned int height = dicom_->GetImageInformation().GetHeight();
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1158 const unsigned int depth = dicom_->GetImageInformation().GetNumberOfFrames();
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1159
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1160 geometry_.reset(new VolumeImageGeometry);
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1161 geometry_->SetSize(width, height, depth);
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1162 geometry_->SetAxialGeometry(dicom_->GetGeometry());
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1163 geometry_->SetVoxelDimensions(dicom_->GetPixelSpacingX(),
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1164 dicom_->GetPixelSpacingY(),
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1165 spacingZ);
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1166
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1167 image_.reset(new ImageBuffer3D(format, width, height, depth,
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1168 false /* don't compute range */));
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1169 image_->Clear();
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1170
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1171 ScheduleFrameDownloads();
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1172
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1173 BroadcastMessage(VolumeGeometryReadyMessage(*this, *geometry_));
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1174 }
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1175
765
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1176
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1177 ORTHANC_FORCE_INLINE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1178 static void CopyPixel(uint32_t& target,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1179 const void* source)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1180 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1181 // TODO - check alignement?
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1182 target = le32toh(*reinterpret_cast<const uint32_t*>(source));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1183 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1184
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1185
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1186 template <typename T>
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1187 void CopyPixelData(const std::string& pixelData)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1188 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1189 const Orthanc::PixelFormat format = image_->GetFormat();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1190 const unsigned int bpp = image_->GetBytesPerPixel();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1191 const unsigned int width = image_->GetWidth();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1192 const unsigned int height = image_->GetHeight();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1193 const unsigned int depth = image_->GetDepth();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1194
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1195 if (pixelData.size() != bpp * width * height * depth)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1196 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1197 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1198 "The pixel data has not the proper size");
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1199 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1200
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1201 if (pixelData.empty())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1202 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1203 return;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1204 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1205
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1206 const uint8_t* source = reinterpret_cast<const uint8_t*>(pixelData.c_str());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1207
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1208 for (unsigned int z = 0; z < depth; z++)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1209 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1210 ImageBuffer3D::SliceWriter writer(*image_, VolumeProjection_Axial, z);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1211
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1212 assert (writer.GetAccessor().GetWidth() == width &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1213 writer.GetAccessor().GetHeight() == height);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1214
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1215 for (unsigned int y = 0; y < height; y++)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1216 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1217 assert(sizeof(T) == Orthanc::GetBytesPerPixel(format));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1218
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1219 T* target = reinterpret_cast<T*>(writer.GetAccessor().GetRow(y));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1220
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1221 for (unsigned int x = 0; x < width; x++)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1222 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1223 CopyPixel(*target, source);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1224
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1225 target ++;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1226 source += bpp;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1227 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1228 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1229 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1230 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1231
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1232
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1233 void SetUncompressedPixelData(const std::string& pixelData)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1234 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1235 switch (image_->GetFormat())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1236 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1237 case Orthanc::PixelFormat_Grayscale32:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1238 CopyPixelData<uint32_t>(pixelData);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1239 break;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1240
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1241 default:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1242 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1243 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1244
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1245 revision_ ++;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1246 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1247
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1248
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1249 private:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1250 class ExtractedOrthogonalSlice : public DicomVolumeImageOrthogonalSlice
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1251 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1252 private:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1253 const OrthancMultiframeVolumeLoader& that_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1254
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1255 protected:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1256 virtual uint64_t GetRevisionInternal(VolumeProjection projection,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1257 unsigned int sliceIndex) const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1258 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1259 return that_.revision_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1260 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1261
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1262 virtual const DicomInstanceParameters& GetDicomParameters(VolumeProjection projection,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1263 unsigned int sliceIndex) const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1264 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1265 return that_.GetDicomParameters();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1266 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1267
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1268 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1269 ExtractedOrthogonalSlice(const OrthancMultiframeVolumeLoader& that,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1270 const CoordinateSystem3D& plane) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1271 DicomVolumeImageOrthogonalSlice(that.GetImage(), that.GetGeometry(), plane),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1272 that_(that)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1273 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1274 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1275 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1276
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1277
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1278 public:
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1279 OrthancMultiframeVolumeLoader(IOracle& oracle,
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1280 IObservable& oracleObservable) :
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1281 IObserver(oracleObservable.GetBroker()),
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1282 IObservable(oracleObservable.GetBroker()),
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1283 oracle_(oracle),
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1284 active_(false),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1285 revision_(0)
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1286 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1287 oracleObservable.RegisterObserverCallback(
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1288 new Callable<OrthancMultiframeVolumeLoader, OrthancRestApiCommand::SuccessMessage>
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1289 (*this, &OrthancMultiframeVolumeLoader::Handle));
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1290 }
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1291
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1292
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1293 bool HasGeometry() const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1294 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1295 return (dicom_.get() != NULL &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1296 geometry_.get() != NULL &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1297 image_.get() != NULL);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1298 }
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1299
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1300
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1301 const ImageBuffer3D& GetImage() const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1302 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1303 if (!HasGeometry())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1304 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1305 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1306 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1307 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1308 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1309 return *image_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1310 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1311 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1312
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1313
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1314 const VolumeImageGeometry& GetGeometry() const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1315 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1316 if (!HasGeometry())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1317 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1318 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1319 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1320 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1321 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1322 return *geometry_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1323 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1324 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1325
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1326
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1327 const DicomInstanceParameters& GetDicomParameters() const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1328 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1329 if (!HasGeometry())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1330 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1331 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1332 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1333 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1334 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1335 return *dicom_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1336 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1337 }
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1338
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1339
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1340 void LoadInstance(const std::string& instanceId)
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1341 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1342 if (active_)
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1343 {
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1344 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1345 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1346 else
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1347 {
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1348 active_ = true;
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1349 instanceId_ = instanceId;
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1350
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1351 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1352 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
765
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1353 command->SetHttpHeader("Accept-Encoding", "gzip");
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1354 command->SetUri("/instances/" + instanceId + "/tags");
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1355 command->SetPayload(new LoadGeometry(*this));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1356 oracle_.Schedule(*this, command.release());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1357 }
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1358
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1359 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1360 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1361 command->SetUri("/instances/" + instanceId + "/metadata/TransferSyntax");
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1362 command->SetPayload(new LoadTransferSyntax(*this));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1363 oracle_.Schedule(*this, command.release());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1364 }
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1365 }
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1366 }
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1367
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1368
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1369 virtual ExtractedSlice* ExtractSlice(const CoordinateSystem3D& cuttingPlane) const
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1370 {
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1371 if (HasGeometry())
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1372 {
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1373 return new ExtractedOrthogonalSlice(*this, cuttingPlane);
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1374 }
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1375 else
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1376 {
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1377 return new InvalidExtractedSlice;
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1378 }
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1379 }
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1380 };
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1381
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1382
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1383
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1384 class VolumeSceneLayerSource : public boost::noncopyable
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1385 {
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1386 private:
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1387 Scene2D& scene_;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1388 int layerDepth_;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1389 boost::shared_ptr<IVolumeSlicer> slicer_;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1390 std::auto_ptr<ILayerStyleConfigurator> configurator_;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1391 std::auto_ptr<CoordinateSystem3D> lastPlane_;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1392 uint64_t lastRevision_;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1393 uint64_t lastConfiguratorRevision_;
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1394
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1395 static bool IsSameCuttingPlane(const CoordinateSystem3D& a,
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1396 const CoordinateSystem3D& b)
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1397 {
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1398 // TODO - What if the normal is reversed?
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1399 double distance;
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1400 return (CoordinateSystem3D::ComputeDistance(distance, a, b) &&
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1401 LinearAlgebra::IsCloseToZero(distance));
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1402 }
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1403
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1404 public:
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1405 VolumeSceneLayerSource(Scene2D& scene,
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1406 int layerDepth,
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1407 const boost::shared_ptr<IVolumeSlicer>& slicer) :
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1408 scene_(scene),
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1409 layerDepth_(layerDepth),
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1410 slicer_(slicer)
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1411 {
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1412 if (slicer == NULL)
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1413 {
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1414 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1415 }
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1416 }
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1417
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1418 const IVolumeSlicer& GetSlicer() const
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1419 {
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1420 return *slicer_;
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1421 }
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1422
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1423 void RemoveConfigurator()
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1424 {
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1425 configurator_.reset();
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1426 lastPlane_.reset();
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1427 }
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1428
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1429 void SetConfigurator(ILayerStyleConfigurator* configurator) // Takes ownership
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1430 {
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1431 if (configurator == NULL)
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1432 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1433 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1434 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1435
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1436 configurator_.reset(configurator);
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1437
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1438 // Invalidate the layer
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1439 lastPlane_.reset(NULL);
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1440 }
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1441
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1442 bool HasConfigurator() const
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1443 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1444 return configurator_.get() != NULL;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1445 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1446
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1447 ILayerStyleConfigurator& GetConfigurator() const
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1448 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1449 if (configurator_.get() == NULL)
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1450 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1451 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1452 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1453
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1454 return *configurator_;
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1455 }
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1456
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1457 void Update(const CoordinateSystem3D& plane)
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1458 {
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1459 assert(slicer_.get() != NULL);
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1460 std::auto_ptr<IVolumeSlicer::ExtractedSlice> slice(slicer_->ExtractSlice(plane));
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1461
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1462 if (slice.get() == NULL)
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1463 {
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1464 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1465 }
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1466
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1467 if (!slice->IsValid())
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1468 {
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1469 // The slicer cannot handle this cutting plane: Clear the layer
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1470 scene_.DeleteLayer(layerDepth_);
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1471 lastPlane_.reset(NULL);
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1472 }
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1473 else if (lastPlane_.get() != NULL &&
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1474 IsSameCuttingPlane(*lastPlane_, plane) &&
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1475 lastRevision_ == slice->GetRevision())
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1476 {
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1477 // The content of the slice has not changed: Don't update the
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1478 // layer content, but possibly update its style
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1479
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1480 if (configurator_.get() != NULL &&
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1481 configurator_->GetRevision() != lastConfiguratorRevision_ &&
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1482 scene_.HasLayer(layerDepth_))
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1483 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1484 configurator_->ApplyStyle(scene_.GetLayer(layerDepth_));
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1485 }
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1486 }
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1487 else
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1488 {
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1489 // Content has changed: An update is needed
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1490 lastPlane_.reset(new CoordinateSystem3D(plane));
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1491 lastRevision_ = slice->GetRevision();
692
10910827f235 simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 691
diff changeset
1492
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1493 std::auto_ptr<ISceneLayer> layer(slice->CreateSceneLayer(configurator_.get(), plane));
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1494 if (layer.get() == NULL)
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1495 {
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1496 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
712
f334b098b243 IDicomVolumeSource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 711
diff changeset
1497 }
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1498
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1499 if (configurator_.get() != NULL)
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1500 {
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1501 lastConfiguratorRevision_ = configurator_->GetRevision();
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1502 configurator_->ApplyStyle(*layer);
713
e63c8b9b7b02 setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 712
diff changeset
1503 }
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1504
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1505 scene_.SetLayer(layerDepth_, layer.release());
691
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1506 }
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1507 }
032a94cca5c4 DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 684
diff changeset
1508 };
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1509
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1510
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1511
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1512
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1513
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1514 class NativeApplicationContext : public IMessageEmitter
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1515 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1516 private:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1517 boost::shared_mutex mutex_;
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1518 MessageBroker broker_;
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1519 IObservable oracleObservable_;
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1520
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1521 public:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1522 NativeApplicationContext() :
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1523 oracleObservable_(broker_)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1524 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1525 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1526
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1527
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1528 virtual void EmitMessage(const IObserver& observer,
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1529 const IMessage& message)
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1530 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1531 try
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1532 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1533 boost::unique_lock<boost::shared_mutex> lock(mutex_);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1534 oracleObservable_.EmitMessage(observer, message);
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1535 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1536 catch (Orthanc::OrthancException& e)
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1537 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1538 LOG(ERROR) << "Exception while emitting a message: " << e.What();
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1539 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1540 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1541
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1542
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1543 class ReaderLock : public boost::noncopyable
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1544 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1545 private:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1546 NativeApplicationContext& that_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1547 boost::shared_lock<boost::shared_mutex> lock_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1548
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1549 public:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1550 ReaderLock(NativeApplicationContext& that) :
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1551 that_(that),
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1552 lock_(that.mutex_)
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1553 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1554 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1555 };
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1556
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1557
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1558 class WriterLock : public boost::noncopyable
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1559 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1560 private:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1561 NativeApplicationContext& that_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1562 boost::unique_lock<boost::shared_mutex> lock_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1563
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1564 public:
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1565 WriterLock(NativeApplicationContext& that) :
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1566 that_(that),
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1567 lock_(that.mutex_)
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1568 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1569 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1570
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1571 MessageBroker& GetBroker()
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1572 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1573 return that_.broker_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1574 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1575
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1576 IObservable& GetOracleObservable()
681
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1577 {
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1578 return that_.oracleObservable_;
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1579 }
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1580 };
9723fceccb9f revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 680
diff changeset
1581 };
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1582 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1583
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 class Toto : public OrthancStone::IObserver
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 private:
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1589 OrthancStone::CoordinateSystem3D plane_;
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1590 OrthancStone::IOracle& oracle_;
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1591 OrthancStone::Scene2D scene_;
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1592 std::auto_ptr<OrthancStone::VolumeSceneLayerSource> source1_, source2_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1593
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1594
779
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1595 void Refresh()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1596 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1597 if (source1_.get() != NULL)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1598 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1599 source1_->Update(plane_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1600 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1601
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1602 if (source2_.get() != NULL)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1603 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1604 source2_->Update(plane_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1605 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1606
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1607 scene_.FitContent(1024, 768);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1608
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1609 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1610 OrthancStone::CairoCompositor compositor(scene_, 1024, 768);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1611 compositor.Refresh();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1612
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1613 Orthanc::ImageAccessor accessor;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1614 compositor.GetCanvas().GetReadOnlyAccessor(accessor);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1615
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1616 Orthanc::Image tmp(Orthanc::PixelFormat_RGB24, accessor.GetWidth(), accessor.GetHeight(), false);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1617 Orthanc::ImageProcessing::Convert(tmp, accessor);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1618
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1619 static unsigned int count = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1620 char buf[64];
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1621 sprintf(buf, "scene-%06d.png", count++);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1622
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1623 Orthanc::PngWriter writer;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1624 writer.WriteToFile(buf, tmp);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1625 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1626 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1627
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1628
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1629 void Handle(const OrthancStone::VolumeGeometryReadyMessage& message)
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1630 {
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1631 printf("Geometry ready\n");
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1632
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1633 if (&source1_->GetSlicer() == &message.GetOrigin())
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1634 {
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1635 //plane_ = message.GetGeometry().GetSagittalGeometry();
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1636 //plane_ = message.GetGeometry().GetAxialGeometry();
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1637 plane_ = message.GetGeometry().GetCoronalGeometry();
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1638 plane_.SetOrigin(message.GetGeometry().GetCoordinates(0.5f, 0.5f, 0.5f));
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1639 }
779
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1640
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1641 Refresh();
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1642 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1643
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1644
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1645 void Handle(const OrthancStone::SleepOracleCommand::TimeoutMessage& message)
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1646 {
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1647 if (message.GetOrigin().HasPayload())
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1648 {
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1649 printf("TIMEOUT! %d\n", dynamic_cast<const Orthanc::SingleValueObject<unsigned int>& >(message.GetOrigin().GetPayload()).GetValue());
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1650 }
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1651 else
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1652 {
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1653 printf("TIMEOUT\n");
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1654
779
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 778
diff changeset
1655 Refresh();
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1656
765
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1657 /**
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1658 * The sleep() leads to a crash if the oracle is still running,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1659 * while this object is destroyed. Always stop the oracle before
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1660 * destroying active objects. (*)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1661 **/
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1662 // boost::this_thread::sleep(boost::posix_time::seconds(2));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1663
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1664 oracle_.Schedule(*this, new OrthancStone::SleepOracleCommand(message.GetOrigin().GetDelay()));
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1665 }
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1666 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1667
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1668 void Handle(const OrthancStone::OrthancRestApiCommand::SuccessMessage& message)
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1669 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1670 Json::Value v;
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1671 message.ParseJsonBody(v);
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 printf("ICI [%s]\n", v.toStyledString().c_str());
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1674 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1675
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1676 void Handle(const OrthancStone::GetOrthancImageCommand::SuccessMessage& message)
637
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
1677 {
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
1678 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
1679 }
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
1680
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1681 void Handle(const OrthancStone::GetOrthancWebViewerJpegCommand::SuccessMessage& message)
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1682 {
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1683 printf("WebViewer %dx%d\n", message.GetImage().GetWidth(), message.GetImage().GetHeight());
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1684 }
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1685
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1686 void Handle(const OrthancStone::OracleCommandExceptionMessage& message)
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1687 {
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1688 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
1689
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1690 switch (message.GetCommand().GetType())
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1691 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1692 case OrthancStone::IOracleCommand::Type_GetOrthancWebViewerJpeg:
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1693 printf("URI: [%s]\n", dynamic_cast<const OrthancStone::GetOrthancWebViewerJpegCommand&>
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1694 (message.GetCommand()).GetUri().c_str());
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1695 break;
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1696
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1697 default:
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1698 break;
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1699 }
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1700 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1701
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1702 public:
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1703 Toto(OrthancStone::IOracle& oracle,
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1704 OrthancStone::IObservable& oracleObservable) :
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1705 IObserver(oracleObservable.GetBroker()),
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1706 oracle_(oracle)
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1707 {
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1708 oracleObservable.RegisterObserverCallback
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1709 (new OrthancStone::Callable
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1710 <Toto, OrthancStone::SleepOracleCommand::TimeoutMessage>(*this, &Toto::Handle));
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1711
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1712 oracleObservable.RegisterObserverCallback
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1713 (new OrthancStone::Callable
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1714 <Toto, OrthancStone::OrthancRestApiCommand::SuccessMessage>(*this, &Toto::Handle));
637
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
1715
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1716 oracleObservable.RegisterObserverCallback
637
afc91cdc5128 decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 636
diff changeset
1717 (new OrthancStone::Callable
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1718 <Toto, OrthancStone::GetOrthancImageCommand::SuccessMessage>(*this, &Toto::Handle));
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1719
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1720 oracleObservable.RegisterObserverCallback
639
d1f4521b9bbb OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 638
diff changeset
1721 (new OrthancStone::Callable
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1722 <Toto, OrthancStone::GetOrthancWebViewerJpegCommand::SuccessMessage>(*this, &Toto::Handle));
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1723
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1724 oracleObservable.RegisterObserverCallback
642
7ca8dc7ec17b GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 641
diff changeset
1725 (new OrthancStone::Callable
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1726 <Toto, OrthancStone::OracleCommandExceptionMessage>(*this, &Toto::Handle));
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1727 }
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1728
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1729 void SetVolume1(int depth,
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1730 const boost::shared_ptr<OrthancStone::IVolumeSlicer>& volume,
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1731 OrthancStone::ILayerStyleConfigurator* style)
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1732 {
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1733 dynamic_cast<OrthancStone::IObservable&>(*volume).RegisterObserverCallback
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1734 (new OrthancStone::Callable
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1735 <Toto, OrthancStone::VolumeGeometryReadyMessage>(*this, &Toto::Handle));
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1736
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1737 source1_.reset(new OrthancStone::VolumeSceneLayerSource(scene_, depth, volume));
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1738
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1739 if (style != NULL)
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1740 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1741 source1_->SetConfigurator(style);
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1742 }
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1743 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1744
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1745 void SetVolume2(int depth,
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1746 const boost::shared_ptr<OrthancStone::IVolumeSlicer>& volume,
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1747 OrthancStone::ILayerStyleConfigurator* style)
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1748 {
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1749 dynamic_cast<OrthancStone::IObservable&>(*volume).RegisterObserverCallback
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1750 (new OrthancStone::Callable
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1751 <Toto, OrthancStone::VolumeGeometryReadyMessage>(*this, &Toto::Handle));
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1752
776
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1753 source2_.reset(new OrthancStone::VolumeSceneLayerSource(scene_, depth, volume));
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1754
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1755 if (style != NULL)
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1756 {
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1757 source2_->SetConfigurator(style);
0387485f048b ILayerStyleConfigurator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 769
diff changeset
1758 }
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1759 }
619
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
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1762
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1763 void Run(OrthancStone::NativeApplicationContext& context,
765
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1764 OrthancStone::ThreadedOracle& oracle)
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1765 {
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1766 boost::shared_ptr<Toto> toto;
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1767 boost::shared_ptr<OrthancStone::OrthancSeriesVolumeProgressiveLoader> loader1, loader2;
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1768 boost::shared_ptr<OrthancStone::OrthancMultiframeVolumeLoader> loader3;
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1769
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1770 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1771 OrthancStone::NativeApplicationContext::WriterLock lock(context);
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1772 toto.reset(new Toto(oracle, lock.GetOracleObservable()));
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
1773 loader1.reset(new OrthancStone::OrthancSeriesVolumeProgressiveLoader(oracle, lock.GetOracleObservable()));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 748
diff changeset
1774 loader2.reset(new OrthancStone::OrthancSeriesVolumeProgressiveLoader(oracle, lock.GetOracleObservable()));
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1775 loader3.reset(new OrthancStone::OrthancMultiframeVolumeLoader(oracle, lock.GetOracleObservable()));
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1776 }
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1777
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1778 toto->SetVolume1(0, loader1, new OrthancStone::GrayscaleStyleConfigurator);
780
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 779
diff changeset
1779
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 779
diff changeset
1780 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 779
diff changeset
1781 std::auto_ptr<OrthancStone::LookupTableStyleConfigurator> config(new OrthancStone::LookupTableStyleConfigurator);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 779
diff changeset
1782 config->SetLookupTable(Orthanc::EmbeddedResources::COLORMAP_HOT);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 779
diff changeset
1783 toto->SetVolume2(1, loader3, config.release());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 779
diff changeset
1784 }
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1785
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1786 oracle.Schedule(*toto, new OrthancStone::SleepOracleCommand(100));
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1787
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1788 if (0)
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1789 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1790 Json::Value v = Json::objectValue;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1791 v["Level"] = "Series";
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1792 v["Query"] = Json::objectValue;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1793
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1794 std::auto_ptr<OrthancStone::OrthancRestApiCommand> command(new OrthancStone::OrthancRestApiCommand);
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1795 command->SetMethod(Orthanc::HttpMethod_Post);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1796 command->SetUri("/tools/find");
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1797 command->SetBody(v);
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1798
623
42dadae61fa9 renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 622
diff changeset
1799 oracle.Schedule(*toto, command.release());
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1800 }
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1801
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1802 if (0)
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1803 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1804 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1805 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Jpeg)));
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1806 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/preview");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1807 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1808 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1809
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1810 if (0)
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1811 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1812 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1813 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Png)));
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1814 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/preview");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1815 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1816 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1817
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1818 if (0)
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1819 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1820 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1821 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Png)));
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1822 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1823 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1824 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1825
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1826 if (0)
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1827 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1828 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1829 command->SetHttpHeader("Accept-Encoding", "gzip");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1830 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam)));
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1831 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1832 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1833 }
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1834
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1835 if (0)
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1836 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1837 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand);
636
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1838 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam)));
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1839 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16");
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1840 oracle.Schedule(*toto, command.release());
fb00a8be03e2 starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 631
diff changeset
1841 }
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1842
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1843 if (0)
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1844 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1845 std::auto_ptr<OrthancStone::GetOrthancWebViewerJpegCommand> command(new OrthancStone::GetOrthancWebViewerJpegCommand);
638
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1846 command->SetHttpHeader("Accept-Encoding", "gzip");
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1847 command->SetInstance("e6c7c20b-c9f65d7e-0d76f2e2-830186f2-3e3c600e");
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1848 command->SetQuality(90);
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1849 oracle.Schedule(*toto, command.release());
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1850 }
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1851
e626f38c5512 DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 637
diff changeset
1852
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1853 if (0)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1854 {
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1855 for (unsigned int i = 0; i < 10; i++)
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1856 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1857 std::auto_ptr<OrthancStone::SleepOracleCommand> command(new OrthancStone::SleepOracleCommand(i * 1000));
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1858 command->SetPayload(new Orthanc::SingleValueObject<unsigned int>(42 * i));
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1859 oracle.Schedule(*toto, command.release());
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1860 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1861 }
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1862
625
2eeb5857eb43 DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 623
diff changeset
1863 // 2017-11-17-Anonymized
766
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 765
diff changeset
1864 loader1->LoadSeries("cb3ea4d1-d08f3856-ad7b6314-74d88d77-60b05618"); // CT
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1865 loader3->LoadInstance("41029085-71718346-811efac4-420e2c15-d39f99b6"); // RT-DOSE
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1866
764
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1867 // 2015-01-28-Multiframe
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1868 //loader3->LoadInstance("88f71e2a-5fad1c61-96ed14d6-5b3d3cf7-a5825279"); // Multiframe CT
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 763
diff changeset
1869
661
970949ff868a fix warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 648
diff changeset
1870 // Delphine
744
a4bfb420b869 SleepOracleCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 742
diff changeset
1871 //loader1->LoadSeries("5990e39c-51e5f201-fe87a54c-31a55943-e59ef80e"); // CT
762
26f4345e771e creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 760
diff changeset
1872 //loader1->LoadSeries("67f1b334-02c16752-45026e40-a5b60b6b-030ecab5"); // Lung 1/10mm
661
970949ff868a fix warning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 648
diff changeset
1873
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1874
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1875 {
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1876 LOG(WARNING) << "...Waiting for Ctrl-C...";
760
1181e1ad98ec progressive loading working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 759
diff changeset
1877
765
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1878 oracle.Start();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1879
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1880 Orthanc::SystemToolbox::ServerBarrier();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1881
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1882 /**
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1883 * WARNING => The oracle must be stopped BEFORE the objects using
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1884 * it are destroyed!!! This forces to wait for the completion of
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1885 * the running callback methods. Otherwise, the callbacks methods
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1886 * might still be running while their parent object is destroyed,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1887 * resulting in crashes. This is very visible if adding a sleep(),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1888 * as in (*).
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1889 **/
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1890
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1891 oracle.Stop();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1892 }
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1893 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1894
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1895
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1896
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1897 /**
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1898 * IMPORTANT: The full arguments to "main()" are needed for SDL on
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1899 * Windows. Otherwise, one gets the linking error "undefined reference
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1900 * to `SDL_main'". https://wiki.libsdl.org/FAQWindows
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1901 **/
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1902 int main(int argc, char* argv[])
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1903 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1904 OrthancStone::StoneInitialize();
778
78fcb907caf6 VolumeGeometryReadyMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 776
diff changeset
1905 //Orthanc::Logging::EnableInfoLevel(true);
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1906
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1907 try
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1908 {
745
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1909 OrthancStone::NativeApplicationContext context;
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1910
c44c1d2d3598 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 744
diff changeset
1911 OrthancStone::ThreadedOracle oracle(context);
767
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 766
diff changeset
1912 //oracle.SetThreadsCount(1);
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1913
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1914 {
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1915 Orthanc::WebServiceParameters p;
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1916 //p.SetUrl("http://localhost:8043/");
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1917 p.SetCredentials("orthanc", "orthanc");
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1918 oracle.SetOrthancParameters(p);
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1919 }
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1920
765
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1921 //oracle.Start();
680
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1922
0eb26f514ac5 loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 678
diff changeset
1923 Run(context, oracle);
765
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1924
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 764
diff changeset
1925 //oracle.Stop();
619
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1926 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1927 catch (Orthanc::OrthancException& e)
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1928 {
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1929 LOG(ERROR) << "EXCEPTION: " << e.What();
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1930 }
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1931
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1932 OrthancStone::StoneFinalize();
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1933
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1934 return 0;
9cd19b28f011 test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1935 }