#ifdef WIN32
#pragma warning ( disable: 4251 )
#endif
-#include <OCCViewer_ViewWindow.h>
+#include <OCCViewer_ViewFrame.h>
#ifdef WIN32
#pragma warning ( disable: 4251 )
#endif
-#include <AIS_InteractiveContext.hxx>
#include <AIS_Shape.hxx>
-#include <Aspect_ColorScale.hxx>
+#include <AIS_ColorScale.hxx>
#include <Prs3d_PointAspect.hxx>
#include <TopoDS_Iterator.hxx>
#include <QDir>
#include <QHash>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
+#include <Prs3d_IsoAspect.hxx>
#include <GEOMUtils.hxx>
#include <TopTools_ListOfShape.hxx>
#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;
+
OCCViewer_ViewManager* TestViewer::viewManager()
{
if( myViewManager )
aViewer->setZoomingStyle( 1 );
myViewManager->setViewModel( aViewer );
- myViewWindow = dynamic_cast<OCCViewer_ViewWindow*>( myViewManager->createViewWindow() );
+ myViewWindow = dynamic_cast<OCCViewer_ViewFrame*>( myViewManager->createViewWindow() );
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;
}
}
-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()->Display( theObject, theMode, theSelectionMode );
context()->Activate( theObject, theSelectionMode, Standard_True );
}
+ else
+ context()->Display( theObject, theMode, theSelectionMode );
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 )
+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 );
if( theShape.ShapeType()==TopAbs_VERTEX )
aShape->Attributes()->PointAspect()->SetTypeOfMarker( Aspect_TOM_X );
+ if (theShape.ShapeType()==TopAbs_FACE)
+ {
+ context()->DefaultDrawer()->UIsoAspect()->SetNumber(theUIANb);
+ context()->DefaultDrawer()->VIsoAspect()->SetNumber(theVIANb);
+ Handle_Prs3d_Drawer aDrawer = aShape->Attributes();
+ aDrawer->UIsoAspect()->SetNumber(theUIANb);
+ aDrawer->VIsoAspect()->SetNumber(theVIANb);
+ }
aShape->SetMaterial( Graphic3d_NOM_PLASTIC );
aShape->SetColor( HYDROData_Tool::toOccColor( theColor ) );
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 )
+void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const char* theKey,
+ int theUIANb, int theVIANb)
{
QString aNewKey = theKey;
if( !aNewKey.isEmpty() )
GEOMUtils::SortShapes(aListOfFaces);
TopTools_ListIteratorOfListOfShape aLF(aListOfFaces);
for( ; aLF.More(); aLF.Next(), i++)
- show( aLF.Value(), theMode, false, GetColor(i) );
+ show( aLF.Value(), theMode, false, GetColor(i), theUIANb, theVIANb );
//show all independent wires
TopTools_ListOfShape aListOfWires;
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 )
+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 = viewWindow()->dumpView();
+ QImage anActualImage;
+ if( theImage )
+ anActualImage = *theImage;
+ else
+ anActualImage = viewWindow()->getView(OCCViewer_ViewFrame::MAIN_VIEW)->dumpView();
- QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
+ 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 = REF_DATA_PATH;
anExpectedRefFilePath += "/" + myKey + ".png";
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 temp = QDir::tempPath();
+#ifndef WIN32
+ temp += "/hydro";
+ if( !QDir().exists( temp ) )
+ QDir().mkpath( temp );
+#endif
+
+ QString aPath = temp + "/" + 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 );
+ QImage aDiff = diff( anExpectedRefImage, anActualImage );
- QString aDiffFilePath = QDir::tempPath() + "/" + myKey + "_diff.png";
+ QString aDiffFilePath = temp + "/" + myKey + "_diff.png";
aDiff.save( aDiffFilePath );
+ //std::cout << "Diff image: " << aDiffFilePath.toStdString() << std::endl;
+
+ QString anExpected = temp + "/" + myKey + "_1.png";
+ //std::cout << "Expected image: " << anExpected.toStdString() << std::endl;
+ anExpectedRefImage.save( anExpected );
return false;
}
-Handle_Aspect_ColorScale TestViewer::colorScale()
+Handle(AIS_ColorScale) TestViewer::colorScale()
{
- Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
- if( aView.IsNull() )
- return Handle(Aspect_ColorScale)();
- else
- return aView->ColorScale();
+ static Handle(AIS_ColorScale) aColorScale = new AIS_ColorScale();
+
+ return aColorScale;
}
void TestViewer::showColorScale( bool isShow )
{
- Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
- if( aView.IsNull() )
- return;
-
- Handle(Aspect_ColorScale) aColorScale = colorScale();
+ Handle(AIS_ColorScale) aColorScale = colorScale();
if( aColorScale.IsNull() )
return;
aColorScale->SetTitle( "test" );
aColorScale->SetRange( 0, 1 );
+ aColorScale->SetToUpdate();
+
if( isShow )
{
- if( !aView->ColorScaleIsDisplayed() )
- aView->ColorScaleDisplay();
+ if( !context()->IsDisplayed( aColorScale ) )
+ context()->Display( aColorScale );
}
else
{
- if( aView->ColorScaleIsDisplayed() )
- aView->ColorScaleErase();
+ if( context()->IsDisplayed( aColorScale ) )
+ context()->Erase( aColorScale );
}
}
+bool TestViewer::ColorScaleIsDisplayed()
+{
+ return context()->IsDisplayed( colorScale() );
+}
+
void TestViewer::select( int theViewX, int theViewY )
{
Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
context()->MoveTo( theViewX, theViewY, aView );
context()->Select();
+ // 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;
+#ifdef WIN32
QString anActualFilePath = QDir::tempPath() + "/" + theBaseName;
+#else
+ QString anActualFilePath = QDir::tempPath() + "/hydro/" + theBaseName;
+#endif
QFile anExpected( anExpectedRefFilePath );
QFile anActual( anActualFilePath );
return isEqual;
}
+
+void TestViewer::setKey( const QString& theKey )
+{
+ myKey = theKey;
+}