comparison Framework/Toolbox/Slice.h @ 714:d2c0e347ddc2

deprecating DicomFrameConverter
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 20 May 2019 16:26:34 +0200
parents 1088d4c4d78c
children
comparison
equal deleted inserted replaced
713:e63c8b9b7b02 714:d2c0e347ddc2
25 #include "DicomFrameConverter.h" 25 #include "DicomFrameConverter.h"
26 26
27 #include <Core/DicomFormat/DicomImageInformation.h> 27 #include <Core/DicomFormat/DicomImageInformation.h>
28 #include <Core/IDynamicObject.h> 28 #include <Core/IDynamicObject.h>
29 29
30 namespace OrthancStone 30 namespace Deprecated
31 { 31 {
32 // TODO - Remove this class 32 // TODO - Remove this class
33 class Slice : 33 class Slice :
34 public Orthanc::IDynamicObject /* to be used as a payload of SlicesSorter */ 34 public Orthanc::IDynamicObject /* to be used as a payload of SlicesSorter */
35 { 35 {
49 Type type_; 49 Type type_;
50 std::string orthancInstanceId_; 50 std::string orthancInstanceId_;
51 std::string sopClassUid_; 51 std::string sopClassUid_;
52 unsigned int frame_; 52 unsigned int frame_;
53 unsigned int frameCount_; // TODO : Redundant with "imageInformation_" 53 unsigned int frameCount_; // TODO : Redundant with "imageInformation_"
54 CoordinateSystem3D geometry_; 54 OrthancStone::CoordinateSystem3D geometry_;
55 double pixelSpacingX_; 55 double pixelSpacingX_;
56 double pixelSpacingY_; 56 double pixelSpacingY_;
57 double thickness_; 57 double thickness_;
58 unsigned int width_; // TODO : Redundant with "imageInformation_" 58 unsigned int width_; // TODO : Redundant with "imageInformation_"
59 unsigned int height_; // TODO : Redundant with "imageInformation_" 59 unsigned int height_; // TODO : Redundant with "imageInformation_"
77 { 77 {
78 } 78 }
79 79
80 // TODO Is this constructor the best way to go to tackle missing 80 // TODO Is this constructor the best way to go to tackle missing
81 // layers within SliceViewerWidget? 81 // layers within SliceViewerWidget?
82 Slice(const CoordinateSystem3D& plane, 82 Slice(const OrthancStone::CoordinateSystem3D& plane,
83 double thickness) : 83 double thickness) :
84 type_(Type_Standalone), 84 type_(Type_Standalone),
85 frame_(0), 85 frame_(0),
86 frameCount_(0), 86 frameCount_(0),
87 geometry_(plane), 87 geometry_(plane),
91 width_(0), 91 width_(0),
92 height_(0) 92 height_(0)
93 { 93 {
94 } 94 }
95 95
96 Slice(const CoordinateSystem3D& plane, 96 Slice(const OrthancStone::CoordinateSystem3D& plane,
97 double pixelSpacingX, 97 double pixelSpacingX,
98 double pixelSpacingY, 98 double pixelSpacingY,
99 double thickness, 99 double thickness,
100 unsigned int width, 100 unsigned int width,
101 unsigned int height, 101 unsigned int height,
128 128
129 const std::string GetOrthancInstanceId() const; 129 const std::string GetOrthancInstanceId() const;
130 130
131 unsigned int GetFrame() const; 131 unsigned int GetFrame() const;
132 132
133 const CoordinateSystem3D& GetGeometry() const; 133 const OrthancStone::CoordinateSystem3D& GetGeometry() const;
134 134
135 double GetThickness() const; 135 double GetThickness() const;
136 136
137 double GetPixelSpacingX() const; 137 double GetPixelSpacingX() const;
138 138
142 142
143 unsigned int GetHeight() const; 143 unsigned int GetHeight() const;
144 144
145 const DicomFrameConverter& GetConverter() const; 145 const DicomFrameConverter& GetConverter() const;
146 146
147 bool ContainsPlane(const CoordinateSystem3D& plane) const; 147 bool ContainsPlane(const OrthancStone::CoordinateSystem3D& plane) const;
148 148
149 void GetExtent(std::vector<Vector>& points) const; 149 void GetExtent(std::vector<OrthancStone::Vector>& points) const;
150 150
151 const Orthanc::DicomImageInformation& GetImageInformation() const; 151 const Orthanc::DicomImageInformation& GetImageInformation() const;
152 152
153 Slice* Clone() const; 153 Slice* Clone() const;
154 }; 154 };