Mercurial > hg > orthanc-stone

diff 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
line wrap: on
line diff
--- a/OrthancStone/Sources/Toolbox/DicomStructureSet.h	Wed Jan 19 14:25:59 2022 +0100
+++ b/OrthancStone/Sources/Toolbox/DicomStructureSet.h	Wed Jan 19 14:51:55 2022 +0100
@@ -29,7 +29,6 @@
 #  error The macro ORTHANC_ENABLE_DCMTK must be defined
 #endif
 
-#include "DicomStructureSetUtils.h"
 #include "CoordinateSystem3D.h"
 #include "Extent2D.h"
 #include "OrthancDatasets/FullOrthancDataset.h"
@@ -163,9 +162,9 @@
   
     bool ProjectStructure(
 #if USE_BOOST_UNION_FOR_POLYGONS == 1
-      std::vector< std::vector<Point2D> >& polygons,
+      std::vector< std::vector<ScenePoint2D> >& polygons,
 #else
-      std::vector< std::pair<Point2D, Point2D> >& segments,
+      std::vector< std::pair<ScenePoint2D, ScenePoint2D> >& segments,
 #endif
       const Structure& structure,
       const CoordinateSystem3D& slice) const;
@@ -209,14 +208,14 @@
     Vector GetNormal() const;
 
 #if USE_BOOST_UNION_FOR_POLYGONS == 1
-    bool ProjectStructure(std::vector< std::vector<Point2D> >& polygons,
+    bool ProjectStructure(std::vector< std::vector<ScenePoint2D> >& polygons,
                           size_t index,
                           const CoordinateSystem3D& slice) const
     {
       return ProjectStructure(polygons, GetStructure(index), slice);
     }
 #else
-    bool ProjectStructure(std::vector< std::pair<Point2D, Point2D> >& segments,
+    bool ProjectStructure(std::vector< std::pair<ScenePoint2D, ScenePoint2D> >& segments,
                           size_t index,
                           const CoordinateSystem3D& slice) const
     {