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