orthanc-stone: OrthancStone/Sources/Toolbox/DicomInstanceParameters.cpp annotate

annotate OrthancStone/Sources/Toolbox/DicomInstanceParameters.cpp @ 1646:4e14735e98f8

preparing to remove FrameExtent

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Thu, 12 Nov 2020 15:16:21 +0100
parents	5cc589bfb385
children	51bab5188a13

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 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	39 static void ExtractFrameOffsets(Vector& target,
d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	40 const Orthanc::DicomMap& dicom,
d1e0b08b809d cont 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 d1e0b08b809d cont 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 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	60 if (!LinearAlgebra::ParseVector(target, dicom, Orthanc::DICOM_TAG_GRID_FRAME_OFFSET_VECTOR) \|\|
d1e0b08b809d cont 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 d1e0b08b809d cont 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));
1646 4e14735e98f8 preparing to remove FrameExtent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1642 diff changeset	205
4e14735e98f8 preparing to remove FrameExtent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1642 diff changeset	206 if (!dicom.LookupStringValue(
4e14735e98f8 preparing to remove FrameExtent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1642 diff changeset	207 frameOfReferenceUid_, Orthanc::DICOM_TAG_FRAME_OF_REFERENCE_UID, false))
4e14735e98f8 preparing to remove FrameExtent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1642 diff changeset	208 {
4e14735e98f8 preparing to remove FrameExtent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1642 diff changeset	209 frameOfReferenceUid_.clear();
4e14735e98f8 preparing to remove FrameExtent Sebastien Jodogne <s.jodogne@gmail.com> parents: 1642 diff changeset	210 }
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	211 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	212
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	213
1642 5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	214 const Orthanc::DicomImageInformation& DicomInstanceParameters::GetImageInformation() const
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	215 {
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	216 assert(tags_.get() != NULL);
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	217
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	218 if (imageInformation_.get() == NULL)
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	219 {
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	220 const_cast<DicomInstanceParameters&>(*this).imageInformation_.
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	221 reset(new Orthanc::DicomImageInformation(GetTags()));
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	222
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	223 assert(imageInformation_->GetWidth() == GetWidth());
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	224 assert(imageInformation_->GetHeight() == GetHeight());
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	225 assert(imageInformation_->GetNumberOfFrames() == GetNumberOfFrames());
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	226 }
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	227
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	228 assert(imageInformation_.get() != NULL);
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	229 return *imageInformation_;
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	230 }
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	231
5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	232
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	233 CoordinateSystem3D DicomInstanceParameters::GetFrameGeometry(unsigned int frame) const
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234 {
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	235 if (frame >= data_.numberOfFrames_)
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238 }
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	239 else if (data_.frameOffsets_.empty())
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 {
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	241 return data_.geometry_;
1634 a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	242 }
a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	243 else
a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	244 {
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	245 assert(data_.frameOffsets_.size() == data_.numberOfFrames_);
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247 return CoordinateSystem3D(
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	248 data_.geometry_.GetOrigin() + data_.frameOffsets_[frame] * data_.geometry_.GetNormal(),
d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	249 data_.geometry_.GetAxisX(),
d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	250 data_.geometry_.GetAxisY());
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	255 bool DicomInstanceParameters::IsPlaneWithinSlice(unsigned int frame,
d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	256 const CoordinateSystem3D& plane) const
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	257 {
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	258 if (frame >= data_.numberOfFrames_)
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	259 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	260 throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	261 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	262
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	263 CoordinateSystem3D tmp = data_.geometry_;
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	264
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	265 if (frame != 0)
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 tmp = GetFrameGeometry(frame);
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	269
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	270 double distance;
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	271
757 f7c236894c1a cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 746 diff changeset	272 return (CoordinateSystem3D::ComputeDistance(distance, tmp, plane) &&
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	273 distance <= data_.sliceThickness_ / 2.0);
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	274 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	275
1637 d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	276
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	277 bool DicomInstanceParameters::IsColor() const
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	278 {
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	279 Orthanc::PhotometricInterpretation photometric =
1642 5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	280 GetImageInformation().GetPhotometricInterpretation();
1637 d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	281
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	282 return (photometric != Orthanc::PhotometricInterpretation_Monochrome1 &&
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	283 photometric != Orthanc::PhotometricInterpretation_Monochrome2);
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	284 }
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	285
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	286
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	287 void DicomInstanceParameters::ApplyRescaleAndDoseScaling(Orthanc::ImageAccessor& image,
d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	288 bool useDouble) const
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	289 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	290 if (image.GetFormat() != Orthanc::PixelFormat_Float32)
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	291 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	292 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat);
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 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
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	295 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	296 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	297
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	298 if (data_.hasRescale_)
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	299 {
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	300 factor *= data_.rescaleSlope_;
d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	301 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	302 }
7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to Benjamin Golinvaux <bgo@osimis.io> parents: 1091 diff changeset	303
1634 a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	304 if (!LinearAlgebra::IsNear(factor, 1) \|\|
a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	305 !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	306 {
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 const unsigned int width = image.GetWidth();
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	308 const unsigned int height = image.GetHeight();
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	310 for (unsigned int y = 0; y < height; y++)
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	312 float* p = reinterpret_cast<float*>(image.GetRow(y));
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	313
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314 if (useDouble)
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	316 // Slower, accurate implementation using double
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317 for (unsigned int x = 0; x < width; x++, p++)
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	318 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	319 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	320 p = static_cast<float>(value factor + offset);
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	321 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	322 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	323 else
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325 // Fast, approximate implementation using float
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	326 for (unsigned int x = 0; x < width; x++, p++)
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327 {
1141 7681f3943748 Changed handling of DoseGridScaling: before this commit, rescaleSlope was set to Benjamin Golinvaux <bgo@osimis.io> parents: 1091 diff changeset	328 p = (p) * static_cast<float>(factor) + static_cast<float>(offset);
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	330 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	331 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335 double DicomInstanceParameters::GetRescaleIntercept() const
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	336 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	337 if (data_.hasRescale_)
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	338 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	339 return data_.rescaleIntercept_;
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	340 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	341 else
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	342 {
956 a7351ad54960 Made IsContextLost automatically set the flag by checking with the emscripten Benjamin Golinvaux <bgo@osimis.io> parents: 949 diff changeset	343 LOG(ERROR) << "DicomInstanceParameters::GetRescaleIntercept(): !data_.hasRescale_";
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	345 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349 double DicomInstanceParameters::GetRescaleSlope() const
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 if (data_.hasRescale_)
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 return data_.rescaleSlope_;
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 else
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356 {
956 a7351ad54960 Made IsContextLost automatically set the flag by checking with the emscripten Benjamin Golinvaux <bgo@osimis.io> parents: 949 diff changeset	357 LOG(ERROR) << "DicomInstanceParameters::GetRescaleSlope(): !data_.hasRescale_";
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362
1637 d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	363 Orthanc::PixelFormat DicomInstanceParameters::GetExpectedPixelFormat() const
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	364 {
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	365 if (GetSopClassUid() == SopClassUid_RTDose)
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	366 {
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	367 switch (GetImageInformation().GetBitsStored())
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	368 {
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	369 case 16:
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	370 return Orthanc::PixelFormat_Grayscale16;
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	371
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	372 case 32:
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	373 return Orthanc::PixelFormat_Grayscale32;
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	374
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	375 default:
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	376 return Orthanc::PixelFormat_Grayscale16; // Rough guess
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	377 }
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	378 }
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	379 else if (IsColor())
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	380 {
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	381 return Orthanc::PixelFormat_RGB24;
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	382 }
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	383 else if (GetImageInformation().IsSigned())
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	384 {
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	385 return Orthanc::PixelFormat_SignedGrayscale16;
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	386 }
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	387 else
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	388 {
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	389 return Orthanc::PixelFormat_Grayscale16; // Rough guess
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	390 }
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	391 }
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	392
d569effcd433 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1636 diff changeset	393
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 float DicomInstanceParameters::GetDefaultWindowingCenter() const
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	396 if (data_.hasDefaultWindowing_)
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	397 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398 return data_.defaultWindowingCenter_;
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	400 else
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401 {
1481 970ee51fe01f fix comment Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	402 LOG(ERROR) << "DicomInstanceParameters::GetDefaultWindowingCenter(): no default windowing";
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	403 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	404 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	405 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	406
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	407
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	408 float DicomInstanceParameters::GetDefaultWindowingWidth() const
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	409 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	410 if (data_.hasDefaultWindowing_)
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	411 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 return data_.defaultWindowingWidth_;
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	414 else
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	415 {
1481 970ee51fe01f fix comment Sebastien Jodogne <s.jodogne@gmail.com> parents: 1455 diff changeset	416 LOG(ERROR) << "DicomInstanceParameters::GetDefaultWindowingWidth(): no default windowing";
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	417 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	418 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	419 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	420
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	421
768 55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	422 Orthanc::ImageAccessor* DicomInstanceParameters::ConvertToFloat(const Orthanc::ImageAccessor& pixelData) const
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	423 {
1298 8a0a62189f46 replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 1291 diff changeset	424 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	425 pixelData.GetWidth(),
a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	426 pixelData.GetHeight(),
a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	427 false));
768 55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	428 Orthanc::ImageProcessing::Convert(*converted, pixelData);
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	429
1287 8e82fdc6200e Heavy (temporary) logging in the path that leads Benjamin Golinvaux <bgo@osimis.io> parents: 1270 diff changeset	430
768 55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	431 // Correct rescale slope/intercept if need be
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	432 //ApplyRescaleAndDoseScaling(*converted, (pixelData.GetFormat() == Orthanc::PixelFormat_Grayscale32));
d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	433 ApplyRescaleAndDoseScaling(*converted, false);
768 55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	434
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	435 return converted.release();
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	436 }
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	437
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	438
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	439 TextureBaseSceneLayer* DicomInstanceParameters::CreateTexture
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	440 (const Orthanc::ImageAccessor& pixelData) const
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	441 {
1353 af65bce18951 Dummy commented debug block Benjamin Golinvaux <bgo@osimis.io> parents: 1300 diff changeset	442 // {
af65bce18951 Dummy commented debug block Benjamin Golinvaux <bgo@osimis.io> parents: 1300 diff changeset	443 // const Orthanc::ImageAccessor& source = pixelData;
af65bce18951 Dummy commented debug block Benjamin Golinvaux <bgo@osimis.io> parents: 1300 diff changeset	444 // const void* sourceBuffer = source.GetConstBuffer();
af65bce18951 Dummy commented debug block Benjamin Golinvaux <bgo@osimis.io> parents: 1300 diff changeset	445 // intptr_t sourceBufferInt = reinterpret_cast<intptr_t>(sourceBuffer);
af65bce18951 Dummy commented debug block Benjamin Golinvaux <bgo@osimis.io> parents: 1300 diff changeset	446 // int sourceWidth = source.GetWidth();
af65bce18951 Dummy commented debug block Benjamin Golinvaux <bgo@osimis.io> parents: 1300 diff changeset	447 // int sourceHeight = source.GetHeight();
af65bce18951 Dummy commented debug block Benjamin Golinvaux <bgo@osimis.io> parents: 1300 diff changeset	448 // int sourcePitch = source.GetPitch();
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 // // TODO: turn error into trace below
af65bce18951 Dummy commented debug block Benjamin Golinvaux <bgo@osimis.io> parents: 1300 diff changeset	451 // LOG(ERROR) << "ConvertGrayscaleToFloat \| source:"
af65bce18951 Dummy commented debug block Benjamin Golinvaux <bgo@osimis.io> parents: 1300 diff changeset	452 // << " W = " << sourceWidth << " H = " << sourceHeight
af65bce18951 Dummy commented debug block Benjamin Golinvaux <bgo@osimis.io> parents: 1300 diff changeset	453 // << " P = " << sourcePitch << " B = " << sourceBufferInt
af65bce18951 Dummy commented debug block Benjamin Golinvaux <bgo@osimis.io> parents: 1300 diff changeset	454 // << " B % 4 == " << sourceBufferInt % 4;
af65bce18951 Dummy commented debug block Benjamin Golinvaux <bgo@osimis.io> parents: 1300 diff changeset	455 // }
af65bce18951 Dummy commented debug block Benjamin Golinvaux <bgo@osimis.io> parents: 1300 diff changeset	456
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	457 assert(sizeof(float) == 4);
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	458
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	459 Orthanc::PixelFormat sourceFormat = pixelData.GetFormat();
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	460
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	461 if (sourceFormat != GetExpectedPixelFormat())
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	462 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	463 throw Orthanc::OrthancException(Orthanc::ErrorCode_IncompatibleImageFormat);
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	464 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	465
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	466 if (sourceFormat == Orthanc::PixelFormat_RGB24)
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	467 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	468 // 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	469 return new ColorTextureSceneLayer(pixelData);
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	470 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	471 else
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	472 {
768 55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	473 // 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	474 std::unique_ptr<FloatTextureSceneLayer> texture;
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	475
768 55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	476 if (pixelData.GetFormat() == Orthanc::PixelFormat_Float32)
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	477 {
768 55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	478 texture.reset(new FloatTextureSceneLayer(pixelData));
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	479 }
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	480 else
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	481 {
1298 8a0a62189f46 replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 1291 diff changeset	482 std::unique_ptr<Orthanc::ImageAccessor> converted(ConvertToFloat(pixelData));
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	483 texture.reset(new FloatTextureSceneLayer(*converted));
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	484 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	485
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	486 if (data_.hasDefaultWindowing_)
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	487 {
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	488 texture->SetCustomWindowing(data_.defaultWindowingCenter_,
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	489 data_.defaultWindowingWidth_);
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	490 }
1206 c93a6218f0cd Fixed photometric interpretation in texture creation Benjamin Golinvaux <bgo@osimis.io> parents: 1141 diff changeset	491
1642 5cc589bfb385 lazy computation of DicomInstanceParameters::GetImageInformation() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1639 diff changeset	492 switch (GetImageInformation().GetPhotometricInterpretation())
1206 c93a6218f0cd Fixed photometric interpretation in texture creation Benjamin Golinvaux <bgo@osimis.io> parents: 1141 diff changeset	493 {
1634 a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	494 case Orthanc::PhotometricInterpretation_Monochrome1:
a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	495 texture->SetInverted(true);
a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	496 break;
a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	497
a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	498 case Orthanc::PhotometricInterpretation_Monochrome2:
a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	499 texture->SetInverted(false);
a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	500 break;
a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	501
a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	502 default:
a4418a489e86 improving robustness of DicomInstanceParameters Sebastien Jodogne <s.jodogne@gmail.com> parents: 1598 diff changeset	503 break;
1206 c93a6218f0cd Fixed photometric interpretation in texture creation Benjamin Golinvaux <bgo@osimis.io> parents: 1141 diff changeset	504 }
c93a6218f0cd Fixed photometric interpretation in texture creation Benjamin Golinvaux <bgo@osimis.io> parents: 1141 diff changeset	505
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	506 return texture.release();
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	507 }
d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	508 }
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
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	511 LookupTableTextureSceneLayer* DicomInstanceParameters::CreateLookupTableTexture
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	512 (const Orthanc::ImageAccessor& pixelData) const
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	513 {
1298 8a0a62189f46 replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 1291 diff changeset	514 std::unique_ptr<FloatTextureSceneLayer> texture;
768 55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	515
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	516 if (pixelData.GetFormat() == Orthanc::PixelFormat_Float32)
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	517 {
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	518 return new LookupTableTextureSceneLayer(pixelData);
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	519 }
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	520 else
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	521 {
1298 8a0a62189f46 replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 1291 diff changeset	522 std::unique_ptr<Orthanc::ImageAccessor> converted(ConvertToFloat(pixelData));
768 55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	523 return new LookupTableTextureSceneLayer(*converted);
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	524 }
55411e7da2f7 LookupTableTextureSceneLayer Sebastien Jodogne <s.jodogne@gmail.com> parents: 762 diff changeset	525 }
980 8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries() Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	526
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 unsigned int DicomInstanceParameters::GetIndexInSeries() const
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 if (data_.hasIndexInSeries_)
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries() Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	531 {
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries() Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	532 return data_.indexInSeries_;
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries() Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	533 }
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries() Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	534 else
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries() Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	535 {
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries() Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	536 LOG(ERROR) << "DicomInstanceParameters::GetIndexInSeries(): !data_.hasIndexInSeries_";
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries() Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	537 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries() Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	538 }
8e497a4e3d96 DicomInstanceParameters::GetIndexInSeries() Sebastien Jodogne <s.jodogne@gmail.com> parents: 956 diff changeset	539 }
1159 acb399643945 DicomInstanceParameters::ApplyRescale() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1141 diff changeset	540
acb399643945 DicomInstanceParameters::ApplyRescale() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1141 diff changeset	541
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	542 double DicomInstanceParameters::ApplyRescale(double value) const
1159 acb399643945 DicomInstanceParameters::ApplyRescale() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1141 diff changeset	543 {
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	544 double factor = data_.doseGridScaling_;
1159 acb399643945 DicomInstanceParameters::ApplyRescale() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1141 diff changeset	545 double offset = 0.0;
acb399643945 DicomInstanceParameters::ApplyRescale() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1141 diff changeset	546
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	547 if (data_.hasRescale_)
1159 acb399643945 DicomInstanceParameters::ApplyRescale() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1141 diff changeset	548 {
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	549 factor *= data_.rescaleSlope_;
d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	550 offset = data_.rescaleIntercept_;
1159 acb399643945 DicomInstanceParameters::ApplyRescale() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1141 diff changeset	551 }
acb399643945 DicomInstanceParameters::ApplyRescale() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1141 diff changeset	552
acb399643945 DicomInstanceParameters::ApplyRescale() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1141 diff changeset	553 return (value * factor + offset);
acb399643945 DicomInstanceParameters::ApplyRescale() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1141 diff changeset	554 }
1161 19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	555
19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	556
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	557 bool DicomInstanceParameters::ComputeRegularSpacing(double& spacing) const
1161 19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	558 {
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	559 if (data_.frameOffsets_.size() == 0) // Not a RT-DOSE
1161 19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	560 {
19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	561 return false;
19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	562 }
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	563 else if (data_.frameOffsets_.size() == 1)
1161 19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	564 {
19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	565 spacing = 1; // Edge case: RT-DOSE with one single frame
19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	566 return true;
19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	567 }
19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	568 else
19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	569 {
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	570 assert(data_.frameOffsets_.size() == GetNumberOfFrames());
d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	571
d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	572 spacing = std::abs(data_.frameOffsets_[1] - data_.frameOffsets_[0]);
1161 19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	573
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	574 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	575 {
1636 d1e0b08b809d cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 1635 diff changeset	576 double s = data_.frameOffsets_[i + 1] - data_.frameOffsets_[i];
1161 19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	577 if (!LinearAlgebra::IsNear(spacing, s, 0.001))
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 return false;
19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	580 }
19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	581 }
19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	582
19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	583 return true;
19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	584 }
19b1c8caade4 fix sagittal geometry Sebastien Jodogne <s.jodogne@gmail.com> parents: 1159 diff changeset	585 }
746 d716bfb3e07c reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	586 }

Mercurial > hg > orthanc-stone

annotate OrthancStone/Sources/Toolbox/DicomInstanceParameters.cpp @ 1646:4e14735e98f8