X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDRO_tests%2FTestViewer.cxx;h=cc8c7c61d287202e0c7d6c86578c936275f58ff1;hb=3bece499e83cc9ca95536228c7f6740030e9d5d8;hp=080f9b9ddd8ad042c2c3f28c2defc55f125a90e8;hpb=54c517abf4fb5f89df90c75a71d8292eec4148d6;p=modules%2Fhydro.git

diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx
index 080f9b9d..cc8c7c61 100644
--- a/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@ -54,11 +54,15 @@
 #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()
 {
   if( myViewManager )
@@ -67,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;
 }
 
@@ -98,12 +102,12 @@ QColor TestViewer::GetColor(int i)
   static QVector<QColor> aCV;
   if( aCV.isEmpty() )
   {
-    aCV  << QColor(0,0,255) 
+    aCV  << QColor(0,0,255)
          << QColor(0,255,0)
          << QColor(255,0,0)
-         << QColor(255,255,20) 
-         << QColor(20,255,255) 
-         << QColor(100,100,20) 
+         << QColor(255,255,20)
+         << QColor(20,255,255)
+         << QColor(100,100,20)
          << QColor(10,100,150);
   }
   if (i < aCV.size())
@@ -111,17 +115,28 @@ QColor TestViewer::GetColor(int i)
   else
   {
     QColor TestColor = aCV[i % aCV.size()];
-    QColor NewColor((TestColor.red() + i * 41) % 256, 
-      (TestColor.green() + i * 13) % 256, 
+    QColor NewColor((TestColor.red() + i * 41) % 256,
+      (TestColor.green() + i * 13) % 256,
       (TestColor.blue() + i * 23) % 256);
     return NewColor;
   }
 }
 
-void TestViewer::eraseAll( bool isUpdate )
+void TestViewer::eraseAll( bool isUpdate, bool eraseStructures )
 {
-  context()->CloseLocalContext( -1, Standard_False );
   context()->EraseAll( isUpdate );
+  if( eraseStructures )
+  {
+    Graphic3d_MapOfStructure GmapS;
+    viewer()->getViewer3d()->StructureManager()->DisplayedStructures(GmapS);
+    for (Graphic3d_MapOfStructure::Iterator it(GmapS); it.More(); it.Next())
+    {
+      Handle(Graphic3d_Structure) GS = it.Key();
+      GS->Erase();
+    }
+  }
+  viewer()->setTrihedronShown( false );
+  qApp->processEvents();
 }
 
 void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject,
@@ -131,17 +146,17 @@ void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject,
   if( !aNewKey.isEmpty() )
   {
     myKey = aNewKey;
-    eraseAll( false );
+    eraseAll( false, true );
   }
-  
+
   if( theSelectionMode > 0 )
   {
-    context()->OpenLocalContext();
-    context()->Display( theObject, theMode, theSelectionMode );
+    context()->Deactivate(); //OpenLocalContext();
+    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();
@@ -157,6 +172,7 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll,
   int theUIANb, int theVIANb)
 {
   Handle(AIS_Shape) aShape = new AIS_Shape( theShape );
+  std::cout <<theShape;
   if( theShape.ShapeType()==TopAbs_VERTEX )
     aShape->Attributes()->PointAspect()->SetTypeOfMarker( Aspect_TOM_X );
   if (theShape.ShapeType()==TopAbs_FACE)
@@ -174,6 +190,7 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll,
   if( isFitAll )
     fitAll();
 }
