From 2d9da9c5fc159500663e81acbb1ad4d4d4af2e90 Mon Sep 17 00:00:00 2001
From: isn <isn@opencascade.com>
Date: Tue, 20 Oct 2015 13:32:22 +0300
Subject: [PATCH] new names

---
 .../{cs11.png => merge_faces_boxes_11.png}    | Bin
 .../{cs12.png => merge_faces_boxes_12.png}    | Bin
 .../{cs13.png => merge_faces_boxes_13.png}    | Bin
 .../{cs14.png => merge_faces_boxes_14.png}    | Bin
 .../{cs21.png => merge_faces_boxes_21.png}    | Bin
 .../{cs22.png => merge_faces_boxes_22.png}    | Bin
 .../{cs23.png => merge_faces_boxes_23.png}    | Bin
 .../{cs24.png => merge_faces_boxes_24.png}    | Bin
 ...{cs11_c.png => merge_faces_circles_11.png} | Bin
 ...{cs12_c.png => merge_faces_circles_12.png} | Bin
 .../{_cs13.png => merge_faces_circles_13.png} | Bin
 ...{cs14_c.png => merge_faces_circles_14.png} | Bin
 ...{cs21_c.png => merge_faces_circles_21.png} | Bin
 ...{cs22_c.png => merge_faces_circles_22.png} | Bin
 .../{_cs23.png => merge_faces_circles_23.png} | Bin
 ...{cs24_c.png => merge_faces_circles_24.png} | Bin
 .../test_HYDROData_LandCoverMap.cxx           |  32 +++++++++---------
 17 files changed, 16 insertions(+), 16 deletions(-)
 rename src/HYDRO_tests/reference_data/{cs11.png => merge_faces_boxes_11.png} (100%)
 rename src/HYDRO_tests/reference_data/{cs12.png => merge_faces_boxes_12.png} (100%)
 rename src/HYDRO_tests/reference_data/{cs13.png => merge_faces_boxes_13.png} (100%)
 rename src/HYDRO_tests/reference_data/{cs14.png => merge_faces_boxes_14.png} (100%)
 rename src/HYDRO_tests/reference_data/{cs21.png => merge_faces_boxes_21.png} (100%)
 rename src/HYDRO_tests/reference_data/{cs22.png => merge_faces_boxes_22.png} (100%)
 rename src/HYDRO_tests/reference_data/{cs23.png => merge_faces_boxes_23.png} (100%)
 rename src/HYDRO_tests/reference_data/{cs24.png => merge_faces_boxes_24.png} (100%)
 rename src/HYDRO_tests/reference_data/{cs11_c.png => merge_faces_circles_11.png} (100%)
 rename src/HYDRO_tests/reference_data/{cs12_c.png => merge_faces_circles_12.png} (100%)
 rename src/HYDRO_tests/reference_data/{_cs13.png => merge_faces_circles_13.png} (100%)
 rename src/HYDRO_tests/reference_data/{cs14_c.png => merge_faces_circles_14.png} (100%)
 rename src/HYDRO_tests/reference_data/{cs21_c.png => merge_faces_circles_21.png} (100%)
 rename src/HYDRO_tests/reference_data/{cs22_c.png => merge_faces_circles_22.png} (100%)
 rename src/HYDRO_tests/reference_data/{_cs23.png => merge_faces_circles_23.png} (100%)
 rename src/HYDRO_tests/reference_data/{cs24_c.png => merge_faces_circles_24.png} (100%)

