new names

diff --git a/src/HYDRO_tests/reference_data/_cs13.png b/src/HYDRO_tests/reference_data/_cs13.png
deleted file mode 100644 (file)
index e9c116f..0000000
Binary files a/src/HYDRO_tests/reference_data/_cs13.png and /dev/null differ

diff --git a/src/HYDRO_tests/reference_data/_cs23.png b/src/HYDRO_tests/reference_data/_cs23.png
deleted file mode 100644 (file)
index e536901..0000000
Binary files a/src/HYDRO_tests/reference_data/_cs23.png and /dev/null differ

diff --git a/src/HYDRO_tests/reference_data/cs11.png b/src/HYDRO_tests/reference_data/cs11.png
deleted file mode 100644 (file)
index 437fd50..0000000
Binary files a/src/HYDRO_tests/reference_data/cs11.png and /dev/null differ

diff --git a/src/HYDRO_tests/reference_data/cs11_c.png b/src/HYDRO_tests/reference_data/cs11_c.png
deleted file mode 100644 (file)
index 2ac1f68..0000000
Binary files a/src/HYDRO_tests/reference_data/cs11_c.png and /dev/null differ

diff --git a/src/HYDRO_tests/reference_data/cs12.png b/src/HYDRO_tests/reference_data/cs12.png
deleted file mode 100644 (file)
index ee6ecb0..0000000
Binary files a/src/HYDRO_tests/reference_data/cs12.png and /dev/null differ

diff --git a/src/HYDRO_tests/reference_data/cs12_c.png b/src/HYDRO_tests/reference_data/cs12_c.png
deleted file mode 100644 (file)
index 9fcbd30..0000000
Binary files a/src/HYDRO_tests/reference_data/cs12_c.png and /dev/null differ

diff --git a/src/HYDRO_tests/reference_data/cs13.png b/src/HYDRO_tests/reference_data/cs13.png
deleted file mode 100644 (file)
index 341f77f..0000000
Binary files a/src/HYDRO_tests/reference_data/cs13.png and /dev/null differ

diff --git a/src/HYDRO_tests/reference_data/cs14.png b/src/HYDRO_tests/reference_data/cs14.png
deleted file mode 100644 (file)
index 96d4902..0000000
Binary files a/src/HYDRO_tests/reference_data/cs14.png and /dev/null differ

diff --git a/src/HYDRO_tests/reference_data/cs14_c.png b/src/HYDRO_tests/reference_data/cs14_c.png
deleted file mode 100644 (file)
index e9c116f..0000000
Binary files a/src/HYDRO_tests/reference_data/cs14_c.png and /dev/null differ

diff --git a/src/HYDRO_tests/reference_data/cs21.png b/src/HYDRO_tests/reference_data/cs21.png
deleted file mode 100644 (file)
index 20a858e..0000000
Binary files a/src/HYDRO_tests/reference_data/cs21.png and /dev/null differ

diff --git a/src/HYDRO_tests/reference_data/cs21_c.png b/src/HYDRO_tests/reference_data/cs21_c.png
deleted file mode 100644 (file)
index 9e90658..0000000
Binary files a/src/HYDRO_tests/reference_data/cs21_c.png and /dev/null differ

diff --git a/src/HYDRO_tests/reference_data/cs22.png b/src/HYDRO_tests/reference_data/cs22.png
deleted file mode 100644 (file)
index ee6ecb0..0000000
Binary files a/src/HYDRO_tests/reference_data/cs22.png and /dev/null differ

diff --git a/src/HYDRO_tests/reference_data/cs22_c.png b/src/HYDRO_tests/reference_data/cs22_c.png
deleted file mode 100644 (file)
index 9fcbd30..0000000
Binary files a/src/HYDRO_tests/reference_data/cs22_c.png and /dev/null differ

diff --git a/src/HYDRO_tests/reference_data/cs23.png b/src/HYDRO_tests/reference_data/cs23.png
deleted file mode 100644 (file)
index 10a0acd..0000000
Binary files a/src/HYDRO_tests/reference_data/cs23.png and /dev/null differ

diff --git a/src/HYDRO_tests/reference_data/cs24.png b/src/HYDRO_tests/reference_data/cs24.png
deleted file mode 100644 (file)
index 0d95d51..0000000
Binary files a/src/HYDRO_tests/reference_data/cs24.png and /dev/null differ

