Mercurial > hg > orthanc-stone
comparison Framework/Toolbox/DicomStructureSet.h @ 1006:4f28d9459e31 toa2019092001
Fixed unit tests and deprecated classes according to last API changes. UT all run ok.
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Fri, 20 Sep 2019 12:13:10 +0200 |
parents | 50e5acf5553b |
children | 709aa65aca17 2d8ab34c8c91 |
comparison
equal
deleted
inserted
replaced
1005:7e861cfd142d | 1006:4f28d9459e31 |
---|---|
24 #include "DicomStructureSetUtils.h" | 24 #include "DicomStructureSetUtils.h" |
25 #include "CoordinateSystem3D.h" | 25 #include "CoordinateSystem3D.h" |
26 #include "Extent2D.h" | 26 #include "Extent2D.h" |
27 #include "../Scene2D/Color.h" | 27 #include "../Scene2D/Color.h" |
28 | 28 |
29 //#define USE_OLD_SJO_CUT_CODE 1 | 29 //#define USE_BOOST_UNION_FOR_POLYGONS 1 |
30 | 30 |
31 #include <Plugins/Samples/Common/FullOrthancDataset.h> | 31 #include <Plugins/Samples/Common/FullOrthancDataset.h> |
32 | 32 |
33 #include <list> | 33 #include <list> |
34 | 34 |
139 | 139 |
140 const Structure& GetStructure(size_t index) const; | 140 const Structure& GetStructure(size_t index) const; |
141 | 141 |
142 Structure& GetStructure(size_t index); | 142 Structure& GetStructure(size_t index); |
143 | 143 |
144 #ifdef USE_OLD_SJO_CUT_CODE | 144 #ifdef USE_BOOST_UNION_FOR_POLYGONS |
145 bool ProjectStructure(std::vector< std::vector<Point2D> >& polygons, | 145 bool ProjectStructure(std::vector< std::vector<Point2D> >& polygons, |
146 const Structure& structure, | 146 const Structure& structure, |
147 const CoordinateSystem3D& slice) const; | 147 const CoordinateSystem3D& slice) const; |
148 #else | 148 #else |
149 bool ProjectStructure(std::vector< std::pair<Point2D, Point2D> >& segments, | 149 bool ProjectStructure(std::vector< std::pair<Point2D, Point2D> >& segments, |
183 | 183 |
184 void CheckReferencedSlices(); | 184 void CheckReferencedSlices(); |
185 | 185 |
186 Vector GetNormal() const; | 186 Vector GetNormal() const; |
187 | 187 |
188 #ifdef USE_OLD_SJO_CUT_CODE | 188 #ifdef USE_BOOST_UNION_FOR_POLYGONS |
189 bool ProjectStructure(std::vector< std::vector<Point2D> >& polygons, | 189 bool ProjectStructure(std::vector< std::vector<Point2D> >& polygons, |
190 size_t index, | 190 size_t index, |
191 const CoordinateSystem3D& slice) const | 191 const CoordinateSystem3D& slice) const |
192 { | 192 { |
193 return ProjectStructure(polygons, GetStructure(index), slice); | 193 return ProjectStructure(polygons, GetStructure(index), slice); |