introducing test on mesh extension, with resources generated first

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

diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx
index d02aa1f7dedd21bf163e6e5914fff27afebb36b9..3f886a5c025c8f8ac29d17457dead53007e7967c 100644 (file)
--- a/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@ -54,12 +54,14 @@
 #endif
 
 #include <cppunit/TestAssert.h>
+#include <QApplication>
 
 OCCViewer_ViewManager* TestViewer::myViewManager = 0;
 OCCViewer_ViewFrame* TestViewer::myViewWindow = 0;
 QString TestViewer::myKey = "";
 
 extern QString REF_DATA_PATH;
+extern QString TMP_DIR;
 
 OCCViewer_ViewManager* TestViewer::viewManager()
 {
@@ -69,13 +71,13 @@ OCCViewer_ViewManager* TestViewer::viewManager()
   myViewManager = new OCCViewer_ViewManager( 0, 0 );
   OCCViewer_Viewer* aViewer = new OCCViewer_Viewer( true );
 
-  aViewer->setTrihedronSize( 100, true );
+  aViewer->setTrihedronSize( 0, true );
   aViewer->setInteractionStyle( 0 );
   aViewer->setZoomingStyle( 1 );
 
   myViewManager->setViewModel( aViewer );
   myViewWindow = dynamic_cast<OCCViewer_ViewFrame*>( myViewManager->createViewWindow() );
-
+  aViewer->setTrihedronShown( false );
   return myViewManager;
 }
 
@@ -134,6 +136,8 @@ void TestViewer::eraseAll( bool isUpdate, bool eraseStructures )
       GS->Erase();
     }
   }
+  viewer()->setTrihedronShown( false );
+  qApp->processEvents();
 }
 
 void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject,
@@ -149,11 +153,11 @@ void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject,
   if( theSelectionMode > 0 )
   {
     context()->OpenLocalContext();
-    context()->Display( theObject, theMode, theSelectionMode );
+    context()->Display( theObject, theMode, theSelectionMode, true );
     context()->Activate( theObject, theSelectionMode, Standard_True );
   }
   else
-    context()->Display( theObject, theMode, theSelectionMode );
+    context()->Display( theObject, theMode, theSelectionMode, true );
 
   if( isFitAll )
     fitAll();
@@ -169,6 +173,7 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll,
   int theUIANb, int theVIANb)
 {
   Handle(AIS_Shape) aShape = new AIS_Shape( theShape );
+  cout <<theShape;
   if( theShape.ShapeType()==TopAbs_VERTEX )
     aShape->Attributes()->PointAspect()->SetTypeOfMarker( Aspect_TOM_X );
   if (theShape.ShapeType()==TopAbs_FACE)
@@ -323,14 +328,7 @@ bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, cons
     return true;
   }
 
-  QString temp = QDir::tempPath();
-#ifndef WIN32
-  temp += "/hydro";
-  if( !QDir().exists( temp ) )
-    QDir().mkpath( temp );
-#endif
-
-  QString aPath = temp + "/" + myKey + ".png";
+  QString aPath = TMP_DIR + "/" + myKey + ".png";
   anActualImage.save( aPath );
   //std::cout << "Actual image: " << aPath.toStdString() << std::endl;
   
@@ -339,11 +337,11 @@ bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, cons
   
   QImage aDiff = diff( anExpectedRefImage, anActualImage );
 
-  QString aDiffFilePath = temp + "/" + myKey + "_diff.png";
+  QString aDiffFilePath = TMP_DIR + "/" + myKey + "_diff.png";
   aDiff.save( aDiffFilePath );
   //std::cout << "Diff image: " << aDiffFilePath.toStdString() << std::endl;
 
-  QString anExpected = temp + "/" + myKey + "_1.png";
+  QString anExpected = TMP_DIR + "/" + myKey + "_1.png";
   //std::cout << "Expected image: " << anExpected.toStdString() << std::endl;
   anExpectedRefImage.save( anExpected );
 
@@ -385,12 +383,12 @@ void TestViewer::showColorScale( bool isShow )
   if( isShow )
   {
     if( !context()->IsDisplayed( aColorScale ) )
-      context()->Display( aColorScale );
+      context()->Display( aColorScale, true );
   }
   else
   {
     if( context()->IsDisplayed( aColorScale ) )
-      context()->Erase( aColorScale );
+      context()->Erase( aColorScale, true );
   }
 }
 
@@ -402,8 +400,8 @@ bool TestViewer::ColorScaleIsDisplayed()
 void TestViewer::select( int theViewX, int theViewY )
 {
   Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
-  context()->MoveTo( theViewX, theViewY, aView );
-  context()->Select();
+  context()->MoveTo( theViewX, theViewY, aView, true);
+  context()->Select(true);
   // context()->CloseAllContexts();
 }
 
@@ -427,13 +425,21 @@ bool TestViewer::areScriptsEqual( const QString& theBaseName,
   QString anExpectedRefFilePath = REF_DATA_PATH;
   anExpectedRefFilePath += "/" + theBaseName;
   
-  QString anActualFilePath = QDir::tempPath() + "/" + theBaseName;
+  QString anActualFilePath = TMP_DIR + "/" + theBaseName;
 
   QFile anExpected( anExpectedRefFilePath );
   QFile anActual( anActualFilePath );
-  if( !anExpected.open( QFile::ReadOnly | QFile::Text ) ||
-      !anActual.open  ( QFile::ReadOnly | QFile::Text ) )
+  if( !anExpected.open( QFile::ReadOnly | QFile::Text ) )
+  {
+    theMsg = "Expected file cannot be opened: " + anExpectedRefFilePath;
+    return false;
+  }
+
+  if( !anActual.open( QFile::ReadOnly | QFile::Text ) )
+  {
+    theMsg = "Actual file cannot be opened: " + anActualFilePath;
     return false;
+  }
 
   for( int i=0; i<theLinesToOmit; i++ )
     anExpected.readLine();
@@ -450,8 +456,13 @@ bool TestViewer::areScriptsEqual( const QString& theBaseName,
     i++;
   }
   
-  if( isEqual )
-    isEqual = anActual.atEnd();
+  while( !anActual.atEnd() && isEqual )
+  {
+    QString anActualLine = GetLine( anActual, isActualUtf8 );
+    anActualLine = anActualLine.trimmed();
+    if( !anActualLine.isEmpty() )
+      isEqual = false;
+  }
 
   anExpected.close();
   anActual.close();