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