Mercurial > hg > orthanc-stone
annotate Framework/Toolbox/DicomInstanceParameters.cpp @ 1289:343aa1dfaa90 bugs/2020-02-invisible-slice
Ongoing work on invisible slice bug (logging + removed unused function)
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Wed, 19 Feb 2020 17:05:08 +0100 |
parents | 8e82fdc6200e |
children | ea6c2254536d |
rev | line source |
---|---|
746 | 1 /** |
2 * Stone of Orthanc | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
1270
2d8ab34c8c91
upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1206
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
746 | 6 * |
7 * This program is free software: you can redistribute it and/or | |
8 * modify it under the terms of the GNU Affero General Public License | |
9 * as published by the Free Software Foundation, either version 3 of | |
10 * the License, or (at your option) any later version. | |
11 * | |
12 * This program is distributed in the hope that it will be useful, but | |
13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Affero General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Affero General Public License | |
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
19 **/ | |
20 | |
21 | |
22 #include "DicomInstanceParameters.h" | |
23 | |
24 #include "../Scene2D/ColorTextureSceneLayer.h" | |
25 #include "../Scene2D/FloatTextureSceneLayer.h" | |
26 #include "../Toolbox/GeometryToolbox.h" | |
1287
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
27 #include "../Toolbox/ImageToolbox.h" |
746 | 28 |
29 #include <Core/Images/Image.h> | |
30 #include <Core/Images/ImageProcessing.h> | |
31 #include <Core/Logging.h> | |
32 #include <Core/OrthancException.h> | |
33 #include <Core/Toolbox.h> | |
34 | |
35 | |
36 namespace OrthancStone | |
37 { | |
38 void DicomInstanceParameters::Data::ComputeDoseOffsets(const Orthanc::DicomMap& dicom) | |
39 { | |
40 // http://dicom.nema.org/medical/Dicom/2016a/output/chtml/part03/sect_C.8.8.3.2.html | |
41 | |
42 { | |
43 std::string increment; | |
44 | |
994
1f74bc3459ba
fix build due to rename in Orthanc::DicomMap
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
980
diff
changeset
|
45 if (dicom.LookupStringValue(increment, Orthanc::DICOM_TAG_FRAME_INCREMENT_POINTER, false)) |
746 | 46 { |
47 Orthanc::Toolbox::ToUpperCase(increment); | |
949
32eaf4929b08
OrthancMultiframeVolumeLoader and OrthancSeriesVolumeProgressiveLoader now implement IGeometryProvider so that the geometry reference can be switched (CT or DOSE, for instance) + VolumeImageGeometry::SetSize renamed to VolumeImageGeometry::SetSizeInVoxels + prevent text layer update if text or properties do not change + a few stream operator<< for debug (Vector, Matrix,...) + fixed memory access aligment issues in ImageBuffer3D::ExtractSagittalSlice + fix for wrong screen Y offset of mpr slices in DicomVolumeImageMPRSlicer.
Benjamin Golinvaux <bgo@osimis.io>
parents:
768
diff
changeset
|
48 if (increment != "3004,000C") // This is the "Grid Frame Offset Vector" tag (DICOM_TAG_GRID_FRAME_OFFSET_VECTOR) |
746 | 49 { |
50 LOG(ERROR) << "RT-DOSE: Bad value for the \"FrameIncrementPointer\" tag"; | |
51 return; | |
52 } | |
53 } | |
54 } | |
55 | |
56 if (!LinearAlgebra::ParseVector(frameOffsets_, dicom, Orthanc::DICOM_TAG_GRID_FRAME_OFFSET_VECTOR) || | |
57 frameOffsets_.size() < imageInformation_.GetNumberOfFrames()) | |
58 { | |
59 LOG(ERROR) << "RT-DOSE: No information about the 3D location of some slice(s)"; | |
60 frameOffsets_.clear(); | |
61 } | |
62 else | |
63 { | |
64 if (frameOffsets_.size() >= 2) | |
65 { | |
762
26f4345e771e
creation of OrthancMultiframeVolumeLoader
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
757
diff
changeset
|
66 thickness_ = std::abs(frameOffsets_[1] - frameOffsets_[0]); |
746 | 67 } |
68 } | |
69 } | |
70 | |
71 | |
72 DicomInstanceParameters::Data::Data(const Orthanc::DicomMap& dicom) : | |
73 imageInformation_(dicom) | |
74 { | |
75 if (imageInformation_.GetNumberOfFrames() <= 0) | |
76 { | |
77 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
78 } | |
79 | |
994
1f74bc3459ba
fix build due to rename in Orthanc::DicomMap
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
980
diff
changeset
|
80 if (!dicom.LookupStringValue(studyInstanceUid_, Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, false) || |
1f74bc3459ba
fix build due to rename in Orthanc::DicomMap
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
980
diff
changeset
|
81 !dicom.LookupStringValue(seriesInstanceUid_, Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, false) || |
1f74bc3459ba
fix build due to rename in Orthanc::DicomMap
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
980
diff
changeset
|
82 !dicom.LookupStringValue(sopInstanceUid_, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false)) |
746 | 83 { |
84 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
85 } | |
86 | |
87 std::string s; | |
994
1f74bc3459ba
fix build due to rename in Orthanc::DicomMap
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
980
diff
changeset
|
88 if (!dicom.LookupStringValue(s, Orthanc::DICOM_TAG_SOP_CLASS_UID, false)) |
746 | 89 { |
90 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat); | |
91 } | |
92 else | |
93 { | |
94 sopClassUid_ = StringToSopClassUid(s); | |
95 } | |
96 | |
97 if (!dicom.ParseDouble(thickness_, Orthanc::DICOM_TAG_SLICE_THICKNESS)) | |
98 { | |
99 thickness_ = 100.0 * std::numeric_limits<double>::epsilon(); | |
100 } | |
101 | |
102 GeometryToolbox::GetPixelSpacing(pixelSpacingX_, pixelSpacingY_, dicom); | |
103 | |
104 std::string position, orientation; | |
994
1f74bc3459ba
fix build due to rename in Orthanc::DicomMap
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
980
diff
changeset
|
105 if (dicom.LookupStringValue(position, Orthanc::DICOM_TAG_IMAGE_POSITION_PATIENT, false) && |
1f74bc3459ba
fix build due to rename in Orthanc::DicomMap
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
980
diff
changeset
|
106 dicom.LookupStringValue(orientation, Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, false)) |
746 | 107 { |
108 geometry_ = CoordinateSystem3D(position, orientation); | |
109 } | |
110 | |
111 if (sopClassUid_ == SopClassUid_RTDose) | |
112 { | |
113 ComputeDoseOffsets(dicom); | |
1091
5a18e6a395bc
Added DoseUnit tag retrieval to DicomInstanceParameters
Benjamin Golinvaux <bgo@osimis.io>
parents:
1027
diff
changeset
|
114 |
5a18e6a395bc
Added DoseUnit tag retrieval to DicomInstanceParameters
Benjamin Golinvaux <bgo@osimis.io>
parents:
1027
diff
changeset
|
115 static const Orthanc::DicomTag DICOM_TAG_DOSE_UNITS(0x3004, 0x0002); |
5a18e6a395bc
Added DoseUnit tag retrieval to DicomInstanceParameters
Benjamin Golinvaux <bgo@osimis.io>
parents:
1027
diff
changeset
|
116 |
5a18e6a395bc
Added DoseUnit tag retrieval to DicomInstanceParameters
Benjamin Golinvaux <bgo@osimis.io>
parents:
1027
diff
changeset
|
117 if (!dicom.LookupStringValue(doseUnits_, DICOM_TAG_DOSE_UNITS, false)) |
5a18e6a395bc
Added DoseUnit tag retrieval to DicomInstanceParameters
Benjamin Golinvaux <bgo@osimis.io>
parents:
1027
diff
changeset
|
118 { |
1141
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
119 LOG(ERROR) << "Tag DoseUnits (0x3004, 0x0002) is missing in " << sopInstanceUid_; |
1091
5a18e6a395bc
Added DoseUnit tag retrieval to DicomInstanceParameters
Benjamin Golinvaux <bgo@osimis.io>
parents:
1027
diff
changeset
|
120 doseUnits_ = ""; |
5a18e6a395bc
Added DoseUnit tag retrieval to DicomInstanceParameters
Benjamin Golinvaux <bgo@osimis.io>
parents:
1027
diff
changeset
|
121 } |
746 | 122 } |
123 | |
124 isColor_ = (imageInformation_.GetPhotometricInterpretation() != Orthanc::PhotometricInterpretation_Monochrome1 && | |
125 imageInformation_.GetPhotometricInterpretation() != Orthanc::PhotometricInterpretation_Monochrome2); | |
126 | |
127 if (dicom.ParseDouble(rescaleIntercept_, Orthanc::DICOM_TAG_RESCALE_INTERCEPT) && | |
128 dicom.ParseDouble(rescaleSlope_, Orthanc::DICOM_TAG_RESCALE_SLOPE)) | |
129 { | |
1141
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
130 if (sopClassUid_ == SopClassUid_RTDose) |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
131 { |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
132 LOG(INFO) << "DOSE HAS Rescale*: rescaleIntercept_ = " << rescaleIntercept_ << " rescaleSlope_ = " << rescaleSlope_; |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
133 // WE SHOULD NOT TAKE THE RESCALE VALUE INTO ACCOUNT IN THE CASE OF DOSES |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
134 hasRescale_ = false; |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
135 } |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
136 else |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
137 { |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
138 hasRescale_ = true; |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
139 } |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
140 |
746 | 141 } |
142 else | |
143 { | |
144 hasRescale_ = false; | |
145 } | |
146 | |
1141
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
147 if (dicom.ParseDouble(doseGridScaling_, Orthanc::DICOM_TAG_DOSE_GRID_SCALING)) |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
148 { |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
149 if (sopClassUid_ == SopClassUid_RTDose) |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
150 { |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
151 LOG(INFO) << "DOSE HAS DoseGridScaling: doseGridScaling_ = " << doseGridScaling_; |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
152 } |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
153 } |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
154 else |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
155 { |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
156 doseGridScaling_ = 1.0; |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
157 if (sopClassUid_ == SopClassUid_RTDose) |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
158 { |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
159 LOG(ERROR) << "Tag DoseGridScaling (0x3004, 0x000e) is missing in " << sopInstanceUid_ << " doseGridScaling_ will be set to 1.0"; |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
160 } |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
161 } |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
162 |
746 | 163 Vector c, w; |
164 if (LinearAlgebra::ParseVector(c, dicom, Orthanc::DICOM_TAG_WINDOW_CENTER) && | |
165 LinearAlgebra::ParseVector(w, dicom, Orthanc::DICOM_TAG_WINDOW_WIDTH) && | |
166 c.size() > 0 && | |
167 w.size() > 0) | |
168 { | |
169 hasDefaultWindowing_ = true; | |
170 defaultWindowingCenter_ = static_cast<float>(c[0]); | |
171 defaultWindowingWidth_ = static_cast<float>(w[0]); | |
172 } | |
173 else | |
174 { | |
175 hasDefaultWindowing_ = false; | |
1141
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
176 defaultWindowingCenter_ = 0; |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
177 defaultWindowingWidth_ = 0; |
746 | 178 } |
179 | |
180 if (sopClassUid_ == SopClassUid_RTDose) | |
181 { | |
182 switch (imageInformation_.GetBitsStored()) | |
183 { | |
184 case 16: | |
185 expectedPixelFormat_ = Orthanc::PixelFormat_Grayscale16; | |
186 break; | |
187 | |
188 case 32: | |
189 expectedPixelFormat_ = Orthanc::PixelFormat_Grayscale32; | |
190 break; | |
191 | |
192 default: | |
193 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); | |
194 } | |
195 } | |
196 else if (isColor_) | |
197 { | |
198 expectedPixelFormat_ = Orthanc::PixelFormat_RGB24; | |
199 } | |
200 else if (imageInformation_.IsSigned()) | |
201 { | |
202 expectedPixelFormat_ = Orthanc::PixelFormat_SignedGrayscale16; | |
203 } | |
204 else | |
205 { | |
206 expectedPixelFormat_ = Orthanc::PixelFormat_Grayscale16; | |
207 } | |
980
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
208 |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
209 // This computes the "IndexInSeries" metadata from Orthanc (check |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
210 // out "Orthanc::ServerIndex::Store()") |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
211 hasIndexInSeries_ = ( |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
212 dicom.ParseUnsignedInteger32(indexInSeries_, Orthanc::DICOM_TAG_INSTANCE_NUMBER) || |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
213 dicom.ParseUnsignedInteger32(indexInSeries_, Orthanc::DICOM_TAG_IMAGE_INDEX)); |
746 | 214 } |
215 | |
216 | |
217 CoordinateSystem3D DicomInstanceParameters::Data::GetFrameGeometry(unsigned int frame) const | |
218 { | |
219 if (frame == 0) | |
220 { | |
221 return geometry_; | |
222 } | |
223 else if (frame >= imageInformation_.GetNumberOfFrames()) | |
224 { | |
225 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
226 } | |
227 else if (sopClassUid_ == SopClassUid_RTDose) | |
228 { | |
229 if (frame >= frameOffsets_.size()) | |
230 { | |
231 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
232 } | |
233 | |
234 return CoordinateSystem3D( | |
235 geometry_.GetOrigin() + frameOffsets_[frame] * geometry_.GetNormal(), | |
236 geometry_.GetAxisX(), | |
237 geometry_.GetAxisY()); | |
238 } | |
239 else | |
240 { | |
241 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); | |
242 } | |
243 } | |
244 | |
245 | |
246 bool DicomInstanceParameters::Data::IsPlaneWithinSlice(unsigned int frame, | |
247 const CoordinateSystem3D& plane) const | |
248 { | |
249 if (frame >= imageInformation_.GetNumberOfFrames()) | |
250 { | |
251 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange); | |
252 } | |
253 | |
254 CoordinateSystem3D tmp = geometry_; | |
255 | |
256 if (frame != 0) | |
257 { | |
258 tmp = GetFrameGeometry(frame); | |
259 } | |
260 | |
261 double distance; | |
262 | |
757 | 263 return (CoordinateSystem3D::ComputeDistance(distance, tmp, plane) && |
746 | 264 distance <= thickness_ / 2.0); |
265 } | |
266 | |
1141
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
267 void DicomInstanceParameters::Data::ApplyRescaleAndDoseScaling(Orthanc::ImageAccessor& image, |
746 | 268 bool useDouble) const |
269 { | |
270 if (image.GetFormat() != Orthanc::PixelFormat_Float32) | |
271 { | |
272 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat); | |
273 } | |
1141
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
274 |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
275 double factor = doseGridScaling_; |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
276 double offset = 0.0; |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
277 |
746 | 278 if (hasRescale_) |
279 { | |
1141
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
280 factor *= rescaleSlope_; |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
281 offset = rescaleIntercept_; |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
282 } |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
283 |
1287
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
284 if (OrthancStone_Internals_dump_LoadTexture_histogram == 1) |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
285 { |
1289
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
286 LOG(INFO) << "in DicomInstanceParameters::Data::ApplyRescaleAndDoseScaling:"; |
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
287 LOG(INFO) << " doseGridScaling_ = " << doseGridScaling_ |
1287
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
288 << " hasRescale_ = " << hasRescale_ |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
289 << " rescaleSlope_ = " << rescaleSlope_ |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
290 << " rescaleIntercept_ = " << rescaleIntercept_; |
1289
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
291 LOG(INFO) << " --> factor = " << factor << " offset = " << offset; |
1287
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
292 } |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
293 |
1141
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
294 if ( (factor != 1.0) || (offset != 0.0) ) |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
295 { |
746 | 296 const unsigned int width = image.GetWidth(); |
297 const unsigned int height = image.GetHeight(); | |
298 | |
299 for (unsigned int y = 0; y < height; y++) | |
300 { | |
301 float* p = reinterpret_cast<float*>(image.GetRow(y)); | |
302 | |
303 if (useDouble) | |
304 { | |
305 // Slower, accurate implementation using double | |
306 for (unsigned int x = 0; x < width; x++, p++) | |
307 { | |
308 double value = static_cast<double>(*p); | |
1141
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
309 *p = static_cast<float>(value * factor + offset); |
746 | 310 } |
311 } | |
312 else | |
313 { | |
314 // Fast, approximate implementation using float | |
315 for (unsigned int x = 0; x < width; x++, p++) | |
316 { | |
1141
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
317 *p = (*p) * static_cast<float>(factor) + static_cast<float>(offset); |
746 | 318 } |
319 } | |
320 } | |
321 } | |
322 } | |
323 | |
324 double DicomInstanceParameters::GetRescaleIntercept() const | |
325 { | |
326 if (data_.hasRescale_) | |
327 { | |
328 return data_.rescaleIntercept_; | |
329 } | |
330 else | |
331 { | |
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
949
diff
changeset
|
332 LOG(ERROR) << "DicomInstanceParameters::GetRescaleIntercept(): !data_.hasRescale_"; |
746 | 333 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
334 } | |
335 } | |
336 | |
337 | |
338 double DicomInstanceParameters::GetRescaleSlope() const | |
339 { | |
340 if (data_.hasRescale_) | |
341 { | |
342 return data_.rescaleSlope_; | |
343 } | |
344 else | |
345 { | |
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
949
diff
changeset
|
346 LOG(ERROR) << "DicomInstanceParameters::GetRescaleSlope(): !data_.hasRescale_"; |
746 | 347 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
348 } | |
349 } | |
350 | |
351 | |
352 float DicomInstanceParameters::GetDefaultWindowingCenter() const | |
353 { | |
354 if (data_.hasDefaultWindowing_) | |
355 { | |
356 return data_.defaultWindowingCenter_; | |
357 } | |
358 else | |
359 { | |
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
949
diff
changeset
|
360 LOG(ERROR) << "DicomInstanceParameters::GetDefaultWindowingCenter(): !data_.hasRescale_"; |
746 | 361 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
362 } | |
363 } | |
364 | |
365 | |
366 float DicomInstanceParameters::GetDefaultWindowingWidth() const | |
367 { | |
368 if (data_.hasDefaultWindowing_) | |
369 { | |
370 return data_.defaultWindowingWidth_; | |
371 } | |
372 else | |
373 { | |
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
949
diff
changeset
|
374 LOG(ERROR) << "DicomInstanceParameters::GetDefaultWindowingWidth(): !data_.hasRescale_"; |
746 | 375 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
376 } | |
377 } | |
378 | |
379 | |
768
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
380 Orthanc::ImageAccessor* DicomInstanceParameters::ConvertToFloat(const Orthanc::ImageAccessor& pixelData) const |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
381 { |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
382 std::auto_ptr<Orthanc::Image> converted(new Orthanc::Image(Orthanc::PixelFormat_Float32, |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
383 pixelData.GetWidth(), |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
384 pixelData.GetHeight(), |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
385 false)); |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
386 Orthanc::ImageProcessing::Convert(*converted, pixelData); |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
387 |
1287
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
388 if (OrthancStone_Internals_dump_LoadTexture_histogram == 1) |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
389 { |
1289
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
390 LOG(INFO) << "+----------------------------------------+"; |
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
391 LOG(INFO) << "| This is not an error! |"; |
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
392 LOG(INFO) << "+----------------------------------------+"; |
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
393 LOG(INFO) << "Work on the \"invisible slice\" bug"; |
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
394 LOG(INFO) << "in: DicomInstanceParameters::ConvertToFloat()"; |
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
395 LOG(INFO) << "dumping texture hist after conversion from native sliceReader to Float32"; |
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
396 LOG(INFO) << "(source buffer address before conversion is: " << pixelData.GetConstBuffer() << ")"; |
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
397 LOG(INFO) << " target buffer address after conversion is: " << converted->GetConstBuffer(); |
1287
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
398 |
1289
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
399 LOG(INFO) << "Target histo:"; |
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
400 LOG(INFO) << "-------------"; |
1287
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
401 { |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
402 HistogramData hd; |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
403 double minValue = 0; |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
404 double maxValue = 0; |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
405 ComputeMinMax(*converted, minValue, maxValue); |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
406 double binSize = (maxValue - minValue) * 0.01; |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
407 ComputeHistogram(*converted, hd, binSize); |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
408 std::string s; |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
409 DumpHistogramResult(s, hd); |
1289
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
410 LOG(INFO) << s; |
1287
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
411 } |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
412 } |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
413 |
768
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
414 // Correct rescale slope/intercept if need be |
1141
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
415 //data_.ApplyRescaleAndDoseScaling(*converted, (pixelData.GetFormat() == Orthanc::PixelFormat_Grayscale32)); |
7681f3943748
Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents:
1091
diff
changeset
|
416 data_.ApplyRescaleAndDoseScaling(*converted, false); |
768
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
417 |
1287
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
418 if (OrthancStone_Internals_dump_LoadTexture_histogram == 1) |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
419 { |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
420 |
1289
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
421 LOG(INFO) << "Target histo after data_.ApplyRescaleAndDoseScaling"; |
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
422 LOG(INFO) << "---------------------------------------------------"; |
1287
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
423 { |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
424 HistogramData hd; |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
425 double minValue = 0; |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
426 double maxValue = 0; |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
427 ComputeMinMax(*converted, minValue, maxValue); |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
428 double binSize = (maxValue - minValue) * 0.01; |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
429 ComputeHistogram(*converted, hd, binSize); |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
430 std::string s; |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
431 DumpHistogramResult(s, hd); |
1289
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
432 LOG(INFO) << s; |
1287
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
433 } |
1289
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
434 LOG(INFO) << "+----------------------------------------+"; |
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
435 LOG(INFO) << "| end of debug dump |"; |
343aa1dfaa90
Ongoing work on invisible slice bug (logging + removed unused function)
Benjamin Golinvaux <bgo@osimis.io>
parents:
1287
diff
changeset
|
436 LOG(INFO) << "+----------------------------------------+"; |
1287
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
437 } |
8e82fdc6200e
Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents:
1270
diff
changeset
|
438 |
768
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
439 return converted.release(); |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
440 } |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
441 |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
442 |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
443 TextureBaseSceneLayer* DicomInstanceParameters::CreateTexture |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
444 (const Orthanc::ImageAccessor& pixelData) const |
746 | 445 { |
446 assert(sizeof(float) == 4); | |
447 | |
448 Orthanc::PixelFormat sourceFormat = pixelData.GetFormat(); | |
449 | |
450 if (sourceFormat != GetExpectedPixelFormat()) | |
451 { | |
452 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat); | |
453 } | |
454 | |
455 if (sourceFormat == Orthanc::PixelFormat_RGB24) | |
456 { | |
457 // This is the case of a color image. No conversion has to be done. | |
458 return new ColorTextureSceneLayer(pixelData); | |
459 } | |
460 else | |
461 { | |
768
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
462 // This is the case of a grayscale frame. Convert it to Float32. |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
463 std::auto_ptr<FloatTextureSceneLayer> texture; |
746 | 464 |
768
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
465 if (pixelData.GetFormat() == Orthanc::PixelFormat_Float32) |
746 | 466 { |
768
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
467 texture.reset(new FloatTextureSceneLayer(pixelData)); |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
468 } |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
469 else |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
470 { |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
471 std::auto_ptr<Orthanc::ImageAccessor> converted(ConvertToFloat(pixelData)); |
746 | 472 texture.reset(new FloatTextureSceneLayer(*converted)); |
473 } | |
474 | |
475 if (data_.hasDefaultWindowing_) | |
476 { | |
477 texture->SetCustomWindowing(data_.defaultWindowingCenter_, | |
478 data_.defaultWindowingWidth_); | |
479 } | |
1206
c93a6218f0cd
Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents:
1141
diff
changeset
|
480 |
c93a6218f0cd
Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents:
1141
diff
changeset
|
481 |
c93a6218f0cd
Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents:
1141
diff
changeset
|
482 if (data_.imageInformation_.GetPhotometricInterpretation() |
c93a6218f0cd
Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents:
1141
diff
changeset
|
483 == Orthanc::PhotometricInterpretation_Monochrome1) |
c93a6218f0cd
Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents:
1141
diff
changeset
|
484 { |
c93a6218f0cd
Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents:
1141
diff
changeset
|
485 texture->SetInverted(true); |
c93a6218f0cd
Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents:
1141
diff
changeset
|
486 } |
c93a6218f0cd
Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents:
1141
diff
changeset
|
487 else if (data_.imageInformation_.GetPhotometricInterpretation() |
c93a6218f0cd
Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents:
1141
diff
changeset
|
488 == Orthanc::PhotometricInterpretation_Monochrome2) |
c93a6218f0cd
Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents:
1141
diff
changeset
|
489 { |
c93a6218f0cd
Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents:
1141
diff
changeset
|
490 texture->SetInverted(false); |
c93a6218f0cd
Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents:
1141
diff
changeset
|
491 } |
c93a6218f0cd
Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents:
1141
diff
changeset
|
492 |
746 | 493 return texture.release(); |
494 } | |
495 } | |
768
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
496 |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
497 |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
498 LookupTableTextureSceneLayer* DicomInstanceParameters::CreateLookupTableTexture |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
499 (const Orthanc::ImageAccessor& pixelData) const |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
500 { |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
501 std::auto_ptr<FloatTextureSceneLayer> texture; |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
502 |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
503 if (pixelData.GetFormat() == Orthanc::PixelFormat_Float32) |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
504 { |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
505 return new LookupTableTextureSceneLayer(pixelData); |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
506 } |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
507 else |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
508 { |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
509 std::auto_ptr<Orthanc::ImageAccessor> converted(ConvertToFloat(pixelData)); |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
510 return new LookupTableTextureSceneLayer(*converted); |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
511 } |
55411e7da2f7
LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
762
diff
changeset
|
512 } |
980
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
513 |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
514 |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
515 unsigned int DicomInstanceParameters::GetIndexInSeries() const |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
516 { |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
517 if (data_.hasIndexInSeries_) |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
518 { |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
519 return data_.indexInSeries_; |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
520 } |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
521 else |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
522 { |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
523 LOG(ERROR) << "DicomInstanceParameters::GetIndexInSeries(): !data_.hasIndexInSeries_"; |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
524 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
525 } |
8e497a4e3d96
DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
956
diff
changeset
|
526 } |
746 | 527 } |