X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2FTestViewer.cxx;h=196df1f00f03fccce966f71e650f982229db214b;hb=d5fa2ac7c86e548f6ff5a98cb551a5f976d3a15d;hp=70dbd6fa029fde4c157ff10eb897bccce48dd3af;hpb=049ac0bc596ce97e1f2b030511958dac7b67ba50;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx
index 70dbd6fa..196df1f0 100644
--- a/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@ -45,6 +45,10 @@
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
 
+#include <GEOMUtils.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
+
 #ifdef WIN32
   #pragma warning ( default: 4251 )
 #endif
@@ -84,9 +88,9 @@ OCCViewer_ViewWindow* TestViewer::viewWindow()
   return myViewWindow;
 }
 
-Handle(AIS_InteractiveContext) context()
+Handle(AIS_InteractiveContext) TestViewer::context()
 {
-  return TestViewer::viewer()->getAISContext();
+  return viewer()->getAISContext();
 }
 
 QColor TestViewer::GetColor(int i)
@@ -174,19 +178,34 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll,
 
   int i = 0;
   //show all faces first
+  TopTools_ListOfShape aListOfFaces;
   TopExp_Explorer aFE( theShape, TopAbs_FACE );
-  for( ; aFE.More(); aFE.Next(), i++ ) 
-    show( aFE.Current(), theMode, false, GetColor(i) );
+  for( ; aFE.More(); aFE.Next() )
+    aListOfFaces.Append(aFE.Current());
+  GEOMUtils::SortShapes(aListOfFaces);
+  TopTools_ListIteratorOfListOfShape aLF(aListOfFaces);
+  for( ; aLF.More(); aLF.Next(), i++)
+    show( aLF.Value(), theMode, false, GetColor(i) );
 
   //show all independent wires
+  TopTools_ListOfShape aListOfWires;
   TopExp_Explorer aWE( theShape, TopAbs_WIRE, TopAbs_FACE );
-  for( ; aWE.More(); aWE.Next(), i++ ) 
-    show( aWE.Current(), theMode, false, GetColor(i) );
+  for( ; aWE.More(); aWE.Next() )
+    aListOfWires.Append(aWE.Current());
+  GEOMUtils::SortShapes(aListOfWires);
+  TopTools_ListIteratorOfListOfShape aLW(aListOfWires);
+  for( ; aLW.More(); aLW.Next(), i++)
+    show( aLW.Value(), theMode, false, GetColor(i) );
 
   //show all independent edges
+  TopTools_ListOfShape aListOfEdges;
   TopExp_Explorer anEE( theShape, TopAbs_EDGE, TopAbs_WIRE );
-  for( ; anEE.More(); anEE.Next(), i++ ) 
-    show( anEE.Current(), theMode, false, GetColor(i) );
+  for( ; anEE.More(); anEE.Next())
+    aListOfEdges.Append(anEE.Current());
+  GEOMUtils::SortShapes(aListOfEdges);
+  TopTools_ListIteratorOfListOfShape aLE(aListOfEdges);
+  for( ; aLE.More(); aLE.Next(), i++)
+    show( aLE.Value(), theMode, false, GetColor(i) );
 
   if( isFitAll )
   {
@@ -242,7 +261,7 @@ bool TestViewer::AssertImages( QString& theMessage )
 {
   QImage anActualImage = viewWindow()->dumpView();
 
-  QString anExpectedRefFilePath = qgetenv( "HYDRO_REFERENCE_DATA" );
+  QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
   anExpectedRefFilePath += "/" + myKey + ".png";
   QImage anExpectedRefImage; 
   anExpectedRefImage.load( anExpectedRefFilePath );
@@ -342,7 +361,7 @@ bool TestViewer::areScriptsEqual( const QString& theBaseName,
                                   int theLinesToOmit,
                                   QString& theMsg )
 {
-  QString anExpectedRefFilePath = qgetenv( "HYDRO_REFERENCE_DATA" );  
+  QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
   anExpectedRefFilePath += "/" + theBaseName;
   
   QString anActualFilePath = QDir::tempPath() + "/" + theBaseName;