Mercurial > hg > orthanc-stone

diff OrthancStone/Sources/Toolbox/DicomStructureSet.h @ 1896:b3c08e607d9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplified signature of DicomStructureSet::ProjectStructure()
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 26 Jan 2022 17:19:37 +0100
parents 14c8f339d480
children a5e54bd87b25
line wrap: on
line diff
--- a/OrthancStone/Sources/Toolbox/DicomStructureSet.h	Wed Jan 19 14:51:55 2022 +0100
+++ b/OrthancStone/Sources/Toolbox/DicomStructureSet.h	Wed Jan 26 17:19:37 2022 +0100
@@ -40,8 +40,6 @@
 #  include <DicomParsing/ParsedDicomFile.h>
 #endif
 
-//#define USE_BOOST_UNION_FOR_POLYGONS 1
-
 
 #include <list>
 
@@ -160,14 +158,9 @@
 
     Structure& GetStructure(size_t index);
   
-    bool ProjectStructure(
-#if USE_BOOST_UNION_FOR_POLYGONS == 1
-      std::vector< std::vector<ScenePoint2D> >& polygons,
-#else
-      std::vector< std::pair<ScenePoint2D, ScenePoint2D> >& segments,
-#endif
-      const Structure& structure,
-      const CoordinateSystem3D& slice) const;
+    bool ProjectStructure(std::vector< std::vector<ScenePoint2D> >& chains,
+                          const Structure& structure,
+                          const CoordinateSystem3D& slice) const;
 
     void EstimateGeometry();
     
@@ -207,21 +200,12 @@
 
     Vector GetNormal() const;
 
-#if USE_BOOST_UNION_FOR_POLYGONS == 1
-    bool ProjectStructure(std::vector< std::vector<ScenePoint2D> >& polygons,
+    bool ProjectStructure(std::vector< std::vector<ScenePoint2D> >& chains,
                           size_t index,
                           const CoordinateSystem3D& slice) const
     {
-      return ProjectStructure(polygons, GetStructure(index), slice);
+      return ProjectStructure(chains, GetStructure(index), slice);
     }
-#else
-    bool ProjectStructure(std::vector< std::pair<ScenePoint2D, ScenePoint2D> >& segments,
-                          size_t index,
-                          const CoordinateSystem3D& slice) const
-    {
-      return ProjectStructure(segments, GetStructure(index), slice);
-    }
-#endif
 
     void ProjectOntoLayer(PolylineSceneLayer& layer,
                           const CoordinateSystem3D& plane,