Merge branch 'BR_LAND_COVER_MAP' into BR_quadtree

[modules/hydro.git] / src / HYDRO_tests / TestViewer.cxx

diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx
index efd8a5862f42cf80e406ecf8e48d8dc4cf5247ff..52917a31a07c023cd60eae54b1c830e4956ed48d 100644 (file)
--- a/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@ -84,9 +84,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)
@@ -114,6 +114,12 @@ QColor TestViewer::GetColor(int i)
   }
 }
 
+void TestViewer::eraseAll( bool isUpdate )
+{
+  context()->CloseLocalContext( -1, Standard_False );
+  context()->EraseAll( isUpdate );
+}
+
 void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject,
                        int theMode, int theSelectionMode, bool isFitAll, const char* theKey )
 {
@@ -121,8 +127,7 @@ void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject,
   if( !aNewKey.isEmpty() )
   {
     myKey = aNewKey;
-    context()->CloseLocalContext();
-    context()->EraseAll( Standard_False );
+    eraseAll( false );
   }
   
   context()->Display( theObject, theMode, theSelectionMode );
@@ -160,8 +165,7 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll,
   QString aNewKey = theKey;
   if( !aNewKey.isEmpty() )
   {
-    context()->CloseLocalContext();
-    context()->EraseAll( Standard_False );
+    eraseAll( false );
     myKey = aNewKey;
   }
 
@@ -266,15 +270,24 @@ bool TestViewer::AssertImages( QString& theMessage )
   return false;
 }
 
-Handle_Aspect_ColorScale TestViewer::showColorScale( bool isShow )
+Handle_Aspect_ColorScale TestViewer::colorScale()
 {
   Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
   if( aView.IsNull() )
     return Handle(Aspect_ColorScale)();
+  else
+    return aView->ColorScale();
+}
+
+void TestViewer::showColorScale( bool isShow )
+{
+  Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
+  if( aView.IsNull() )
+    return;
 
-  Handle(Aspect_ColorScale) aColorScale = aView->ColorScale();
+  Handle(Aspect_ColorScale) aColorScale = colorScale();
   if( aColorScale.IsNull() )
-    return aColorScale;
+    return;
 
   Standard_Real anXPos = 0.05;
   Standard_Real anYPos = 0.1;
@@ -303,7 +316,6 @@ Handle_Aspect_ColorScale TestViewer::showColorScale( bool isShow )
     if( aView->ColorScaleIsDisplayed() )
       aView->ColorScaleErase();
   }
-  return aColorScale;
 }
 
 void TestViewer::select( int theViewX, int theViewY )
@@ -313,7 +325,22 @@ void TestViewer::select( int theViewX, int theViewY )
   context()->Select();
 }
 
-bool TestViewer::areScriptsEqual( const QString& theBaseName )
+QString GetLine( QFile& theFile, bool isUtf8 )
+{
+  QByteArray aLineData = theFile.readLine();
+  QString aLine;
+  if( isUtf8 )
+    aLine = QString::fromUtf8( aLineData );
+  else
+    aLine = aLineData;
+  return aLine;
+}
+
+bool TestViewer::areScriptsEqual( const QString& theBaseName,
+                                  bool isExpectedUtf8,
+                                  bool isActualUtf8,
+                                  int theLinesToOmit,
+                                  QString& theMsg )
 {
   QString anExpectedRefFilePath = qgetenv( "HYDRO_REFERENCE_DATA" );  
   anExpectedRefFilePath += "/" + theBaseName;
@@ -326,18 +353,21 @@ bool TestViewer::areScriptsEqual( const QString& theBaseName )
       !anActual.open  ( QFile::ReadOnly | QFile::Text ) )
     return false;
 
-  const int aLinesToOmit = 20;
-  for( int i=0; i<aLinesToOmit; i++ )
+  for( int i=0; i<theLinesToOmit; i++ )
     anExpected.readLine();
 
   bool isEqual = true;
+  int i = 1;
   while( !anExpected.atEnd() && isEqual )
   {
-    QString anExpectedLine = QString::fromUtf8( anExpected.readLine() );
-    QString anActualLine = anActual.readLine();
+    QString anExpectedLine = GetLine( anExpected, isExpectedUtf8 );
+    QString anActualLine = GetLine( anActual, isActualUtf8 );
     isEqual = anExpectedLine == anActualLine;
+    if( !isEqual )
+      theMsg = QString( "line %1\nActual: %2\nExpected: %3" ).arg( i ).arg( anActualLine ).arg( anExpectedLine );
+    i++;
   }
-
+  
   if( isEqual )
     isEqual = anActual.atEnd();