Mercurial > hg > orthanc-stone
annotate Samples/Sdl/Loader.cpp @ 759:774681b2c77c
simplification
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 22 May 2019 17:25:44 +0200 |
| parents | f7c236894c1a |
| children | 1181e1ad98ec |
| 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" | |
| 33 #include "../../Framework/Scene2D/Scene2D.h" | |
|
625
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
34 #include "../../Framework/StoneInitialization.h" |
|
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
35 #include "../../Framework/Toolbox/GeometryToolbox.h" |
|
683
dbc1d8bfc68a
reorganizing ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
681
diff
changeset
|
36 #include "../../Framework/Toolbox/SlicesSorter.h" |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
622
diff
changeset
|
37 #include "../../Framework/Volumes/ImageBuffer3D.h" |
|
742
fa5febe0f0c2
moved OrientedBoundingBox in the Volumes folder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
735
diff
changeset
|
38 #include "../../Framework/Volumes/VolumeImageGeometry.h" |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
39 |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
40 // From Orthanc framework |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
41 #include <Core/Images/ImageProcessing.h> |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
42 #include <Core/Logging.h> |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
43 #include <Core/OrthancException.h> |
|
683
dbc1d8bfc68a
reorganizing ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
681
diff
changeset
|
44 #include <Core/SystemToolbox.h> |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
45 |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
46 |
| 745 | 47 namespace OrthancStone |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
48 { |
| 757 | 49 static bool IsSameCuttingPlane(const CoordinateSystem3D& a, |
| 50 const CoordinateSystem3D& b) | |
| 51 { | |
| 52 double distance; | |
| 53 return (CoordinateSystem3D::ComputeDistance(distance, a, b) && | |
| 54 LinearAlgebra::IsCloseToZero(distance)); | |
| 55 } | |
| 56 | |
| 57 | |
| 58 class IVolumeSlicer : public boost::noncopyable | |
| 59 { | |
| 60 public: | |
| 61 class ExtractedSlice : public boost::noncopyable | |
| 62 { | |
| 63 public: | |
| 64 virtual ~ExtractedSlice() | |
| 65 { | |
| 66 } | |
| 67 | |
| 68 virtual bool IsValid() = 0; | |
| 69 | |
| 70 // Must be a cheap call | |
| 71 virtual uint64_t GetRevision() = 0; | |
| 72 | |
| 73 // This call can take some time | |
| 74 virtual ISceneLayer* CreateSceneLayer() = 0; | |
| 75 }; | |
| 76 | |
| 77 virtual ~IVolumeSlicer() | |
| 78 { | |
| 79 } | |
| 80 | |
| 81 virtual ExtractedSlice* ExtractSlice(const CoordinateSystem3D& cuttingPlane) const = 0; | |
| 82 }; | |
| 83 | |
| 84 | |
| 759 | 85 class InvalidExtractedSlice : public IVolumeSlicer::ExtractedSlice |
| 86 { | |
| 87 public: | |
| 88 virtual bool IsValid() | |
| 89 { | |
| 90 return false; | |
| 91 } | |
| 92 | |
| 93 virtual uint64_t GetRevision() | |
| 94 { | |
| 95 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 96 } | |
| 97 | |
| 98 virtual ISceneLayer* CreateSceneLayer() | |
| 99 { | |
| 100 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 101 } | |
| 102 }; | |
| 103 | |
| 757 | 104 |
| 105 class DicomVolumeImageOrthogonalSlice : public IVolumeSlicer::ExtractedSlice | |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
106 { |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
107 private: |
| 759 | 108 const ImageBuffer3D& image_; |
| 109 const VolumeImageGeometry& geometry_; | |
| 110 bool valid_; | |
| 111 VolumeProjection projection_; | |
| 112 unsigned int sliceIndex_; | |
| 757 | 113 |
| 114 protected: | |
| 759 | 115 virtual uint64_t GetRevisionInternal(VolumeProjection projection, |
| 116 unsigned int sliceIndex) const = 0; | |
| 757 | 117 |
| 118 virtual const DicomInstanceParameters& GetDicomParameters(VolumeProjection projection, | |
| 119 unsigned int sliceIndex) const = 0; | |
| 120 | |
| 121 public: | |
| 759 | 122 DicomVolumeImageOrthogonalSlice(const ImageBuffer3D& image, |
| 123 const VolumeImageGeometry& geometry, | |
| 124 const CoordinateSystem3D& cuttingPlane) : | |
| 125 image_(image), | |
| 126 geometry_(geometry) | |
| 757 | 127 { |
| 759 | 128 valid_ = geometry_.DetectSlice(projection_, sliceIndex_, cuttingPlane); |
| 757 | 129 } |
| 130 | |
| 131 virtual bool IsValid() | |
| 132 { | |
| 133 return valid_; | |
| 134 } | |
| 135 | |
| 136 virtual uint64_t GetRevision() | |
| 137 { | |
| 138 if (!valid_) | |
| 139 { | |
| 140 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 141 } | |
| 142 else | |
| 143 { | |
| 759 | 144 return GetRevisionInternal(projection_, sliceIndex_); |
| 757 | 145 } |
| 146 } | |
| 147 | |
| 148 virtual ISceneLayer* CreateSceneLayer() | |
| 149 { | |
| 150 if (!valid_) | |
| 151 { | |
| 152 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 153 } | |
| 154 else | |
| 155 { | |
| 156 std::auto_ptr<TextureBaseSceneLayer> texture; | |
| 157 | |
| 158 { | |
| 759 | 159 const DicomInstanceParameters& parameters = GetDicomParameters(projection_, sliceIndex_); |
| 160 ImageBuffer3D::SliceReader reader(image_, projection_, sliceIndex_); | |
| 161 texture.reset(parameters.CreateTexture(reader.GetAccessor())); | |
| 757 | 162 } |
| 163 | |
| 759 | 164 const CoordinateSystem3D& system = geometry_.GetProjectionGeometry(projection_); |
| 757 | 165 |
| 166 double x0, y0, x1, y1; | |
| 167 system.ProjectPoint(x0, y0, system.GetOrigin()); | |
| 168 system.ProjectPoint(x1, y1, system.GetOrigin() + system.GetAxisX()); | |
| 169 texture->SetOrigin(x0, y0); | |
| 170 | |
| 171 double dx = x1 - x0; | |
| 172 double dy = y1 - y0; | |
| 173 if (!LinearAlgebra::IsCloseToZero(dx) || | |
| 174 !LinearAlgebra::IsCloseToZero(dy)) | |
| 175 { | |
| 176 texture->SetAngle(atan2(dy, dx)); | |
| 177 } | |
| 178 | |
| 179 Vector tmp; | |
| 759 | 180 geometry_.GetVoxelDimensions(projection_); |
| 757 | 181 texture->SetPixelSpacing(tmp[0], tmp[1]); |
| 182 | |
| 183 // texture->SetLinearInterpolation(linearInterpolation_); // TODO | |
| 184 | |
| 185 return texture.release(); | |
| 186 } | |
| 187 } | |
| 188 }; | |
| 189 | |
| 190 | |
| 191 // This class combines a 3D image buffer, a 3D volume geometry and | |
| 192 // information about the DICOM parameters of each slice. | |
| 193 class DicomSeriesVolumeImage : public IVolumeSlicer | |
| 194 { | |
| 195 private: | |
| 196 class Slice : public DicomVolumeImageOrthogonalSlice | |
| 197 { | |
| 198 private: | |
| 199 const DicomSeriesVolumeImage& that_; | |
| 200 | |
| 201 protected: | |
| 759 | 202 virtual uint64_t GetRevisionInternal(VolumeProjection projection, |
| 203 unsigned int sliceIndex) const | |
| 757 | 204 { |
| 759 | 205 if (projection == VolumeProjection_Axial) |
| 757 | 206 { |
| 759 | 207 return that_.GetSliceRevision(sliceIndex); |
| 757 | 208 } |
| 209 else | |
| 210 { | |
| 759 | 211 // For coronal and sagittal projections, we take the global |
| 212 // revision of the volume | |
| 213 return that_.GetRevision(); | |
| 757 | 214 } |
| 215 } | |
| 216 | |
| 217 virtual const DicomInstanceParameters& GetDicomParameters(VolumeProjection projection, | |
| 218 unsigned int sliceIndex) const | |
| 219 { | |
| 220 return that_.GetSliceParameters(projection == VolumeProjection_Axial ? sliceIndex : 0); | |
| 221 } | |
| 222 | |
| 223 public: | |
| 224 Slice(const DicomSeriesVolumeImage& that, | |
| 225 const CoordinateSystem3D& plane) : | |
| 759 | 226 DicomVolumeImageOrthogonalSlice(that.GetImage(), that.GetGeometry(), plane), |
| 757 | 227 that_(that) |
| 228 { | |
| 229 } | |
| 230 }; | |
| 231 | |
| 232 | |
| 746 | 233 std::auto_ptr<ImageBuffer3D> image_; |
| 234 std::auto_ptr<VolumeImageGeometry> geometry_; | |
| 235 std::vector<DicomInstanceParameters*> slices_; | |
| 236 uint64_t revision_; | |
| 237 std::vector<uint64_t> slicesRevision_; | |
| 238 std::vector<unsigned int> slicesQuality_; | |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
239 |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
240 void CheckSlice(size_t index, |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
241 const DicomInstanceParameters& reference) const |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
242 { |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
243 const DicomInstanceParameters& slice = *slices_[index]; |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
244 |
| 745 | 245 if (!GeometryToolbox::IsParallel( |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
246 reference.GetGeometry().GetNormal(), |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
247 slice.GetGeometry().GetNormal())) |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
248 { |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
249 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry, |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
250 "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
|
251 } |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
252 |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
253 if (reference.GetExpectedPixelFormat() != slice.GetExpectedPixelFormat()) |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
254 { |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
255 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat, |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
256 "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
|
257 } |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
258 |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
259 if (reference.GetImageInformation().GetWidth() != slice.GetImageInformation().GetWidth() || |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
260 reference.GetImageInformation().GetHeight() != slice.GetImageInformation().GetHeight()) |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
261 { |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
262 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageSize, |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
263 "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
|
264 } |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
265 |
| 745 | 266 if (!LinearAlgebra::IsNear(reference.GetPixelSpacingX(), slice.GetPixelSpacingX()) || |
| 267 !LinearAlgebra::IsNear(reference.GetPixelSpacingY(), slice.GetPixelSpacingY())) | |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
268 { |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
269 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry, |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
270 "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
|
271 } |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
272 } |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
273 |
|
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 CheckVolume() const |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
276 { |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
277 for (size_t i = 0; i < slices_.size(); i++) |
| 669 | 278 { |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
279 assert(slices_[i] != NULL); |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
280 if (slices_[i]->GetImageInformation().GetNumberOfFrames() != 1) |
| 669 | 281 { |
| 282 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadGeometry, | |
| 283 "This class does not support multi-frame images"); | |
| 284 } | |
| 285 } | |
| 286 | |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
287 if (slices_.size() != 0) |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
288 { |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
289 const DicomInstanceParameters& reference = *slices_[0]; |
| 669 | 290 |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
291 for (size_t i = 1; i < slices_.size(); i++) |
| 669 | 292 { |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
293 CheckSlice(i, reference); |
| 669 | 294 } |
| 295 } | |
| 296 } | |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
297 |
| 669 | 298 |
| 299 void Clear() | |
| 300 { | |
| 301 image_.reset(); | |
|
735
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
302 geometry_.reset(); |
| 669 | 303 |
| 304 for (size_t i = 0; i < slices_.size(); i++) | |
| 305 { | |
| 306 assert(slices_[i] != NULL); | |
| 307 delete slices_[i]; | |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
308 } |
|
709
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
309 |
|
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
310 slices_.clear(); |
|
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
311 slicesRevision_.clear(); |
|
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
312 slicesQuality_.clear(); |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
313 } |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
314 |
|
681
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
315 |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
316 void CheckSliceIndex(size_t index) const |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
317 { |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
318 assert(slices_.size() == image_->GetDepth() && |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
319 slices_.size() == slicesRevision_.size()); |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
320 |
| 691 | 321 if (!HasGeometry()) |
|
681
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
322 { |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
323 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
324 } |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
325 else if (index >= slices_.size()) |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
326 { |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
327 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
328 } |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
329 } |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
330 |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
331 |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
332 public: |
| 757 | 333 DicomSeriesVolumeImage() |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
334 { |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
335 } |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
336 |
| 757 | 337 ~DicomSeriesVolumeImage() |
| 669 | 338 { |
| 339 Clear(); | |
| 340 } | |
| 341 | |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
342 // WARNING: The payload of "slices" must be of class "DicomInstanceParameters" |
| 745 | 343 void SetGeometry(SlicesSorter& slices) |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
344 { |
| 669 | 345 Clear(); |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
346 |
| 669 | 347 if (!slices.Sort()) |
|
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 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange, |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
350 "Cannot sort the 3D slices of a DICOM series"); |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
351 } |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
352 |
| 745 | 353 geometry_.reset(new VolumeImageGeometry); |
|
735
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
354 |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
355 if (slices.GetSlicesCount() == 0) |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
356 { |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
357 // Empty volume |
| 745 | 358 image_.reset(new ImageBuffer3D(Orthanc::PixelFormat_Grayscale8, 0, 0, 0, |
| 359 false /* don't compute range */)); | |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
360 } |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
361 else |
| 669 | 362 { |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
363 slices_.reserve(slices.GetSlicesCount()); |
|
709
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
364 slicesRevision_.resize(slices.GetSlicesCount(), 0); |
|
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
365 slicesQuality_.resize(slices.GetSlicesCount(), 0); |
| 669 | 366 |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
367 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
|
368 { |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
369 const DicomInstanceParameters& slice = |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
370 dynamic_cast<const DicomInstanceParameters&>(slices.GetSlicePayload(i)); |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
371 slices_.push_back(new DicomInstanceParameters(slice)); |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
372 } |
| 669 | 373 |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
374 CheckVolume(); |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
375 |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
376 const double spacingZ = slices.ComputeSpacingBetweenSlices(); |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
377 LOG(INFO) << "Computed spacing between slices: " << spacingZ << "mm"; |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
378 |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
379 const DicomInstanceParameters& parameters = *slices_[0]; |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
380 |
| 745 | 381 image_.reset(new ImageBuffer3D(parameters.GetExpectedPixelFormat(), |
| 382 parameters.GetImageInformation().GetWidth(), | |
| 383 parameters.GetImageInformation().GetHeight(), | |
| 384 slices.GetSlicesCount(), false /* don't compute range */)); | |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
385 |
|
735
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
386 geometry_->SetSize(image_->GetWidth(), image_->GetHeight(), image_->GetDepth()); |
|
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
387 geometry_->SetAxialGeometry(slices.GetSliceGeometry(0)); |
|
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
388 geometry_->SetVoxelDimensions(parameters.GetPixelSpacingX(), |
|
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
389 parameters.GetPixelSpacingY(), spacingZ); |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
390 } |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
391 |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
392 image_->Clear(); |
|
681
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
393 |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
394 revision_++; |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
395 } |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
396 |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
397 uint64_t GetRevision() const |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
398 { |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
399 return revision_; |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
400 } |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
401 |
| 691 | 402 bool HasGeometry() const |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
403 { |
|
735
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
404 return (image_.get() != NULL && |
|
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
405 geometry_.get() != NULL); |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
406 } |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
407 |
| 745 | 408 const ImageBuffer3D& GetImage() const |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
409 { |
| 691 | 410 if (!HasGeometry()) |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
411 { |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
412 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
413 } |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
414 else |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
415 { |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
416 return *image_; |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
417 } |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
418 } |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
419 |
| 745 | 420 const VolumeImageGeometry& GetGeometry() const |
|
735
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
421 { |
|
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
422 if (!HasGeometry()) |
|
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
423 { |
|
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
424 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
|
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
425 } |
|
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
426 else |
|
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
427 { |
|
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
428 return *geometry_; |
|
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
429 } |
|
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
430 } |
|
c3bbb130abc4
removing dependencies in ImageBuffer3D
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
713
diff
changeset
|
431 |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
432 size_t GetSlicesCount() const |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
433 { |
| 691 | 434 if (!HasGeometry()) |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
435 { |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
436 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
437 } |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
438 else |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
439 { |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
440 return slices_.size(); |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
441 } |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
442 } |
|
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
443 |
|
681
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
444 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
|
445 { |
|
681
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
446 CheckSliceIndex(index); |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
447 return *slices_[index]; |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
448 } |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
449 |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
450 uint64_t GetSliceRevision(size_t index) const |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
451 { |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
452 CheckSliceIndex(index); |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
453 return slicesRevision_[index]; |
|
678
6f10f9a6676a
turning DicomVolumeImage into a bean class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
669
diff
changeset
|
454 } |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
455 |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
456 void SetSliceContent(size_t index, |
|
709
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
457 const Orthanc::ImageAccessor& image, |
|
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
458 unsigned int quality) |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
459 { |
|
681
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
460 CheckSliceIndex(index); |
|
709
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
461 |
|
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
462 // 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
|
463 if (quality >= slicesQuality_[index]) |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
464 { |
|
709
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
465 { |
| 745 | 466 ImageBuffer3D::SliceWriter writer |
| 467 (*image_, VolumeProjection_Axial, index); | |
|
709
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
468 Orthanc::ImageProcessing::Copy(writer.GetAccessor(), image); |
|
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
469 } |
|
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
470 |
|
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
471 revision_ ++; |
|
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
472 slicesRevision_[index] += 1; |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
473 } |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
474 } |
| 757 | 475 |
| 476 virtual IVolumeSlicer::ExtractedSlice* ExtractSlice(const CoordinateSystem3D& cuttingPlane) const | |
| 477 { | |
| 759 | 478 if (HasGeometry()) |
| 479 { | |
| 480 return new Slice(*this, cuttingPlane); | |
| 481 } | |
| 482 else | |
| 483 { | |
| 484 return new InvalidExtractedSlice; | |
| 485 } | |
| 757 | 486 } |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
487 }; |
| 712 | 488 |
| 489 | |
| 490 | |
| 757 | 491 // This class combines a 3D DICOM volume together with its loader |
| 746 | 492 class IDicomVolumeImageSource : public boost::noncopyable |
| 712 | 493 { |
| 494 public: | |
| 746 | 495 virtual ~IDicomVolumeImageSource() |
| 712 | 496 { |
| 497 } | |
| 498 | |
| 757 | 499 virtual const DicomSeriesVolumeImage& GetVolume() const = 0; |
| 712 | 500 |
| 501 virtual void NotifyAxialSliceAccessed(unsigned int sliceIndex) = 0; | |
| 502 }; | |
|
667
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
503 |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
504 |
|
e9339f2b5de7
refactoring of VolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
661
diff
changeset
|
505 |
| 757 | 506 class OrthancSeriesVolumeProgressiveLoader : |
| 745 | 507 public IObserver, |
| 746 | 508 public IDicomVolumeImageSource |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
622
diff
changeset
|
509 { |
|
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
622
diff
changeset
|
510 private: |
| 711 | 511 static const unsigned int LOW_QUALITY = 0; |
| 512 static const unsigned int MIDDLE_QUALITY = 1; | |
| 513 static const unsigned int BEST_QUALITY = 2; | |
| 514 | |
| 515 | |
| 516 static unsigned int GetSliceIndexPayload(const OracleCommandWithPayload& command) | |
| 517 { | |
| 518 return dynamic_cast< const Orthanc::SingleValueObject<unsigned int>& >(command.GetPayload()).GetValue(); | |
| 519 } | |
| 520 | |
| 521 | |
| 522 void ScheduleNextSliceDownload() | |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
622
diff
changeset
|
523 { |
| 711 | 524 assert(strategy_.get() != NULL); |
| 525 | |
| 526 unsigned int sliceIndex, quality; | |
| 527 | |
| 528 if (strategy_->GetNext(sliceIndex, quality)) | |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
529 { |
| 711 | 530 assert(quality <= BEST_QUALITY); |
| 531 | |
| 532 const DicomInstanceParameters& slice = volume_.GetSliceParameters(sliceIndex); | |
| 533 | |
| 534 const std::string& instance = slice.GetOrthancInstanceIdentifier(); | |
| 535 if (instance.empty()) | |
| 536 { | |
| 537 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 538 } | |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
539 |
| 745 | 540 std::auto_ptr<OracleCommandWithPayload> command; |
| 711 | 541 |
| 542 if (quality == BEST_QUALITY) | |
| 543 { | |
| 745 | 544 std::auto_ptr<GetOrthancImageCommand> tmp(new GetOrthancImageCommand); |
| 711 | 545 tmp->SetHttpHeader("Accept-Encoding", "gzip"); |
| 546 tmp->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam))); | |
| 547 tmp->SetInstanceUri(instance, slice.GetExpectedPixelFormat()); | |
| 548 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat()); | |
| 549 command.reset(tmp.release()); | |
| 550 } | |
| 551 else | |
| 552 { | |
| 745 | 553 std::auto_ptr<GetOrthancWebViewerJpegCommand> tmp(new GetOrthancWebViewerJpegCommand); |
| 711 | 554 tmp->SetHttpHeader("Accept-Encoding", "gzip"); |
| 555 tmp->SetInstance(instance); | |
|
713
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
556 tmp->SetQuality((quality == 0 ? 50 : 90)); |
| 711 | 557 tmp->SetExpectedPixelFormat(slice.GetExpectedPixelFormat()); |
| 558 command.reset(tmp.release()); | |
| 559 } | |
| 560 | |
| 561 command->SetPayload(new Orthanc::SingleValueObject<unsigned int>(sliceIndex)); | |
| 562 oracle_.Schedule(*this, command.release()); | |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
563 } |
| 711 | 564 } |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
622
diff
changeset
|
565 |
| 711 | 566 |
| 567 void LoadGeometry(const OrthancRestApiCommand::SuccessMessage& message) | |
|
625
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
568 { |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
569 Json::Value body; |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
570 message.ParseJsonBody(body); |
| 711 | 571 |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
572 if (body.type() != Json::objectValue) |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
573 { |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
574 throw Orthanc::OrthancException(Orthanc::ErrorCode_NetworkProtocol); |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
575 } |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
576 |
| 710 | 577 { |
| 578 Json::Value::Members instances = body.getMemberNames(); | |
|
625
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
579 |
| 745 | 580 SlicesSorter slices; |
| 710 | 581 |
| 582 for (size_t i = 0; i < instances.size(); i++) | |
| 583 { | |
| 584 Orthanc::DicomMap dicom; | |
| 585 dicom.FromDicomAsJson(body[instances[i]]); | |
| 586 | |
| 587 std::auto_ptr<DicomInstanceParameters> instance(new DicomInstanceParameters(dicom)); | |
| 588 instance->SetOrthancInstanceIdentifier(instances[i]); | |
| 589 | |
| 745 | 590 CoordinateSystem3D geometry = instance->GetGeometry(); |
| 710 | 591 slices.AddSlice(geometry, instance.release()); |
| 592 } | |
| 593 | |
| 594 volume_.SetGeometry(slices); | |
|
625
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
595 } |
|
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
596 |
| 710 | 597 if (volume_.GetSlicesCount() != 0) |
|
625
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
598 { |
| 745 | 599 strategy_.reset(new BasicFetchingStrategy( |
| 757 | 600 sorter_->CreateSorter(volume_.GetSlicesCount()), BEST_QUALITY)); |
|
625
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
601 |
| 757 | 602 assert(simultaneousDownloads_ != 0); |
| 603 for (unsigned int i = 0; i < simultaneousDownloads_; i++) | |
| 710 | 604 { |
| 605 ScheduleNextSliceDownload(); | |
| 606 } | |
|
625
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
607 } |
| 710 | 608 } |
|
625
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
609 |
|
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
610 |
| 745 | 611 void LoadBestQualitySliceContent(const GetOrthancImageCommand::SuccessMessage& message) |
| 711 | 612 { |
| 613 volume_.SetSliceContent(GetSliceIndexPayload(message.GetOrigin()), | |
| 614 message.GetImage(), BEST_QUALITY); | |
|
709
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
615 |
| 711 | 616 ScheduleNextSliceDownload(); |
|
709
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
617 } |
|
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
618 |
|
7457b4ee1f29
VolumeSeriesOrthancLoader uses a prefetching strategy
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
692
diff
changeset
|
619 |
| 745 | 620 void LoadJpegSliceContent(const GetOrthancWebViewerJpegCommand::SuccessMessage& message) |
| 710 | 621 { |
| 711 | 622 unsigned int quality; |
| 710 | 623 |
| 711 | 624 switch (message.GetOrigin().GetQuality()) |
| 625 { | |
| 626 case 50: | |
| 627 quality = LOW_QUALITY; | |
| 628 break; | |
| 629 | |
| 630 case 90: | |
| 631 quality = MIDDLE_QUALITY; | |
| 632 break; | |
| 633 | |
| 634 default: | |
| 635 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 636 } | |
| 637 | |
| 638 volume_.SetSliceContent(GetSliceIndexPayload(message.GetOrigin()), message.GetImage(), quality); | |
| 639 | |
| 710 | 640 ScheduleNextSliceDownload(); |
| 641 } | |
| 711 | 642 |
| 710 | 643 |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
644 IOracle& oracle_; |
| 669 | 645 bool active_; |
| 757 | 646 DicomSeriesVolumeImage volume_; |
| 647 unsigned int simultaneousDownloads_; | |
| 648 | |
| 649 std::auto_ptr<IFetchingItemsSorter::IFactory> sorter_; | |
| 650 std::auto_ptr<IFetchingStrategy> strategy_; | |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
622
diff
changeset
|
651 |
|
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
622
diff
changeset
|
652 public: |
| 757 | 653 OrthancSeriesVolumeProgressiveLoader(IOracle& oracle, |
| 654 IObservable& oracleObservable) : | |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
655 IObserver(oracleObservable.GetBroker()), |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
656 oracle_(oracle), |
| 757 | 657 active_(false), |
| 658 simultaneousDownloads_(4), | |
| 659 sorter_(new BasicFetchingItemsSorter::Factory) | |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
622
diff
changeset
|
660 { |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
661 oracleObservable.RegisterObserverCallback( |
| 757 | 662 new Callable<OrthancSeriesVolumeProgressiveLoader, OrthancRestApiCommand::SuccessMessage> |
| 663 (*this, &OrthancSeriesVolumeProgressiveLoader::LoadGeometry)); | |
| 664 | |
| 665 oracleObservable.RegisterObserverCallback( | |
| 666 new Callable<OrthancSeriesVolumeProgressiveLoader, GetOrthancImageCommand::SuccessMessage> | |
| 667 (*this, &OrthancSeriesVolumeProgressiveLoader::LoadBestQualitySliceContent)); | |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
668 |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
669 oracleObservable.RegisterObserverCallback( |
| 757 | 670 new Callable<OrthancSeriesVolumeProgressiveLoader, GetOrthancWebViewerJpegCommand::SuccessMessage> |
| 671 (*this, &OrthancSeriesVolumeProgressiveLoader::LoadJpegSliceContent)); | |
| 672 } | |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
673 |
| 757 | 674 void SetSimultaneousDownloads(unsigned int count) |
| 675 { | |
| 676 if (active_) | |
| 677 { | |
| 678 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 679 } | |
| 680 else if (count == 0) | |
| 681 { | |
| 682 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
| 683 } | |
| 684 else | |
| 685 { | |
| 686 simultaneousDownloads_ = count; | |
| 687 } | |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
622
diff
changeset
|
688 } |
|
625
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
689 |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
690 void LoadSeries(const std::string& seriesId) |
|
625
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
691 { |
|
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
692 if (active_) |
|
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
693 { |
|
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
694 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
|
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
695 } |
| 757 | 696 else |
| 697 { | |
| 698 active_ = true; | |
|
625
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
699 |
| 757 | 700 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand); |
| 701 command->SetUri("/series/" + seriesId + "/instances-tags"); | |
|
625
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
702 |
| 757 | 703 oracle_.Schedule(*this, command.release()); |
| 704 } | |
|
625
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
705 } |
| 712 | 706 |
| 707 | |
| 757 | 708 virtual const DicomSeriesVolumeImage& GetVolume() const |
| 712 | 709 { |
| 710 return volume_; | |
| 711 } | |
| 712 | |
| 713 | |
| 714 virtual void NotifyAxialSliceAccessed(unsigned int sliceIndex) | |
| 715 { | |
| 716 if (strategy_.get() == NULL) | |
| 717 { | |
| 718 // Should have called GetVolume().HasGeometry() before | |
| 719 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 720 } | |
| 721 else | |
| 722 { | |
| 723 strategy_->SetCurrent(sliceIndex); | |
| 724 } | |
| 725 } | |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
622
diff
changeset
|
726 }; |
|
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
622
diff
changeset
|
727 |
|
681
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
728 |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
729 |
| 710 | 730 #if 0 |
| 731 void LoadInstance(const std::string& instanceId) | |
| 732 { | |
| 733 if (active_) | |
| 734 { | |
| 735 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); | |
| 736 } | |
| 737 | |
| 738 active_ = true; | |
| 739 | |
| 740 // Tag "3004-000c" is "Grid Frame Offset Vector", which is | |
| 741 // mandatory to read RT DOSE, but is too long to be returned by default | |
| 742 | |
| 743 // TODO => Should be part of a second call if needed | |
| 744 | |
| 745 | 745 std::auto_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand); |
| 710 | 746 command->SetUri("/instances/" + instanceId + "/tags?ignore-length=3004-000c"); |
| 747 command->SetPayload(new LoadInstanceGeometryHandler(*this)); | |
| 748 | |
| 749 oracle_.Schedule(*this, command.release()); | |
| 750 } | |
| 751 #endif | |
| 752 | |
|
681
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
753 |
| 757 | 754 /* class VolumeSlicerBase : public OLD_IVolumeSlicer |
| 711 | 755 { |
| 756 private: | |
| 745 | 757 Scene2D& scene_; |
| 711 | 758 int layerDepth_; |
| 759 bool first_; | |
| 745 | 760 CoordinateSystem3D lastPlane_; |
|
681
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
761 |
| 711 | 762 protected: |
| 757 | 763 bool HasCuttingPlaneChanged(const CoordinateSystem3D& plane) const |
| 711 | 764 { |
| 691 | 765 if (first_ || |
| 745 | 766 !LinearAlgebra::IsCloseToZero( |
| 711 | 767 boost::numeric::ublas::norm_2(lastPlane_.GetNormal() - plane.GetNormal()))) |
| 691 | 768 { |
| 711 | 769 // This is the first rendering, or the plane has not the same orientation |
| 770 return false; | |
| 691 | 771 } |
| 772 else | |
| 773 { | |
| 711 | 774 double offset1 = lastPlane_.ProjectAlongNormal(plane.GetOrigin()); |
| 775 double offset2 = lastPlane_.ProjectAlongNormal(lastPlane_.GetOrigin()); | |
| 745 | 776 return LinearAlgebra::IsCloseToZero(offset2 - offset1); |
| 691 | 777 } |
| 711 | 778 } |
| 691 | 779 |
| 757 | 780 void SetLastCuttingPlane(const CoordinateSystem3D& plane) |
| 711 | 781 { |
| 691 | 782 first_ = false; |
| 783 lastPlane_ = plane; | |
| 711 | 784 } |
| 691 | 785 |
| 745 | 786 void SetLayer(ISceneLayer* layer) |
| 711 | 787 { |
| 691 | 788 scene_.SetLayer(layerDepth_, layer); |
| 711 | 789 } |
| 691 | 790 |
| 711 | 791 void DeleteLayer() |
| 792 { | |
| 691 | 793 scene_.DeleteLayer(layerDepth_); |
| 711 | 794 } |
| 691 | 795 |
| 711 | 796 public: |
| 745 | 797 VolumeSlicerBase(Scene2D& scene, |
| 711 | 798 int layerDepth) : |
| 691 | 799 scene_(scene), |
| 800 layerDepth_(layerDepth), | |
| 801 first_(true) | |
| 711 | 802 { |
| 803 } | |
| 804 };*/ | |
| 691 | 805 |
| 806 | |
| 807 | |
| 757 | 808 class OLD_IVolumeSlicer : public boost::noncopyable |
| 745 | 809 { |
| 810 public: | |
| 757 | 811 virtual ~OLD_IVolumeSlicer() |
| 745 | 812 { |
| 813 } | |
| 814 | |
| 757 | 815 virtual void SetCuttingPlane(Scene2D& scene, |
| 816 const CoordinateSystem3D& plane) = 0; | |
| 745 | 817 }; |
| 818 | |
| 819 | |
| 757 | 820 class DicomVolumeMPRSlicer : public OLD_IVolumeSlicer |
| 691 | 821 { |
| 822 private: | |
| 746 | 823 bool linearInterpolation_; |
| 824 int layerDepth_; | |
| 825 IDicomVolumeImageSource& source_; | |
| 826 bool first_; | |
| 827 VolumeProjection lastProjection_; | |
| 828 unsigned int lastSliceIndex_; | |
| 829 uint64_t lastSliceRevision_; | |
| 691 | 830 |
| 831 public: | |
| 745 | 832 DicomVolumeMPRSlicer(Scene2D& scene, |
| 712 | 833 int layerDepth, |
| 746 | 834 IDicomVolumeImageSource& source) : |
|
713
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
835 linearInterpolation_(false), |
|
692
10910827f235
simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
691
diff
changeset
|
836 layerDepth_(layerDepth), |
| 712 | 837 source_(source), |
|
692
10910827f235
simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
691
diff
changeset
|
838 first_(true) |
| 691 | 839 { |
| 840 } | |
|
713
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
841 |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
842 void SetLinearInterpolation(bool enabled) |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
843 { |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
844 linearInterpolation_ = enabled; |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
845 } |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
846 |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
847 bool IsLinearInterpolation() const |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
848 { |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
849 return linearInterpolation_; |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
850 } |
| 691 | 851 |
| 757 | 852 virtual void SetCuttingPlane(Scene2D& scene, |
| 853 const CoordinateSystem3D& plane) | |
| 691 | 854 { |
| 712 | 855 if (!source_.GetVolume().HasGeometry() || |
| 856 source_.GetVolume().GetSlicesCount() == 0) | |
| 691 | 857 { |
| 757 | 858 scene.DeleteLayer(layerDepth_); |
| 691 | 859 return; |
| 860 } | |
| 861 | |
| 745 | 862 const VolumeImageGeometry& geometry = source_.GetVolume().GetGeometry(); |
| 863 | |
| 864 VolumeProjection projection; | |
| 691 | 865 unsigned int sliceIndex; |
|
713
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
866 if (!geometry.DetectSlice(projection, sliceIndex, plane)) |
| 691 | 867 { |
| 868 // The cutting plane is neither axial, nor coronal, nor | |
| 869 // sagittal. Could use "VolumeReslicer" here. | |
| 757 | 870 scene.DeleteLayer(layerDepth_); |
| 691 | 871 return; |
| 872 } | |
| 873 | |
| 874 uint64_t sliceRevision; | |
| 745 | 875 if (projection == VolumeProjection_Axial) |
| 691 | 876 { |
| 712 | 877 sliceRevision = source_.GetVolume().GetSliceRevision(sliceIndex); |
| 878 | |
| 879 if (first_ || | |
| 880 lastSliceIndex_ != sliceIndex) | |
| 881 { | |
| 882 // Reorder the prefetching queue | |
| 883 source_.NotifyAxialSliceAccessed(sliceIndex); | |
| 884 } | |
| 691 | 885 } |
| 886 else | |
| 887 { | |
| 888 // For coronal and sagittal projections, we take the global | |
| 889 // revision of the volume | |
| 712 | 890 sliceRevision = source_.GetVolume().GetRevision(); |
| 691 | 891 } |
|
692
10910827f235
simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
691
diff
changeset
|
892 |
|
10910827f235
simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
691
diff
changeset
|
893 if (first_ || |
| 712 | 894 lastProjection_ != projection || |
| 895 lastSliceIndex_ != sliceIndex || | |
| 896 lastSliceRevision_ != sliceRevision) | |
| 691 | 897 { |
| 757 | 898 // Either the cutting plane, or the content of the slice have not |
|
692
10910827f235
simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
691
diff
changeset
|
899 // changed since the last time the layer was set: Update is needed |
|
10910827f235
simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
691
diff
changeset
|
900 |
|
10910827f235
simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
691
diff
changeset
|
901 first_ = false; |
|
10910827f235
simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
691
diff
changeset
|
902 lastProjection_ = projection; |
|
10910827f235
simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
691
diff
changeset
|
903 lastSliceIndex_ = sliceIndex; |
| 691 | 904 lastSliceRevision_ = sliceRevision; |
| 712 | 905 |
| 745 | 906 std::auto_ptr<TextureBaseSceneLayer> texture; |
|
692
10910827f235
simplification in DicomVolumeSlicer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
691
diff
changeset
|
907 |
| 691 | 908 { |
| 712 | 909 const DicomInstanceParameters& parameters = source_.GetVolume().GetSliceParameters |
| 745 | 910 (projection == VolumeProjection_Axial ? sliceIndex : 0); |
| 911 | |
| 912 ImageBuffer3D::SliceReader reader(source_.GetVolume().GetImage(), projection, sliceIndex); | |
| 712 | 913 texture.reset(parameters.CreateTexture(reader.GetAccessor())); |
| 914 } | |
| 691 | 915 |
| 745 | 916 const CoordinateSystem3D& system = geometry.GetProjectionGeometry(projection); |
|
713
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
917 |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
918 double x0, y0, x1, y1; |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
919 system.ProjectPoint(x0, y0, system.GetOrigin()); |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
920 system.ProjectPoint(x0, y0, system.GetOrigin() + system.GetAxisX()); |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
921 texture->SetOrigin(x0, y0); |
| 712 | 922 |
|
713
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
923 double dx = x1 - x0; |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
924 double dy = y1 - y0; |
| 745 | 925 if (!LinearAlgebra::IsCloseToZero(dx) || |
| 926 !LinearAlgebra::IsCloseToZero(dy)) | |
|
713
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
927 { |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
928 texture->SetAngle(atan2(dy, dx)); |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
929 } |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
930 |
| 745 | 931 Vector tmp; |
|
713
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
932 geometry.GetVoxelDimensions(projection); |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
933 texture->SetPixelSpacing(tmp[0], tmp[1]); |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
934 |
|
e63c8b9b7b02
setting texture geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
712
diff
changeset
|
935 texture->SetLinearInterpolation(linearInterpolation_); |
| 712 | 936 |
| 757 | 937 scene.SetLayer(layerDepth_, texture.release()); |
| 691 | 938 } |
| 939 } | |
| 940 }; | |
|
681
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
941 |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
942 |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
943 class NativeApplicationContext : public IMessageEmitter |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
944 { |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
945 private: |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
946 boost::shared_mutex mutex_; |
| 745 | 947 MessageBroker broker_; |
| 948 IObservable oracleObservable_; | |
|
681
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
949 |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
950 public: |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
951 NativeApplicationContext() : |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
952 oracleObservable_(broker_) |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
953 { |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
954 } |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
955 |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
956 |
| 745 | 957 virtual void EmitMessage(const IObserver& observer, |
| 958 const IMessage& message) | |
|
681
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
959 { |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
960 try |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
961 { |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
962 boost::unique_lock<boost::shared_mutex> lock(mutex_); |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
963 oracleObservable_.EmitMessage(observer, message); |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
964 } |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
965 catch (Orthanc::OrthancException& e) |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
966 { |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
967 LOG(ERROR) << "Exception while emitting a message: " << e.What(); |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
968 } |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
969 } |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
970 |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
971 |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
972 class ReaderLock : public boost::noncopyable |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
973 { |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
974 private: |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
975 NativeApplicationContext& that_; |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
976 boost::shared_lock<boost::shared_mutex> lock_; |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
977 |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
978 public: |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
979 ReaderLock(NativeApplicationContext& that) : |
| 745 | 980 that_(that), |
| 981 lock_(that.mutex_) | |
|
681
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
982 { |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
983 } |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
984 }; |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
985 |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
986 |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
987 class WriterLock : public boost::noncopyable |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
988 { |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
989 private: |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
990 NativeApplicationContext& that_; |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
991 boost::unique_lock<boost::shared_mutex> lock_; |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
992 |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
993 public: |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
994 WriterLock(NativeApplicationContext& that) : |
| 745 | 995 that_(that), |
| 996 lock_(that.mutex_) | |
|
681
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
997 { |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
998 } |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
999 |
| 745 | 1000 MessageBroker& GetBroker() |
|
681
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
1001 { |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
1002 return that_.broker_; |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
1003 } |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
1004 |
| 745 | 1005 IObservable& GetOracleObservable() |
|
681
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
1006 { |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
1007 return that_.oracleObservable_; |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
1008 } |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
1009 }; |
|
9723fceccb9f
revision counters in DicomVolumeImage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
680
diff
changeset
|
1010 }; |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1011 } |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1012 |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1013 |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1014 |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1015 class Toto : public OrthancStone::IObserver |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1016 { |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1017 private: |
| 745 | 1018 void Handle(const OrthancStone::SleepOracleCommand::TimeoutMessage& message) |
| 744 | 1019 { |
| 1020 printf("TIMEOUT! %d\n", dynamic_cast<const Orthanc::SingleValueObject<unsigned int>& >(message.GetOrigin().GetPayload()).GetValue()); | |
| 1021 } | |
| 1022 | |
| 745 | 1023 void Handle(const OrthancStone::OrthancRestApiCommand::SuccessMessage& message) |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1024 { |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1025 Json::Value v; |
|
625
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
1026 message.ParseJsonBody(v); |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1027 |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1028 printf("ICI [%s]\n", v.toStyledString().c_str()); |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1029 } |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1030 |
| 745 | 1031 void Handle(const OrthancStone::GetOrthancImageCommand::SuccessMessage& message) |
|
637
afc91cdc5128
decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
636
diff
changeset
|
1032 { |
|
afc91cdc5128
decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
636
diff
changeset
|
1033 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
|
1034 } |
|
afc91cdc5128
decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
636
diff
changeset
|
1035 |
| 745 | 1036 void Handle(const OrthancStone::GetOrthancWebViewerJpegCommand::SuccessMessage& message) |
|
642
7ca8dc7ec17b
GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
641
diff
changeset
|
1037 { |
|
7ca8dc7ec17b
GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
641
diff
changeset
|
1038 printf("WebViewer %dx%d\n", message.GetImage().GetWidth(), message.GetImage().GetHeight()); |
|
7ca8dc7ec17b
GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
641
diff
changeset
|
1039 } |
|
7ca8dc7ec17b
GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
641
diff
changeset
|
1040 |
| 745 | 1041 void Handle(const OrthancStone::OracleCommandExceptionMessage& message) |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1042 { |
|
639
d1f4521b9bbb
OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
638
diff
changeset
|
1043 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
|
1044 |
|
d1f4521b9bbb
OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
638
diff
changeset
|
1045 switch (message.GetCommand().GetType()) |
|
d1f4521b9bbb
OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
638
diff
changeset
|
1046 { |
| 745 | 1047 case OrthancStone::IOracleCommand::Type_GetOrthancWebViewerJpeg: |
| 1048 printf("URI: [%s]\n", dynamic_cast<const OrthancStone::GetOrthancWebViewerJpegCommand&> | |
|
639
d1f4521b9bbb
OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
638
diff
changeset
|
1049 (message.GetCommand()).GetUri().c_str()); |
|
d1f4521b9bbb
OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
638
diff
changeset
|
1050 break; |
|
d1f4521b9bbb
OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
638
diff
changeset
|
1051 |
|
d1f4521b9bbb
OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
638
diff
changeset
|
1052 default: |
|
d1f4521b9bbb
OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
638
diff
changeset
|
1053 break; |
|
d1f4521b9bbb
OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
638
diff
changeset
|
1054 } |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1055 } |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1056 |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1057 public: |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1058 Toto(OrthancStone::IObservable& oracle) : |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1059 IObserver(oracle.GetBroker()) |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1060 { |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
622
diff
changeset
|
1061 oracle.RegisterObserverCallback |
|
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
622
diff
changeset
|
1062 (new OrthancStone::Callable |
| 745 | 1063 <Toto, OrthancStone::SleepOracleCommand::TimeoutMessage>(*this, &Toto::Handle)); |
| 744 | 1064 |
| 1065 oracle.RegisterObserverCallback | |
| 1066 (new OrthancStone::Callable | |
| 745 | 1067 <Toto, OrthancStone::OrthancRestApiCommand::SuccessMessage>(*this, &Toto::Handle)); |
|
637
afc91cdc5128
decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
636
diff
changeset
|
1068 |
|
afc91cdc5128
decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
636
diff
changeset
|
1069 oracle.RegisterObserverCallback |
|
afc91cdc5128
decoding of images by oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
636
diff
changeset
|
1070 (new OrthancStone::Callable |
| 745 | 1071 <Toto, OrthancStone::GetOrthancImageCommand::SuccessMessage>(*this, &Toto::Handle)); |
|
639
d1f4521b9bbb
OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
638
diff
changeset
|
1072 |
|
d1f4521b9bbb
OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
638
diff
changeset
|
1073 oracle.RegisterObserverCallback |
|
d1f4521b9bbb
OracleCommandExceptionMessage
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
638
diff
changeset
|
1074 (new OrthancStone::Callable |
| 745 | 1075 <Toto, OrthancStone::GetOrthancWebViewerJpegCommand::SuccessMessage>(*this, &Toto::Handle)); |
|
642
7ca8dc7ec17b
GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
641
diff
changeset
|
1076 |
|
7ca8dc7ec17b
GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
641
diff
changeset
|
1077 oracle.RegisterObserverCallback |
|
7ca8dc7ec17b
GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
641
diff
changeset
|
1078 (new OrthancStone::Callable |
| 745 | 1079 <Toto, OrthancStone::OracleCommandExceptionMessage>(*this, &Toto::Handle)); |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1080 } |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1081 }; |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1082 |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1083 |
| 745 | 1084 void Run(OrthancStone::NativeApplicationContext& context, |
| 1085 OrthancStone::IOracle& oracle) | |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1086 { |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1087 std::auto_ptr<Toto> toto; |
| 757 | 1088 std::auto_ptr<OrthancStone::OrthancSeriesVolumeProgressiveLoader> loader1, loader2; |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1089 |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1090 { |
| 745 | 1091 OrthancStone::NativeApplicationContext::WriterLock lock(context); |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1092 toto.reset(new Toto(lock.GetOracleObservable())); |
| 757 | 1093 loader1.reset(new OrthancStone::OrthancSeriesVolumeProgressiveLoader(oracle, lock.GetOracleObservable())); |
| 1094 loader2.reset(new OrthancStone::OrthancSeriesVolumeProgressiveLoader(oracle, lock.GetOracleObservable())); | |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
622
diff
changeset
|
1095 } |
|
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
622
diff
changeset
|
1096 |
| 744 | 1097 if (0) |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1098 { |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1099 Json::Value v = Json::objectValue; |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1100 v["Level"] = "Series"; |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1101 v["Query"] = Json::objectValue; |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1102 |
| 745 | 1103 std::auto_ptr<OrthancStone::OrthancRestApiCommand> command(new OrthancStone::OrthancRestApiCommand); |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1104 command->SetMethod(Orthanc::HttpMethod_Post); |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1105 command->SetUri("/tools/find"); |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1106 command->SetBody(v); |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1107 |
|
623
42dadae61fa9
renamed IObservable::EmitMessage() as BroadcastMessage()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
622
diff
changeset
|
1108 oracle.Schedule(*toto, command.release()); |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1109 } |
|
625
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
1110 |
| 744 | 1111 if (0) |
|
636
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1112 { |
| 745 | 1113 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand); |
|
636
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1114 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Jpeg))); |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1115 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/preview"); |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1116 oracle.Schedule(*toto, command.release()); |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1117 } |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1118 |
| 744 | 1119 if (0) |
|
636
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1120 { |
| 745 | 1121 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand); |
|
636
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1122 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Png))); |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1123 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/preview"); |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1124 oracle.Schedule(*toto, command.release()); |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1125 } |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1126 |
| 744 | 1127 if (0) |
|
636
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1128 { |
| 745 | 1129 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand); |
|
636
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1130 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Png))); |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1131 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16"); |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1132 oracle.Schedule(*toto, command.release()); |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1133 } |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1134 |
| 744 | 1135 if (0) |
|
636
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1136 { |
| 745 | 1137 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand); |
|
636
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1138 command->SetHttpHeader("Accept-Encoding", "gzip"); |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1139 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam))); |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1140 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16"); |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1141 oracle.Schedule(*toto, command.release()); |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1142 } |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1143 |
| 744 | 1144 if (0) |
|
636
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1145 { |
| 745 | 1146 std::auto_ptr<OrthancStone::GetOrthancImageCommand> command(new OrthancStone::GetOrthancImageCommand); |
|
636
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1147 command->SetHttpHeader("Accept", std::string(Orthanc::EnumerationToString(Orthanc::MimeType_Pam))); |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1148 command->SetUri("/instances/6687cc73-07cae193-52ff29c8-f646cb16-0753ed92/image-uint16"); |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1149 oracle.Schedule(*toto, command.release()); |
|
fb00a8be03e2
starting DecodeOrthancImageCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
631
diff
changeset
|
1150 } |
|
638
e626f38c5512
DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
1151 |
| 744 | 1152 if (0) |
|
638
e626f38c5512
DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
1153 { |
| 745 | 1154 std::auto_ptr<OrthancStone::GetOrthancWebViewerJpegCommand> command(new OrthancStone::GetOrthancWebViewerJpegCommand); |
|
638
e626f38c5512
DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
1155 command->SetHttpHeader("Accept-Encoding", "gzip"); |
|
e626f38c5512
DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
1156 command->SetInstance("e6c7c20b-c9f65d7e-0d76f2e2-830186f2-3e3c600e"); |
|
e626f38c5512
DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
1157 command->SetQuality(90); |
|
e626f38c5512
DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
1158 oracle.Schedule(*toto, command.release()); |
|
e626f38c5512
DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
1159 } |
|
e626f38c5512
DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
1160 |
|
e626f38c5512
DecodeOrthancWebViewerJpegCommand
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
637
diff
changeset
|
1161 |
| 744 | 1162 if (0) |
| 1163 { | |
| 1164 for (unsigned int i = 0; i < 10; i++) | |
| 1165 { | |
| 745 | 1166 std::auto_ptr<OrthancStone::SleepOracleCommand> command(new OrthancStone::SleepOracleCommand(i * 1000)); |
| 744 | 1167 command->SetPayload(new Orthanc::SingleValueObject<unsigned int>(42 * i)); |
| 1168 oracle.Schedule(*toto, command.release()); | |
| 1169 } | |
| 1170 } | |
| 1171 | |
|
625
2eeb5857eb43
DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
623
diff
changeset
|
1172 // 2017-11-17-Anonymized |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
1173 //loader1->LoadSeries("cb3ea4d1-d08f3856-ad7b6314-74d88d77-60b05618"); // CT |
| 710 | 1174 //loader2->LoadInstance("41029085-71718346-811efac4-420e2c15-d39f99b6"); // RT-DOSE |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1175 |
| 661 | 1176 // Delphine |
| 744 | 1177 //loader1->LoadSeries("5990e39c-51e5f201-fe87a54c-31a55943-e59ef80e"); // CT |
| 1178 loader1->LoadSeries("67f1b334-02c16752-45026e40-a5b60b6b-030ecab5"); // Lung 1/10mm | |
| 661 | 1179 |
|
642
7ca8dc7ec17b
GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
641
diff
changeset
|
1180 LOG(WARNING) << "...Waiting for Ctrl-C..."; |
|
7ca8dc7ec17b
GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
641
diff
changeset
|
1181 Orthanc::SystemToolbox::ServerBarrier(); |
|
7ca8dc7ec17b
GetOrthancWebViewerJpegCommand::ProcessHttpHandler()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
641
diff
changeset
|
1182 //boost::this_thread::sleep(boost::posix_time::seconds(1)); |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1183 } |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1184 |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1185 |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1186 |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1187 /** |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1188 * IMPORTANT: The full arguments to "main()" are needed for SDL on |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1189 * Windows. Otherwise, one gets the linking error "undefined reference |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1190 * to `SDL_main'". https://wiki.libsdl.org/FAQWindows |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1191 **/ |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1192 int main(int argc, char* argv[]) |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1193 { |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1194 OrthancStone::StoneInitialize(); |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1195 Orthanc::Logging::EnableInfoLevel(true); |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1196 |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1197 try |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1198 { |
| 745 | 1199 OrthancStone::NativeApplicationContext context; |
| 1200 | |
| 1201 OrthancStone::ThreadedOracle oracle(context); | |
|
680
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
1202 |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
1203 { |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
1204 Orthanc::WebServiceParameters p; |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
1205 //p.SetUrl("http://localhost:8043/"); |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
1206 p.SetCredentials("orthanc", "orthanc"); |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
1207 oracle.SetOrthancParameters(p); |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
1208 } |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
1209 |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
1210 oracle.Start(); |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
1211 |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
1212 Run(context, oracle); |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
1213 |
|
0eb26f514ac5
loading of slice images
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
678
diff
changeset
|
1214 oracle.Stop(); |
|
619
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1215 } |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1216 catch (Orthanc::OrthancException& e) |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1217 { |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1218 LOG(ERROR) << "EXCEPTION: " << e.What(); |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1219 } |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1220 |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1221 OrthancStone::StoneFinalize(); |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1222 |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1223 return 0; |
|
9cd19b28f011
test: refactoring oracle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1224 } |