Mercurial > hg > orthanc-stone

annotate OrthancStone/Sources/Toolbox/DicomInstanceParameters.cpp @ 1642:5cc589bfb385

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lazy computation of DicomInstanceParameters::GetImageInformation()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 10 Nov 2020 17:21:23 +0100
parents 5cdc5b98f14d
children 4e14735e98f8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Stone of Orthanc
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
1598
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
8 * modify it under the terms of the GNU Lesser General Public License
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * the License, or (at your option) any later version.
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
1598
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
15 * Lesser General Public License for more details.
1596
4fb8fdf03314 removed annoying whitespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1571
diff changeset
16 *
1598
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
18 * License along with this program. If not, see
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
19 * <http://www.gnu.org/licenses/>.
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 **/
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 #include "DicomInstanceParameters.h"
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 #include "../Scene2D/ColorTextureSceneLayer.h"
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 #include "../Scene2D/FloatTextureSceneLayer.h"
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 #include "../Toolbox/GeometryToolbox.h"
1287
8e82fdc6200e Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents: 1270
diff changeset
28 #include "../Toolbox/ImageToolbox.h"
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29
1455
30deba7bc8e2 simplifying include_directories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
30 #include <Images/Image.h>
30deba7bc8e2 simplifying include_directories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
31 #include <Images/ImageProcessing.h>
30deba7bc8e2 simplifying include_directories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
32 #include <Logging.h>
30deba7bc8e2 simplifying include_directories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
33 #include <OrthancException.h>
30deba7bc8e2 simplifying include_directories
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
34 #include <Toolbox.h>
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 namespace OrthancStone
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 {
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
39 static void ExtractFrameOffsets(Vector& target,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
40 const Orthanc::DicomMap& dicom,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
41 unsigned int numberOfFrames)
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 // http://dicom.nema.org/medical/Dicom/2016a/output/chtml/part03/sect_C.8.8.3.2.html
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44
1634
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
45 std::string increment;
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
46
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
47 if (dicom.LookupStringValue(increment, Orthanc::DICOM_TAG_FRAME_INCREMENT_POINTER, false))
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 {
1634
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
49 Orthanc::Toolbox::ToUpperCase(increment);
1635
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
50
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
51 // This is the "Grid Frame Offset Vector" tag (DICOM_TAG_GRID_FRAME_OFFSET_VECTOR)
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
52 if (increment != "3004,000C")
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 {
1634
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
54 LOG(WARNING) << "Bad value for the FrameIncrementPointer tags in a multiframe image";
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
55 target.resize(0);
1634
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
56 return;
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
60 if (!LinearAlgebra::ParseVector(target, dicom, Orthanc::DICOM_TAG_GRID_FRAME_OFFSET_VECTOR) ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
61 target.size() != numberOfFrames)
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 {
1634
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
63 LOG(INFO) << "The frame offset information is missing in a multiframe image";
1635
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
64
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
65 // DO NOT use ".clear()" here, as the "Vector" class doesn't behave like std::vector!
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
66 target.resize(0);
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70
1642
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
71 DicomInstanceParameters::Data::Data(const Orthanc::DicomMap& dicom)
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 {
994
1f74bc3459ba fix build due to rename in Orthanc::DicomMap
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 980
diff changeset
73 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
74 !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
75 !dicom.LookupStringValue(sopInstanceUid_, Orthanc::DICOM_TAG_SOP_INSTANCE_UID, false))
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 std::string s;
1635
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
81 if (dicom.LookupStringValue(s, Orthanc::DICOM_TAG_SOP_CLASS_UID, false))
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 {
1635
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
83 sopClassUid_ = StringToSopClassUid(s);
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 else
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 {
1635
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
87 sopClassUid_ = SopClassUid_Other;
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
88 }
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
89
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
90 uint32_t n;
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
91 if (dicom.ParseUnsignedInteger32(n, Orthanc::DICOM_TAG_NUMBER_OF_FRAMES))
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
92 {
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
93 numberOfFrames_ = n;
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
94 }
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
95 else
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
96 {
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
97 numberOfFrames_ = 1;
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99
1635
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
100 if (!dicom.HasTag(Orthanc::DICOM_TAG_COLUMNS) ||
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
101 !dicom.GetValue(Orthanc::DICOM_TAG_COLUMNS).ParseFirstUnsignedInteger(width_))
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
102 {
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
103 width_ = 0;
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
104 }
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
105
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
106 if (!dicom.HasTag(Orthanc::DICOM_TAG_ROWS) ||
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
107 !dicom.GetValue(Orthanc::DICOM_TAG_ROWS).ParseFirstUnsignedInteger(height_))
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
108 {
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
109 height_ = 0;
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
110 }
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
111
1634
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
112 if (!dicom.ParseDouble(sliceThickness_, Orthanc::DICOM_TAG_SLICE_THICKNESS))
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113 {
1634
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
114 sliceThickness_ = 100.0 * std::numeric_limits<double>::epsilon();
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 GeometryToolbox::GetPixelSpacing(pixelSpacingX_, pixelSpacingY_, dicom);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
119 std::string position, orientation;
994
1f74bc3459ba fix build due to rename in Orthanc::DicomMap
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 980
diff changeset
120 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
121 dicom.LookupStringValue(orientation, Orthanc::DICOM_TAG_IMAGE_ORIENTATION_PATIENT, false))
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 geometry_ = CoordinateSystem3D(position, orientation);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125
1635
1a714e21ea7c start refactoring DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1634
diff changeset
126 // Must be AFTER setting "numberOfFrames_"
1639
5cdc5b98f14d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1637
diff changeset
127 if (numberOfFrames_ > 1)
5cdc5b98f14d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1637
diff changeset
128 {
5cdc5b98f14d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1637
diff changeset
129 ExtractFrameOffsets(frameOffsets_, dicom, numberOfFrames_);
5cdc5b98f14d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1637
diff changeset
130 }
5cdc5b98f14d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1637
diff changeset
131 else
5cdc5b98f14d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1637
diff changeset
132 {
5cdc5b98f14d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1637
diff changeset
133 frameOffsets_.resize(0);
5cdc5b98f14d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1637
diff changeset
134 }
1634
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
135
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 if (sopClassUid_ == SopClassUid_RTDose)
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
137 {
1091
5a18e6a395bc Added DoseUnit tag retrieval to DicomInstanceParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 1027
diff changeset
138 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
139
5a18e6a395bc Added DoseUnit tag retrieval to DicomInstanceParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 1027
diff changeset
140 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
141 {
1141
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
142 LOG(ERROR) << "Tag DoseUnits (0x3004, 0x0002) is missing in " << sopInstanceUid_;
1634
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
143 doseUnits_.clear();
1091
5a18e6a395bc Added DoseUnit tag retrieval to DicomInstanceParameters
Benjamin Golinvaux <bgo@osimis.io>
parents: 1027
diff changeset
144 }
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 if (dicom.ParseDouble(rescaleIntercept_, Orthanc::DICOM_TAG_RESCALE_INTERCEPT) &&
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 dicom.ParseDouble(rescaleSlope_, Orthanc::DICOM_TAG_RESCALE_SLOPE))
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149 {
1141
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
150 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
151 {
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
152 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
153 // 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
154 hasRescale_ = false;
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 else
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
157 {
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
158 hasRescale_ = true;
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
159 }
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
160
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162 else
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164 hasRescale_ = false;
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166
1141
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
167 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
168 {
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
169 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
170 {
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
171 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
172 }
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
173 }
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
174 else
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
175 {
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
176 doseGridScaling_ = 1.0;
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
177 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
178 {
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
179 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
180 }
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
181 }
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
182
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183 Vector c, w;
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 if (LinearAlgebra::ParseVector(c, dicom, Orthanc::DICOM_TAG_WINDOW_CENTER) &&
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 LinearAlgebra::ParseVector(w, dicom, Orthanc::DICOM_TAG_WINDOW_WIDTH) &&
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186 c.size() > 0 &&
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187 w.size() > 0)
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 hasDefaultWindowing_ = true;
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190 defaultWindowingCenter_ = static_cast<float>(c[0]);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 defaultWindowingWidth_ = static_cast<float>(w[0]);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 else
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195 hasDefaultWindowing_ = false;
1141
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
196 defaultWindowingCenter_ = 0;
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
197 defaultWindowingWidth_ = 0;
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199
980
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 956
diff changeset
200 // This computes the "IndexInSeries" metadata from Orthanc (check
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 956
diff changeset
201 // out "Orthanc::ServerIndex::Store()")
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 956
diff changeset
202 hasIndexInSeries_ = (
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 956
diff changeset
203 dicom.ParseUnsignedInteger32(indexInSeries_, Orthanc::DICOM_TAG_INSTANCE_NUMBER) ||
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 956
diff changeset
204 dicom.ParseUnsignedInteger32(indexInSeries_, Orthanc::DICOM_TAG_IMAGE_INDEX));
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
205 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
207
1642
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
208 const Orthanc::DicomImageInformation& DicomInstanceParameters::GetImageInformation() const
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
209 {
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
210 assert(tags_.get() != NULL);
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
211
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
212 if (imageInformation_.get() == NULL)
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
213 {
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
214 const_cast<DicomInstanceParameters&>(*this).imageInformation_.
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
215 reset(new Orthanc::DicomImageInformation(GetTags()));
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
216
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
217 assert(imageInformation_->GetWidth() == GetWidth());
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
218 assert(imageInformation_->GetHeight() == GetHeight());
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
219 assert(imageInformation_->GetNumberOfFrames() == GetNumberOfFrames());
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
220 }
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
221
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
222 assert(imageInformation_.get() != NULL);
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
223 return *imageInformation_;
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
224 }
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
225
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
226
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
227 CoordinateSystem3D DicomInstanceParameters::GetFrameGeometry(unsigned int frame) const
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
228 {
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
229 if (frame >= data_.numberOfFrames_)
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
230 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
231 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
232 }
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
233 else if (data_.frameOffsets_.empty())
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
234 {
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
235 return data_.geometry_;
1634
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
236 }
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
237 else
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
238 {
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
239 assert(data_.frameOffsets_.size() == data_.numberOfFrames_);
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
240
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
241 return CoordinateSystem3D(
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
242 data_.geometry_.GetOrigin() + data_.frameOffsets_[frame] * data_.geometry_.GetNormal(),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
243 data_.geometry_.GetAxisX(),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
244 data_.geometry_.GetAxisY());
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
245 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
246 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
247
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
248
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
249 bool DicomInstanceParameters::IsPlaneWithinSlice(unsigned int frame,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
250 const CoordinateSystem3D& plane) const
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
251 {
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
252 if (frame >= data_.numberOfFrames_)
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
253 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
254 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
255 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
256
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
257 CoordinateSystem3D tmp = data_.geometry_;
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
258
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
259 if (frame != 0)
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
260 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
261 tmp = GetFrameGeometry(frame);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
262 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
263
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
264 double distance;
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
265
757
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 746
diff changeset
266 return (CoordinateSystem3D::ComputeDistance(distance, tmp, plane) &&
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
267 distance <= data_.sliceThickness_ / 2.0);
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
268 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
269
1637
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
270
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
271 bool DicomInstanceParameters::IsColor() const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
272 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
273 Orthanc::PhotometricInterpretation photometric =
1642
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
274 GetImageInformation().GetPhotometricInterpretation();
1637
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
275
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
276 return (photometric != Orthanc::PhotometricInterpretation_Monochrome1 &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
277 photometric != Orthanc::PhotometricInterpretation_Monochrome2);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
278 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
279
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
280
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
281 void DicomInstanceParameters::ApplyRescaleAndDoseScaling(Orthanc::ImageAccessor& image,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
282 bool useDouble) const
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
283 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
284 if (image.GetFormat() != Orthanc::PixelFormat_Float32)
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
285 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
286 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
287 }
1141
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
288
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
289 double factor = data_.doseGridScaling_;
1141
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
290 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
291
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
292 if (data_.hasRescale_)
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
293 {
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
294 factor *= data_.rescaleSlope_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
295 offset = data_.rescaleIntercept_;
1141
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
296 }
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
297
1634
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
298 if (!LinearAlgebra::IsNear(factor, 1) ||
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
299 !LinearAlgebra::IsNear(offset, 0))
1141
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
300 {
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
301 const unsigned int width = image.GetWidth();
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
302 const unsigned int height = image.GetHeight();
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
303
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
304 for (unsigned int y = 0; y < height; y++)
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
305 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
306 float* p = reinterpret_cast<float*>(image.GetRow(y));
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
307
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
308 if (useDouble)
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
309 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
310 // Slower, accurate implementation using double
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
311 for (unsigned int x = 0; x < width; x++, p++)
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
312 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
313 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
314 *p = static_cast<float>(value * factor + offset);
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
315 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
316 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
317 else
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
318 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
319 // Fast, approximate implementation using float
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
320 for (unsigned int x = 0; x < width; x++, p++)
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
321 {
1141
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to
Benjamin Golinvaux <bgo@osimis.io>
parents: 1091
diff changeset
322 *p = (*p) * static_cast<float>(factor) + static_cast<float>(offset);
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
323 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
324 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
325 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
326 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
327 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
328
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
329 double DicomInstanceParameters::GetRescaleIntercept() const
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
330 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
331 if (data_.hasRescale_)
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
332 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
333 return data_.rescaleIntercept_;
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
334 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
335 else
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
336 {
956
a7351ad54960 Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents: 949
diff changeset
337 LOG(ERROR) << "DicomInstanceParameters::GetRescaleIntercept(): !data_.hasRescale_";
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
338 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
339 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
340 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
341
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
342
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
343 double DicomInstanceParameters::GetRescaleSlope() const
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
344 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
345 if (data_.hasRescale_)
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
346 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
347 return data_.rescaleSlope_;
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
348 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
349 else
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
350 {
956
a7351ad54960 Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents: 949
diff changeset
351 LOG(ERROR) << "DicomInstanceParameters::GetRescaleSlope(): !data_.hasRescale_";
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
352 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
353 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
354 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
355
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
356
1637
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
357 Orthanc::PixelFormat DicomInstanceParameters::GetExpectedPixelFormat() const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
358 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
359 if (GetSopClassUid() == SopClassUid_RTDose)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
360 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
361 switch (GetImageInformation().GetBitsStored())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
362 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
363 case 16:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
364 return Orthanc::PixelFormat_Grayscale16;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
365
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
366 case 32:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
367 return Orthanc::PixelFormat_Grayscale32;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
368
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
369 default:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
370 return Orthanc::PixelFormat_Grayscale16; // Rough guess
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
371 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
372 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
373 else if (IsColor())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
374 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
375 return Orthanc::PixelFormat_RGB24;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
376 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
377 else if (GetImageInformation().IsSigned())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
378 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
379 return Orthanc::PixelFormat_SignedGrayscale16;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
380 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
381 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
382 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
383 return Orthanc::PixelFormat_Grayscale16; // Rough guess
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
384 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
385 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
386
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1636
diff changeset
387
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
388 float DicomInstanceParameters::GetDefaultWindowingCenter() const
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
389 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
390 if (data_.hasDefaultWindowing_)
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
391 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
392 return data_.defaultWindowingCenter_;
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
393 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
394 else
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
395 {
1481
970ee51fe01f fix comment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1455
diff changeset
396 LOG(ERROR) << "DicomInstanceParameters::GetDefaultWindowingCenter(): no default windowing";
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
397 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
398 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
399 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
400
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
401
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
402 float DicomInstanceParameters::GetDefaultWindowingWidth() const
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
403 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
404 if (data_.hasDefaultWindowing_)
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
405 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
406 return data_.defaultWindowingWidth_;
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
407 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
408 else
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
409 {
1481
970ee51fe01f fix comment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1455
diff changeset
410 LOG(ERROR) << "DicomInstanceParameters::GetDefaultWindowingWidth(): no default windowing";
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
411 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
412 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
413 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
414
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
415
768
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
416 Orthanc::ImageAccessor* DicomInstanceParameters::ConvertToFloat(const Orthanc::ImageAccessor& pixelData) const
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
417 {
1298
8a0a62189f46 replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1291
diff changeset
418 std::unique_ptr<Orthanc::Image> converted(new Orthanc::Image(Orthanc::PixelFormat_Float32,
1634
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
419 pixelData.GetWidth(),
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
420 pixelData.GetHeight(),
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
421 false));
768
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
422 Orthanc::ImageProcessing::Convert(*converted, pixelData);
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
423
1287
8e82fdc6200e Heavy (temporary) logging in the path that leads
Benjamin Golinvaux <bgo@osimis.io>
parents: 1270
diff changeset
424
768
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
425 // Correct rescale slope/intercept if need be
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
426 //ApplyRescaleAndDoseScaling(*converted, (pixelData.GetFormat() == Orthanc::PixelFormat_Grayscale32));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
427 ApplyRescaleAndDoseScaling(*converted, false);
768
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
428
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
429 return converted.release();
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
430 }
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
431
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
432
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
433 TextureBaseSceneLayer* DicomInstanceParameters::CreateTexture
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
434 (const Orthanc::ImageAccessor& pixelData) const
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
435 {
1353
af65bce18951 Dummy commented debug block
Benjamin Golinvaux <bgo@osimis.io>
parents: 1300
diff changeset
436 // {
af65bce18951 Dummy commented debug block
Benjamin Golinvaux <bgo@osimis.io>
parents: 1300
diff changeset
437 // const Orthanc::ImageAccessor& source = pixelData;
af65bce18951 Dummy commented debug block
Benjamin Golinvaux <bgo@osimis.io>
parents: 1300
diff changeset
438 // const void* sourceBuffer = source.GetConstBuffer();
af65bce18951 Dummy commented debug block
Benjamin Golinvaux <bgo@osimis.io>
parents: 1300
diff changeset
439 // intptr_t sourceBufferInt = reinterpret_cast<intptr_t>(sourceBuffer);
af65bce18951 Dummy commented debug block
Benjamin Golinvaux <bgo@osimis.io>
parents: 1300
diff changeset
440 // int sourceWidth = source.GetWidth();
af65bce18951 Dummy commented debug block
Benjamin Golinvaux <bgo@osimis.io>
parents: 1300
diff changeset
441 // int sourceHeight = source.GetHeight();
af65bce18951 Dummy commented debug block
Benjamin Golinvaux <bgo@osimis.io>
parents: 1300
diff changeset
442 // int sourcePitch = source.GetPitch();
af65bce18951 Dummy commented debug block
Benjamin Golinvaux <bgo@osimis.io>
parents: 1300
diff changeset
443
af65bce18951 Dummy commented debug block
Benjamin Golinvaux <bgo@osimis.io>
parents: 1300
diff changeset
444 // // TODO: turn error into trace below
af65bce18951 Dummy commented debug block
Benjamin Golinvaux <bgo@osimis.io>
parents: 1300
diff changeset
445 // LOG(ERROR) << "ConvertGrayscaleToFloat | source:"
af65bce18951 Dummy commented debug block
Benjamin Golinvaux <bgo@osimis.io>
parents: 1300
diff changeset
446 // << " W = " << sourceWidth << " H = " << sourceHeight
af65bce18951 Dummy commented debug block
Benjamin Golinvaux <bgo@osimis.io>
parents: 1300
diff changeset
447 // << " P = " << sourcePitch << " B = " << sourceBufferInt
af65bce18951 Dummy commented debug block
Benjamin Golinvaux <bgo@osimis.io>
parents: 1300
diff changeset
448 // << " B % 4 == " << sourceBufferInt % 4;
af65bce18951 Dummy commented debug block
Benjamin Golinvaux <bgo@osimis.io>
parents: 1300
diff changeset
449 // }
af65bce18951 Dummy commented debug block
Benjamin Golinvaux <bgo@osimis.io>
parents: 1300
diff changeset
450
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
451 assert(sizeof(float) == 4);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
452
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
453 Orthanc::PixelFormat sourceFormat = pixelData.GetFormat();
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
454
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
455 if (sourceFormat != GetExpectedPixelFormat())
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
456 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
457 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
458 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
459
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
460 if (sourceFormat == Orthanc::PixelFormat_RGB24)
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
461 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
462 // This is the case of a color image. No conversion has to be done.
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
463 return new ColorTextureSceneLayer(pixelData);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
464 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
465 else
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
466 {
768
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
467 // This is the case of a grayscale frame. Convert it to Float32.
1298
8a0a62189f46 replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1291
diff changeset
468 std::unique_ptr<FloatTextureSceneLayer> texture;
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
469
768
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
470 if (pixelData.GetFormat() == Orthanc::PixelFormat_Float32)
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
471 {
768
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
472 texture.reset(new FloatTextureSceneLayer(pixelData));
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
473 }
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
474 else
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
475 {
1298
8a0a62189f46 replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1291
diff changeset
476 std::unique_ptr<Orthanc::ImageAccessor> converted(ConvertToFloat(pixelData));
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
477 texture.reset(new FloatTextureSceneLayer(*converted));
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
478 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
479
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
480 if (data_.hasDefaultWindowing_)
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
481 {
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
482 texture->SetCustomWindowing(data_.defaultWindowingCenter_,
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
483 data_.defaultWindowingWidth_);
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
484 }
1206
c93a6218f0cd Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents: 1141
diff changeset
485
1642
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1639
diff changeset
486 switch (GetImageInformation().GetPhotometricInterpretation())
1206
c93a6218f0cd Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents: 1141
diff changeset
487 {
1634
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
488 case Orthanc::PhotometricInterpretation_Monochrome1:
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
489 texture->SetInverted(true);
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
490 break;
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
491
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
492 case Orthanc::PhotometricInterpretation_Monochrome2:
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
493 texture->SetInverted(false);
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
494 break;
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
495
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
496 default:
a4418a489e86 improving robustness of DicomInstanceParameters
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
497 break;
1206
c93a6218f0cd Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents: 1141
diff changeset
498 }
c93a6218f0cd Fixed photometric interpretation in texture creation
Benjamin Golinvaux <bgo@osimis.io>
parents: 1141
diff changeset
499
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
500 return texture.release();
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
501 }
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
502 }
768
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
503
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 LookupTableTextureSceneLayer* DicomInstanceParameters::CreateLookupTableTexture
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
506 (const Orthanc::ImageAccessor& pixelData) const
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
507 {
1298
8a0a62189f46 replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1291
diff changeset
508 std::unique_ptr<FloatTextureSceneLayer> texture;
768
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
509
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
510 if (pixelData.GetFormat() == Orthanc::PixelFormat_Float32)
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 return new LookupTableTextureSceneLayer(pixelData);
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
513 }
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
514 else
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
515 {
1298
8a0a62189f46 replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1291
diff changeset
516 std::unique_ptr<Orthanc::ImageAccessor> converted(ConvertToFloat(pixelData));
768
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
517 return new LookupTableTextureSceneLayer(*converted);
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
518 }
55411e7da2f7 LookupTableTextureSceneLayer
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 762
diff changeset
519 }
980
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
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 956
diff changeset
522 unsigned int DicomInstanceParameters::GetIndexInSeries() const
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 956
diff changeset
523 {
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 956
diff changeset
524 if (data_.hasIndexInSeries_)
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 return data_.indexInSeries_;
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 956
diff changeset
527 }
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 956
diff changeset
528 else
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 956
diff changeset
529 {
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 956
diff changeset
530 LOG(ERROR) << "DicomInstanceParameters::GetIndexInSeries(): !data_.hasIndexInSeries_";
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 956
diff changeset
531 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 956
diff changeset
532 }
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 956
diff changeset
533 }
1159
acb399643945 DicomInstanceParameters::ApplyRescale()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1141
diff changeset
534
acb399643945 DicomInstanceParameters::ApplyRescale()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1141
diff changeset
535
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
536 double DicomInstanceParameters::ApplyRescale(double value) const
1159
acb399643945 DicomInstanceParameters::ApplyRescale()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1141
diff changeset
537 {
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
538 double factor = data_.doseGridScaling_;
1159
acb399643945 DicomInstanceParameters::ApplyRescale()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1141
diff changeset
539 double offset = 0.0;
acb399643945 DicomInstanceParameters::ApplyRescale()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1141
diff changeset
540
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
541 if (data_.hasRescale_)
1159
acb399643945 DicomInstanceParameters::ApplyRescale()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1141
diff changeset
542 {
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
543 factor *= data_.rescaleSlope_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
544 offset = data_.rescaleIntercept_;
1159
acb399643945 DicomInstanceParameters::ApplyRescale()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1141
diff changeset
545 }
acb399643945 DicomInstanceParameters::ApplyRescale()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1141
diff changeset
546
acb399643945 DicomInstanceParameters::ApplyRescale()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1141
diff changeset
547 return (value * factor + offset);
acb399643945 DicomInstanceParameters::ApplyRescale()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1141
diff changeset
548 }
1161
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
549
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
550
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
551 bool DicomInstanceParameters::ComputeRegularSpacing(double& spacing) const
1161
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
552 {
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
553 if (data_.frameOffsets_.size() == 0) // Not a RT-DOSE
1161
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
554 {
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
555 return false;
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
556 }
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
557 else if (data_.frameOffsets_.size() == 1)
1161
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
558 {
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
559 spacing = 1; // Edge case: RT-DOSE with one single frame
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
560 return true;
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
561 }
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
562 else
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
563 {
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
564 assert(data_.frameOffsets_.size() == GetNumberOfFrames());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
565
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
566 spacing = std::abs(data_.frameOffsets_[1] - data_.frameOffsets_[0]);
1161
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
567
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
568 for (size_t i = 1; i + 1 < data_.frameOffsets_.size(); i++)
1161
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
569 {
1636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1635
diff changeset
570 double s = data_.frameOffsets_[i + 1] - data_.frameOffsets_[i];
1161
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
571 if (!LinearAlgebra::IsNear(spacing, s, 0.001))
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
572 {
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
573 return false;
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
574 }
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
575 }
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
576
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
577 return true;
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
578 }
19b1c8caade4 fix sagittal geometry
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1159
diff changeset
579 }
746
d716bfb3e07c reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
580 }