Mercurial > hg > orthanc-stone

diff UnitTestsSources/TestStructureSet.cpp @ 1006:4f28d9459e31 toa2019092001

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2d69b8bee484
children efe1c44628a1
line wrap: on
line diff
--- a/UnitTestsSources/TestStructureSet.cpp	Fri Sep 20 12:01:20 2019 +0200
+++ b/UnitTestsSources/TestStructureSet.cpp	Fri Sep 20 12:13:10 2019 +0200
@@ -4810,14 +4810,14 @@
 }
 
 /*
-void DicomStructure2::AddSlabBoundaries(
+void AddSlabBoundaries(
   std::vector<std::pair<double, RectangleBoundaryKind> >& boundaries,
   const std::vector<RtStructRectanglesInSlab>& slabCuts, size_t iSlab)
 */
 
 
 /*
-void DicomStructure2::ProcessBoundaryList(
+void ProcessBoundaryList(
   std::vector< std::pair<Point2D, Point2D> >& segments,
   const std::vector<std::pair<double, RectangleBoundaryKind> >& boundaries,
   double y)
@@ -4830,7 +4830,7 @@
   std::vector<std::pair<double, RectangleBoundaryKind> > boundaries;
 
   boundaries.clear();
-  EXPECT_NO_THROW(DicomStructure2::AddSlabBoundaries(boundaries, slabCuts, 0));
+  EXPECT_NO_THROW(AddSlabBoundaries(boundaries, slabCuts, 0));
   ASSERT_EQ(0, boundaries.size());
 }
 
@@ -4841,7 +4841,7 @@
   FillTestRectangleList(slabCuts);
 
   boundaries.clear();
-  DicomStructure2::AddSlabBoundaries(boundaries, slabCuts, 0);
+  AddSlabBoundaries(boundaries, slabCuts, 0);
 
   {
     size_t i = 0;
@@ -4872,8 +4872,8 @@
   FillTestRectangleList(slabCuts);
 
   boundaries.clear();
-  DicomStructure2::AddSlabBoundaries(boundaries, slabCuts, 0);
-  DicomStructure2::AddSlabBoundaries(boundaries, slabCuts, 1);
+  AddSlabBoundaries(boundaries, slabCuts, 0);
+  AddSlabBoundaries(boundaries, slabCuts, 1);
 
   ASSERT_EQ(8, boundaries.size());
 
@@ -4921,7 +4921,7 @@
   FillTestRectangleList(slabCuts);
   boundaries.clear();
   std::vector< std::pair<Point2D, Point2D> > segments;
-  ASSERT_NO_THROW(DicomStructure2::ProcessBoundaryList(segments, boundaries, 42.0));
+  ASSERT_NO_THROW(ProcessBoundaryList(segments, boundaries, 42.0));
   ASSERT_EQ(0u, segments.size());
 }
 
@@ -4934,8 +4934,8 @@
   {
     std::vector< std::pair<Point2D, Point2D> > segments;
     std::vector<std::pair<double, RectangleBoundaryKind> > boundaries;
-    DicomStructure2::AddSlabBoundaries(boundaries, slabCuts, 0);
-    DicomStructure2::ProcessBoundaryList(segments, boundaries, slabCuts[0][0].ymin);
+    AddSlabBoundaries(boundaries, slabCuts, 0);
+    ProcessBoundaryList(segments, boundaries, slabCuts[0][0].ymin);
 
     ASSERT_EQ(2u, segments.size());
 
@@ -4960,18 +4960,18 @@
   // top row
   {
     std::vector<std::pair<double, RectangleBoundaryKind> > boundaries;
-    DicomStructure2::AddSlabBoundaries(boundaries, slabCuts, 0);
+    AddSlabBoundaries(boundaries, slabCuts, 0);
     std::vector< std::pair<Point2D, Point2D> > segments;
-    DicomStructure2::ProcessBoundaryList(segments, boundaries, slabCuts[0][0].ymin);
+    ProcessBoundaryList(segments, boundaries, slabCuts[0][0].ymin);
   }
 
   // mids
   {
     std::vector<std::pair<double, RectangleBoundaryKind> > boundaries;
-    DicomStructure2::AddSlabBoundaries(boundaries, slabCuts, 0);
-    DicomStructure2::AddSlabBoundaries(boundaries, slabCuts, 1);
+    AddSlabBoundaries(boundaries, slabCuts, 0);
+    AddSlabBoundaries(boundaries, slabCuts, 1);
     std::vector< std::pair<Point2D, Point2D> > segments;
-    DicomStructure2::ProcessBoundaryList(segments, boundaries, slabCuts[0][0].ymax);
+    ProcessBoundaryList(segments, boundaries, slabCuts[0][0].ymax);
 
     ASSERT_EQ(4u, segments.size());
 
@@ -4999,9 +4999,9 @@
   // bottom row
   {
     std::vector<std::pair<double, RectangleBoundaryKind> > boundaries;
-    DicomStructure2::AddSlabBoundaries(boundaries, slabCuts, 1);
+    AddSlabBoundaries(boundaries, slabCuts, 1);
     std::vector< std::pair<Point2D, Point2D> > segments;
-    DicomStructure2::ProcessBoundaryList(segments, boundaries, slabCuts[1][0].ymax);
+    ProcessBoundaryList(segments, boundaries, slabCuts[1][0].ymax);
 
     ASSERT_EQ(2u, segments.size());
 
@@ -5025,7 +5025,7 @@
 
   std::vector< std::pair<Point2D, Point2D> > segments;
 
-  ASSERT_NO_THROW(DicomStructure2::ConvertListOfSlabsToSegments(segments, slabCuts, 0));
+  ASSERT_NO_THROW(ConvertListOfSlabsToSegments(segments, slabCuts, 0));
   ASSERT_EQ(0u, segments.size());
 }
 
@@ -5037,7 +5037,7 @@
 
   std::vector< std::pair<Point2D, Point2D> > segments;
 
-  ASSERT_NO_THROW(DicomStructure2::ConvertListOfSlabsToSegments(segments, slabCuts, totalRectCount));
+  ASSERT_NO_THROW(ConvertListOfSlabsToSegments(segments, slabCuts, totalRectCount));
   ASSERT_EQ(60u, segments.size());
 
   size_t i = 0;