diff --git a/src/HYDRO_tests/reference_data/cs11.png b/src/HYDRO_tests/reference_data/merge_faces_boxes_11.png
similarity index 100%
rename from src/HYDRO_tests/reference_data/cs11.png
rename to src/HYDRO_tests/reference_data/merge_faces_boxes_11.png
diff --git a/src/HYDRO_tests/reference_data/cs12.png b/src/HYDRO_tests/reference_data/merge_faces_boxes_12.png
similarity index 100%
rename from src/HYDRO_tests/reference_data/cs12.png
rename to src/HYDRO_tests/reference_data/merge_faces_boxes_12.png
diff --git a/src/HYDRO_tests/reference_data/cs13.png b/src/HYDRO_tests/reference_data/merge_faces_boxes_13.png
similarity index 100%
rename from src/HYDRO_tests/reference_data/cs13.png
rename to src/HYDRO_tests/reference_data/merge_faces_boxes_13.png
diff --git a/src/HYDRO_tests/reference_data/cs14.png b/src/HYDRO_tests/reference_data/merge_faces_boxes_14.png
similarity index 100%
rename from src/HYDRO_tests/reference_data/cs14.png
rename to src/HYDRO_tests/reference_data/merge_faces_boxes_14.png
diff --git a/src/HYDRO_tests/reference_data/cs21.png b/src/HYDRO_tests/reference_data/merge_faces_boxes_21.png
similarity index 100%
rename from src/HYDRO_tests/reference_data/cs21.png
rename to src/HYDRO_tests/reference_data/merge_faces_boxes_21.png
diff --git a/src/HYDRO_tests/reference_data/cs22.png b/src/HYDRO_tests/reference_data/merge_faces_boxes_22.png
similarity index 100%
rename from src/HYDRO_tests/reference_data/cs22.png
rename to src/HYDRO_tests/reference_data/merge_faces_boxes_22.png
diff --git a/src/HYDRO_tests/reference_data/cs23.png b/src/HYDRO_tests/reference_data/merge_faces_boxes_23.png
similarity index 100%
rename from src/HYDRO_tests/reference_data/cs23.png
rename to src/HYDRO_tests/reference_data/merge_faces_boxes_23.png
diff --git a/src/HYDRO_tests/reference_data/cs24.png b/src/HYDRO_tests/reference_data/merge_faces_boxes_24.png
similarity index 100%
rename from src/HYDRO_tests/reference_data/cs24.png
rename to src/HYDRO_tests/reference_data/merge_faces_boxes_24.png
diff --git a/src/HYDRO_tests/reference_data/cs11_c.png b/src/HYDRO_tests/reference_data/merge_faces_circles_11.png
similarity index 100%
rename from src/HYDRO_tests/reference_data/cs11_c.png
rename to src/HYDRO_tests/reference_data/merge_faces_circles_11.png
diff --git a/src/HYDRO_tests/reference_data/cs12_c.png b/src/HYDRO_tests/reference_data/merge_faces_circles_12.png
similarity index 100%
rename from src/HYDRO_tests/reference_data/cs12_c.png
rename to src/HYDRO_tests/reference_data/merge_faces_circles_12.png
diff --git a/src/HYDRO_tests/reference_data/_cs13.png b/src/HYDRO_tests/reference_data/merge_faces_circles_13.png
similarity index 100%
rename from src/HYDRO_tests/reference_data/_cs13.png
rename to src/HYDRO_tests/reference_data/merge_faces_circles_13.png
diff --git a/src/HYDRO_tests/reference_data/cs14_c.png b/src/HYDRO_tests/reference_data/merge_faces_circles_14.png
similarity index 100%
rename from src/HYDRO_tests/reference_data/cs14_c.png
rename to src/HYDRO_tests/reference_data/merge_faces_circles_14.png
diff --git a/src/HYDRO_tests/reference_data/cs21_c.png b/src/HYDRO_tests/reference_data/merge_faces_circles_21.png
similarity index 100%
rename from src/HYDRO_tests/reference_data/cs21_c.png
rename to src/HYDRO_tests/reference_data/merge_faces_circles_21.png
diff --git a/src/HYDRO_tests/reference_data/cs22_c.png b/src/HYDRO_tests/reference_data/merge_faces_circles_22.png
similarity index 100%
rename from src/HYDRO_tests/reference_data/cs22_c.png
rename to src/HYDRO_tests/reference_data/merge_faces_circles_22.png
diff --git a/src/HYDRO_tests/reference_data/_cs23.png b/src/HYDRO_tests/reference_data/merge_faces_circles_23.png
similarity index 100%
rename from src/HYDRO_tests/reference_data/_cs23.png
rename to src/HYDRO_tests/reference_data/merge_faces_circles_23.png
diff --git a/src/HYDRO_tests/reference_data/cs24_c.png b/src/HYDRO_tests/reference_data/merge_faces_circles_24.png
similarity index 100%
rename from src/HYDRO_tests/reference_data/cs24_c.png
rename to src/HYDRO_tests/reference_data/merge_faces_circles_24.png
diff --git a/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx b/src/HYDRO_tests/test_HYDROData_LandCoverMap.cxx
index a2219f24..1944e67d 100644
--- 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);
   }
-- 
2.39.2