diff --git a/src/HYDRO_tests/reference_data/cs24_c.png b/src/HYDRO_tests/reference_data/cs24_c.png
deleted file mode 100644 (file)
index 89fb405..0000000
Binary files a/src/HYDRO_tests/reference_data/cs24_c.png and /dev/null differ

diff --git a/src/HYDRO_tests/reference_data/merge_faces_boxes_11.png b/src/HYDRO_tests/reference_data/merge_faces_boxes_11.png
new file mode 100644 (file)
index 0000000..437fd50
Binary files /dev/null and b/src/HYDRO_tests/reference_data/merge_faces_boxes_11.png differ

diff --git a/src/HYDRO_tests/reference_data/merge_faces_boxes_12.png b/src/HYDRO_tests/reference_data/merge_faces_boxes_12.png
new file mode 100644 (file)
index 0000000..ee6ecb0
Binary files /dev/null and b/src/HYDRO_tests/reference_data/merge_faces_boxes_12.png differ

diff --git a/src/HYDRO_tests/reference_data/merge_faces_boxes_13.png b/src/HYDRO_tests/reference_data/merge_faces_boxes_13.png
new file mode 100644 (file)
index 0000000..341f77f
Binary files /dev/null and b/src/HYDRO_tests/reference_data/merge_faces_boxes_13.png differ

diff --git a/src/HYDRO_tests/reference_data/merge_faces_boxes_14.png b/src/HYDRO_tests/reference_data/merge_faces_boxes_14.png
new file mode 100644 (file)
index 0000000..96d4902
Binary files /dev/null and b/src/HYDRO_tests/reference_data/merge_faces_boxes_14.png differ

diff --git a/src/HYDRO_tests/reference_data/merge_faces_boxes_21.png b/src/HYDRO_tests/reference_data/merge_faces_boxes_21.png
new file mode 100644 (file)
index 0000000..20a858e
Binary files /dev/null and b/src/HYDRO_tests/reference_data/merge_faces_boxes_21.png differ

diff --git a/src/HYDRO_tests/reference_data/merge_faces_boxes_22.png b/src/HYDRO_tests/reference_data/merge_faces_boxes_22.png
new file mode 100644 (file)
index 0000000..ee6ecb0
Binary files /dev/null and b/src/HYDRO_tests/reference_data/merge_faces_boxes_22.png differ

diff --git a/src/HYDRO_tests/reference_data/merge_faces_boxes_23.png b/src/HYDRO_tests/reference_data/merge_faces_boxes_23.png
new file mode 100644 (file)
index 0000000..10a0acd
Binary files /dev/null and b/src/HYDRO_tests/reference_data/merge_faces_boxes_23.png differ

diff --git a/src/HYDRO_tests/reference_data/merge_faces_boxes_24.png b/src/HYDRO_tests/reference_data/merge_faces_boxes_24.png
new file mode 100644 (file)
index 0000000..0d95d51
Binary files /dev/null and b/src/HYDRO_tests/reference_data/merge_faces_boxes_24.png differ

diff --git a/src/HYDRO_tests/reference_data/merge_faces_circles_11.png b/src/HYDRO_tests/reference_data/merge_faces_circles_11.png
new file mode 100644 (file)
index 0000000..2ac1f68
Binary files /dev/null and b/src/HYDRO_tests/reference_data/merge_faces_circles_11.png differ

diff --git a/src/HYDRO_tests/reference_data/merge_faces_circles_12.png b/src/HYDRO_tests/reference_data/merge_faces_circles_12.png
new file mode 100644 (file)
index 0000000..9fcbd30
Binary files /dev/null and b/src/HYDRO_tests/reference_data/merge_faces_circles_12.png differ

diff --git a/src/HYDRO_tests/reference_data/merge_faces_circles_13.png b/src/HYDRO_tests/reference_data/merge_faces_circles_13.png
new file mode 100644 (file)
index 0000000..e9c116f
Binary files /dev/null and b/src/HYDRO_tests/reference_data/merge_faces_circles_13.png differ

diff --git a/src/HYDRO_tests/reference_data/merge_faces_circles_14.png b/src/HYDRO_tests/reference_data/merge_faces_circles_14.png
new file mode 100644 (file)
index 0000000..e9c116f
Binary files /dev/null and b/src/HYDRO_tests/reference_data/merge_faces_circles_14.png differ

