Mercurial > hg > orthanc-stone

comparison OrthancStone/Sources/Toolbox/DicomStructureSet.h @ 1895:14c8f339d480

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed redundant definitions Point2D, Point3D and Vector3D from DicomStructureSetUtils.h
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 19 Jan 2022 14:51:55 +0100
parents 90b5e116a5f9
children b3c08e607d9f
comparison
equal deleted inserted replaced
1894:438071a29f77 1895:14c8f339d480
27 27
28 #if !defined(ORTHANC_ENABLE_DCMTK) 28 #if !defined(ORTHANC_ENABLE_DCMTK)
29 # error The macro ORTHANC_ENABLE_DCMTK must be defined 29 # error The macro ORTHANC_ENABLE_DCMTK must be defined
30 #endif 30 #endif
31 31
32 #include "DicomStructureSetUtils.h"
33 #include "CoordinateSystem3D.h" 32 #include "CoordinateSystem3D.h"
34 #include "Extent2D.h" 33 #include "Extent2D.h"
35 #include "OrthancDatasets/FullOrthancDataset.h" 34 #include "OrthancDatasets/FullOrthancDataset.h"
36 #include "../Scene2D/Color.h" 35 #include "../Scene2D/Color.h"
37 #include "../Scene2D/PolylineSceneLayer.h" 36 #include "../Scene2D/PolylineSceneLayer.h"
161 160
162 Structure& GetStructure(size_t index); 161 Structure& GetStructure(size_t index);
163 162
164 bool ProjectStructure( 163 bool ProjectStructure(
165 #if USE_BOOST_UNION_FOR_POLYGONS == 1 164 #if USE_BOOST_UNION_FOR_POLYGONS == 1
166 std::vector< std::vector<Point2D> >& polygons, 165 std::vector< std::vector<ScenePoint2D> >& polygons,
167 #else 166 #else
168 std::vector< std::pair<Point2D, Point2D> >& segments, 167 std::vector< std::pair<ScenePoint2D, ScenePoint2D> >& segments,
169 #endif 168 #endif
170 const Structure& structure, 169 const Structure& structure,
171 const CoordinateSystem3D& slice) const; 170 const CoordinateSystem3D& slice) const;
172 171
173 void EstimateGeometry(); 172 void EstimateGeometry();
207 void CheckReferencedSlices(); 206 void CheckReferencedSlices();
208 207
209 Vector GetNormal() const; 208 Vector GetNormal() const;
210 209
211 #if USE_BOOST_UNION_FOR_POLYGONS == 1 210 #if USE_BOOST_UNION_FOR_POLYGONS == 1
212 bool ProjectStructure(std::vector< std::vector<Point2D> >& polygons, 211 bool ProjectStructure(std::vector< std::vector<ScenePoint2D> >& polygons,
213 size_t index, 212 size_t index,
214 const CoordinateSystem3D& slice) const 213 const CoordinateSystem3D& slice) const
215 { 214 {
216 return ProjectStructure(polygons, GetStructure(index), slice); 215 return ProjectStructure(polygons, GetStructure(index), slice);
217 } 216 }
218 #else 217 #else
219 bool ProjectStructure(std::vector< std::pair<Point2D, Point2D> >& segments, 218 bool ProjectStructure(std::vector< std::pair<ScenePoint2D, ScenePoint2D> >& segments,
220 size_t index, 219 size_t index,
221 const CoordinateSystem3D& slice) const 220 const CoordinateSystem3D& slice) const
222 { 221 {
223 return ProjectStructure(segments, GetStructure(index), slice); 222 return ProjectStructure(segments, GetStructure(index), slice);
224 } 223 }