#ifdef WIN32
#pragma warning ( disable: 4251 )
#endif
-#include <OCCViewer_ViewWindow.h>
+#include <OCCViewer_ViewFrame.h>
#ifdef WIN32
#pragma warning ( disable: 4251 )
#endif
#endif
#include <cppunit/TestAssert.h>
+#include <QApplication>
OCCViewer_ViewManager* TestViewer::myViewManager = 0;
-OCCViewer_ViewWindow* TestViewer::myViewWindow = 0;
+OCCViewer_ViewFrame* TestViewer::myViewWindow = 0;
QString TestViewer::myKey = "";
+extern QString REF_DATA_PATH;
+extern QString TMP_DIR;
+
OCCViewer_ViewManager* TestViewer::viewManager()
{
if( myViewManager )
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_ViewWindow*>( myViewManager->createViewWindow() );
-
+ myViewWindow = dynamic_cast<OCCViewer_ViewFrame*>( myViewManager->createViewWindow() );
+ aViewer->setTrihedronShown( false );
return myViewManager;
}
return dynamic_cast<OCCViewer_Viewer*>( viewManager()->getViewModel() );
}
-OCCViewer_ViewWindow* TestViewer::viewWindow()
+OCCViewer_ViewFrame* TestViewer::viewWindow()
{
viewManager(); //to create the view if it was not created earlier
return myViewWindow;
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())
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,
if( !aNewKey.isEmpty() )
{
myKey = aNewKey;
- eraseAll( false );
+ eraseAll( false, true );
}
-
- context()->Display( theObject, theMode, theSelectionMode );
+
if( theSelectionMode > 0 )
{
- context()->OpenLocalContext();
+ context()->Deactivate(); //OpenLocalContext();
+ context()->Display( theObject, theMode, theSelectionMode, true );
context()->Activate( theObject, theSelectionMode, Standard_True );
}
+ else
+ context()->Display( theObject, theMode, theSelectionMode, true );
if( isFitAll )
- {
- viewWindow()->onTopView();
- viewWindow()->onFitAll();
- }
+ fitAll();
+}
+
+void TestViewer::fitAll()
+{
+ viewWindow()->onTopView();
+ viewWindow()->onFitAll();
}
void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const QColor& theColor,
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)
context()->Display( aShape, theMode, 0, Standard_False );
if( isFitAll )
- {
- viewWindow()->onTopView();
- viewWindow()->onFitAll();
- }
+ fitAll();
}
+
void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const char* theKey,
int theUIANb, int theVIANb)
{
show( aLE.Value(), theMode, false, GetColor(i) );
if( isFitAll )
- {
- viewWindow()->onTopView();
- viewWindow()->onFitAll();
- }
+ fitAll();
}
/*void TestViewer::ShowShape(const TopoDS_Shape& theShape, int theMode, int& i)
return true;
}
-bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, const char* theCase )
+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;
if( theImage )
anActualImage = *theImage;
else
- anActualImage = viewWindow()->dumpView();
+ anActualImage = viewWindow()->getView(OCCViewer_ViewFrame::MAIN_VIEW)->dumpView();
+
+ if( swapRGB )
+ {
+ // A temporary patch for bug in SALOME/OCC dump; the result image contains swapped RGB colors
+ anActualImage = anActualImage.rgbSwapped();
+ }
+
if( theCase )
myKey = theCase;
- QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
+ QString anExpectedRefFilePath = REF_DATA_PATH;
anExpectedRefFilePath += "/" + myKey + ".png";
- QImage anExpectedRefImage;
+ QImage anExpectedRefImage;
anExpectedRefImage.load( anExpectedRefFilePath );
+ //std::cout << "Expected image loading: " << anExpectedRefFilePath.toStdString() << std::endl;
if( AreImagesEqual( anActualImage, anExpectedRefImage, 0.001 ) )
{
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;
}
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 );
}
}
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 )
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();
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();
return isEqual;
}
+
+void TestViewer::setKey( const QString& theKey )
+{
+ myKey = theKey;
+}