diff --git a/src/HYDRO_tests/reference_data/merge_faces_circles_21.png b/src/HYDRO_tests/reference_data/merge_faces_circles_21.png
new file mode 100644 (file)
index 0000000..9e90658
Binary files /dev/null and b/src/HYDRO_tests/reference_data/merge_faces_circles_21.png differ

diff --git a/src/HYDRO_tests/reference_data/merge_faces_circles_22.png b/src/HYDRO_tests/reference_data/merge_faces_circles_22.png
new file mode 100644 (file)
index 0000000..9fcbd30
Binary files /dev/null and b/src/HYDRO_tests/reference_data/merge_faces_circles_22.png differ

diff --git a/src/HYDRO_tests/reference_data/merge_faces_circles_23.png b/src/HYDRO_tests/reference_data/merge_faces_circles_23.png
new file mode 100644 (file)
index 0000000..e536901
Binary files /dev/null and b/src/HYDRO_tests/reference_data/merge_faces_circles_23.png differ

diff --git a/src/HYDRO_tests/reference_data/merge_faces_circles_24.png b/src/HYDRO_tests/reference_data/merge_faces_circles_24.png
new file mode 100644 (file)
index 0000000..89fb405
Binary files /dev/null and b/src/HYDRO_tests/reference_data/merge_faces_circles_24.png differ

diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
index a2219f248bb5725daf99a20134a7d187abcd7d96..1944e67d4a02f52263c27f69a6b53640189d3463 100644 (file)
--- a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
+++ b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
@@ -273,7 +273,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     Faces.Append(pp1);
     Faces.Append(pp2);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
-    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs11" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_11" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_FACE);
   }
@@ -282,7 +282,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     Faces.Append(pp1);
     Faces.Append(pp3);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
-    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs12" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_12" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
@@ -292,7 +292,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     Faces.Append(pp2);
     Faces.Append(pp4);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
-    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs13" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_13" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
@@ -303,7 +303,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     Faces.Append(pp4);
     Faces.Append(pp2);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
-    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs14" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_14" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_FACE);
   }
@@ -315,7 +315,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     Faces.Append(pp1);
     Faces.Append(pp2);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
-    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs21" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_21" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
@@ -324,7 +324,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     Faces.Append(pp1);
     Faces.Append(pp3);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
-    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs22" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_22" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
@@ -334,7 +334,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     Faces.Append(pp2);
     Faces.Append(pp4);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
-    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs23" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_23" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
@@ -345,7 +345,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_boxes()
     Faces.Append(pp4);
     Faces.Append(pp2);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
-    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs24" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_boxes_24" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
@@ -370,7 +370,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     Faces.Append(ff1);
     Faces.Append(ff2);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
-    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs11_c" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_11" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_FACE);
   }
@@ -379,7 +379,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     Faces.Append(ff1);
     Faces.Append(ff3);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
-    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs12_c" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_12" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
@@ -389,7 +389,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     Faces.Append(ff2);
     Faces.Append(ff3);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
-    TestViewer::show( aMergedFace, AIS_Shaded, true, "_cs13" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_13" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
@@ -399,7 +399,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     Faces.Append(ff3);
     Faces.Append(ff2);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, true );
-    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs14_c" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_14" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
@@ -411,7 +411,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     Faces.Append(ff1);
     Faces.Append(ff2);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
-    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs21_c" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_21" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
@@ -420,7 +420,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     Faces.Append(ff1);
     Faces.Append(ff3);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
-    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs22_c" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_22" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
@@ -430,7 +430,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     Faces.Append(ff2);
     Faces.Append(ff3);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
-    TestViewer::show( aMergedFace, AIS_Shaded, true, "_cs23" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_23" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }
@@ -440,7 +440,7 @@ void test_HYDROData_LandCoverMap::test_merge_faces_circles()
     Faces.Append(ff3);
     Faces.Append(ff2);
     TopoDS_Shape aMergedFace = HYDROData_LandCoverMap::MergeFaces( Faces, false );
-    TestViewer::show( aMergedFace, AIS_Shaded, true, "cs24_c" );
+    TestViewer::show( aMergedFace, AIS_Shaded, true, "merge_faces_circles_24" );
     CPPUNIT_ASSERT_IMAGES
     CPPUNIT_ASSERT(aMergedFace.ShapeType() == TopAbs_SHELL);
   }