Mercurial > hg > orthanc-stone

annotate Samples/Sdl/Loader.cpp @ 782:b24c208fa953

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