Mercurial > hg > orthanc-stone

annotate Samples/Sdl/Loader.cpp @ 778:78fcb907caf6

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