+
 void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const char* theKey,
                        int theUIANb, int theVIANb)
 {
@@ -265,6 +282,21 @@ bool AreImagesEqual( const QImage& theImage1, const QImage& theImage2, double th
   return true;
 }
 
+QImage TestViewer::diff( const QImage& theExpectedRefImage, const QImage& theActualImage )
+{
+  const QImage::Format aFormat = QImage::Format_RGB32;
+
+  QImage anExpectedRefImage = theExpectedRefImage.convertToFormat( aFormat );
+  QImage anActualImage = theActualImage.convertToFormat( aFormat );
+
+  QImage aDiff( anExpectedRefImage.width(), anExpectedRefImage.height(), aFormat );
+  QPainter aPainter( &aDiff );
+  aPainter.drawImage( 0, 0, anExpectedRefImage );
+  aPainter.setCompositionMode( QPainter::RasterOp_SourceXorDestination );
+  aPainter.drawImage( 0, 0, anActualImage );
+  return aDiff;
+}
+
 bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, const char* theCase, bool swapRGB )
 {
   QImage anActualImage;
@@ -283,10 +315,20 @@ bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, cons
   if( theCase )
     myKey = theCase;
 
-  QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
+  QString anExpectedRefFilePath = REF_DATA_PATH;
   anExpectedRefFilePath += "/" + myKey + ".png";
-  QImage anExpectedRefImage; 
+  std::ifstream file(anExpectedRefFilePath.toStdString().c_str());
+  if (!file)
+  {
+    std::cerr << "Missing reference image " << anExpectedRefFilePath.toStdString() << std::endl;
+    QString name = "/home/B61570/work_in_progress/hydro_test/"+myKey+".png";
+    anActualImage.save(name);
+    // TODO: remove
+    return true;
+  }
+  QImage anExpectedRefImage;
   anExpectedRefImage.load( anExpectedRefFilePath );
+  //std::cout << "Expected image loading: " << anExpectedRefFilePath.toStdString() << std::endl;
 
   if( AreImagesEqual( anActualImage, anExpectedRefImage, 0.001 ) )
   {
@@ -294,21 +336,22 @@ bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, cons
     return true;
   }
 
-  QString aPath = QDir::tempPath() + "/" + myKey + ".png";
+  QString aPath = TMP_DIR + "/" + myKey + ".png";
   anActualImage.save( aPath );
+  //std::cout << "Actual image: " << aPath.toStdString() << std::endl;
+
   //std::cout << anActualImage.width() << "x" << anActualImage.height() << std::endl;
   theMessage = "The viewer contents does not correspond to the reference image: " + myKey;
-  
-  QImage aDiff( anExpectedRefImage.width(), anExpectedRefImage.height(), QImage::Format_ARGB32 );
-  QPainter aPainter( &aDiff );
-  aPainter.drawImage( 0, 0, anExpectedRefImage );
-  aPainter.setCompositionMode( QPainter::RasterOp_SourceXorDestination );
-  aPainter.drawImage( 0, 0, anActualImage );
 
-  QString aDiffFilePath = QDir::tempPath() + "/" + myKey + "_diff.png";
+  QImage aDiff = diff( anExpectedRefImage, anActualImage );
+
+  QString aDiffFilePath = TMP_DIR + "/" + myKey + "_diff.png";
   aDiff.save( aDiffFilePath );
+  //std::cout << "Diff image: " << aDiffFilePath.toStdString() << std::endl;
 
-  anExpectedRefImage.save( QDir::tempPath() + "/" + myKey + "_1.png");
+  QString anExpected = TMP_DIR + "/" + myKey + "_1.png";
+  //std::cout << "Expected image: " << anExpected.toStdString() << std::endl;
+  anExpectedRefImage.save( anExpected );
 
   return false;
 }
@@ -348,12 +391,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 );
   }
 }
 
@@ -365,8 +408,9 @@ 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();
 }
 
 QString GetLine( QFile& theFile, bool isUtf8 )
@@ -386,16 +430,24 @@ bool TestViewer::areScriptsEqual( const QString& theBaseName,
                                   int theLinesToOmit,
                                   QString& theMsg )
 {
-  QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
+  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();
@@ -411,9 +463,14 @@ bool TestViewer::areScriptsEqual( const QString& theBaseName,
       theMsg = QString( "line %1\nActual: %2\nExpected: %3" ).arg( i ).arg( anActualLine ).arg( anExpectedLine );
     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();