comparison Framework/Toolbox/Slice.cpp @ 110:53025eecbc95 wasm

renamed SliceGeometry as CoordinateSystem3D
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 14 Jun 2017 15:50:38 +0200
parents fcec0ab44054
children 2eca030792aa
comparison
equal deleted inserted replaced
109:53bd9277b025 110:53025eecbc95
51 51
52 std::string position, orientation; 52 std::string position, orientation;
53 if (dataset.GetStringValue(position, OrthancPlugins::DICOM_TAG_IMAGE_POSITION_PATIENT) && 53 if (dataset.GetStringValue(position, OrthancPlugins::DICOM_TAG_IMAGE_POSITION_PATIENT) &&
54 dataset.GetStringValue(orientation, OrthancPlugins::DICOM_TAG_IMAGE_ORIENTATION_PATIENT)) 54 dataset.GetStringValue(orientation, OrthancPlugins::DICOM_TAG_IMAGE_ORIENTATION_PATIENT))
55 { 55 {
56 geometry_ = SliceGeometry(position, orientation); 56 geometry_ = CoordinateSystem3D(position, orientation);
57 } 57 }
58 58
59 if (reader.GetUnsignedIntegerValue(width_, OrthancPlugins::DICOM_TAG_COLUMNS) && 59 if (reader.GetUnsignedIntegerValue(width_, OrthancPlugins::DICOM_TAG_COLUMNS) &&
60 reader.GetUnsignedIntegerValue(height_, OrthancPlugins::DICOM_TAG_ROWS)) 60 reader.GetUnsignedIntegerValue(height_, OrthancPlugins::DICOM_TAG_ROWS))
61 { 61 {
93 93
94 return frame_; 94 return frame_;
95 } 95 }
96 96
97 97
98 const SliceGeometry& Slice::GetGeometry() const 98 const CoordinateSystem3D& Slice::GetGeometry() const
99 { 99 {
100 if (type_ == Type_Invalid) 100 if (type_ == Type_Invalid)
101 { 101 {
102 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); 102 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
103 } 103 }
170 170
171 return converter_; 171 return converter_;
172 } 172 }
173 173
174 174
175 bool Slice::ContainsPlane(const SliceGeometry& plane) const 175 bool Slice::ContainsPlane(const CoordinateSystem3D& plane) const
176 { 176 {
177 if (type_ == Type_Invalid) 177 if (type_ == Type_Invalid)
178 { 178 {
179 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); 179 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls);
180 } 180 }