#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>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
#ifdef WIN32
#pragma warning ( default: 4251 )
return myViewWindow;
}
-Handle(AIS_InteractiveContext) context()
+Handle(AIS_InteractiveContext) TestViewer::context()
{
- return TestViewer::viewer()->getAISContext();
+ return viewer()->getAISContext();
}
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 )
{
if( !aNewKey.isEmpty() )
{
myKey = aNewKey;
- context()->CloseLocalContext();
- context()->EraseAll( Standard_False );
+ eraseAll( false );
}
context()->Display( theObject, theMode, theSelectionMode );
}
if( isFitAll )
- {
- viewWindow()->onTopView();
- viewWindow()->onFitAll();
- }
+ fitAll();
}
-void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const QColor& theColor )
+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 );
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() )
{
- context()->CloseLocalContext();
- context()->EraseAll( Standard_False );
+ eraseAll( false );
myKey = aNewKey;
}
if( theShape.IsNull() )
return;
- if( theShape.ShapeType()==TopAbs_COMPOUND )
- {
- TopExp_Explorer anExplorer( theShape, TopAbs_FACE );
- for( ; anExplorer.More(); anExplorer.Next() )
- ShowShape (anExplorer.Current(), theMode);
- }
- else
- ShowShape(theShape, theMode);
-
+ int i = 0;
+ //show all faces first
+ TopTools_ListOfShape aListOfFaces;
+ TopExp_Explorer aFE( theShape, TopAbs_FACE );
+ for( ; aFE.More(); aFE.Next() )
+ aListOfFaces.Append(aFE.Current());
+ GEOMUtils::SortShapes(aListOfFaces);
+ TopTools_ListIteratorOfListOfShape aLF(aListOfFaces);
+ for( ; aLF.More(); aLF.Next(), i++)
+ show( aLF.Value(), theMode, false, GetColor(i), theUIANb, theVIANb );
+
+ //show all independent wires
+ TopTools_ListOfShape aListOfWires;
+ TopExp_Explorer aWE( theShape, TopAbs_WIRE, TopAbs_FACE );
+ for( ; aWE.More(); aWE.Next() )
+ aListOfWires.Append(aWE.Current());
+ GEOMUtils::SortShapes(aListOfWires);
+ TopTools_ListIteratorOfListOfShape aLW(aListOfWires);
+ for( ; aLW.More(); aLW.Next(), i++)
+ show( aLW.Value(), theMode, false, GetColor(i) );
+
+ //show all independent edges
+ TopTools_ListOfShape aListOfEdges;
+ TopExp_Explorer anEE( theShape, TopAbs_EDGE, TopAbs_WIRE );
+ for( ; anEE.More(); anEE.Next())
+ aListOfEdges.Append(anEE.Current());
+ GEOMUtils::SortShapes(aListOfEdges);
+ TopTools_ListIteratorOfListOfShape aLE(aListOfEdges);
+ for( ; aLE.More(); aLE.Next(), i++)
+ show( aLE.Value(), theMode, false, GetColor(i) );
if( isFitAll )
- {
- viewWindow()->onTopView();
- viewWindow()->onFitAll();
- }
+ fitAll();
}
-void TestViewer::ShowShape(const TopoDS_Shape& theShape, int theMode)
+/*void TestViewer::ShowShape(const TopoDS_Shape& theShape, int theMode, int& i)
{
- int i = 0;
if( theShape.ShapeType()==TopAbs_SHELL )
{
TopoDS_Iterator anIt( theShape );
- for( ; anIt.More(); anIt.Next(), i++ )
+ for( ; anIt.More(); anIt.Next())
+ {
show( anIt.Value(), theMode, false, GetColor(i) );
+ i++;
+ }
}
else if (theShape.ShapeType()==TopAbs_FACE ||
theShape.ShapeType()==TopAbs_WIRE ||
theShape.ShapeType()==TopAbs_EDGE ||
theShape.ShapeType()==TopAbs_VERTEX )
- show( theShape, theMode, false, GetColor(0) );
-}
+ {
+ show( theShape, theMode, false, GetColor(i) );
+ i++;
+ }
+}*/
bool AreImagesEqual( const QImage& theImage1, const QImage& theImage2, double theTolerance )
{
return true;
}
-bool TestViewer::AssertImages( QString& theMessage )
+bool TestViewer::AssertImages( QString& theMessage, const QImage* theImage, const char* theCase )
{
- QImage anActualImage = viewWindow()->dumpView();
+ QImage anActualImage;
+ if( theImage )
+ anActualImage = *theImage;
+ else
+ anActualImage = viewWindow()->dumpView();
- QString anExpectedRefFilePath = qgetenv( "HYDRO_REFERENCE_DATA" );
+ if( theCase )
+ myKey = theCase;
+
+ QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
anExpectedRefFilePath += "/" + myKey + ".png";
QImage anExpectedRefImage;
anExpectedRefImage.load( anExpectedRefFilePath );
QString aDiffFilePath = QDir::tempPath() + "/" + myKey + "_diff.png";
aDiff.save( aDiffFilePath );
+ anExpectedRefImage.save( QDir::tempPath() + "/" + myKey + "_1.png");
+
return false;
}
-Handle_Aspect_ColorScale TestViewer::showColorScale( bool isShow )
+Handle(AIS_ColorScale) TestViewer::colorScale()
{
- Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
- if( aView.IsNull() )
- return Handle(Aspect_ColorScale)();
+ static Handle(AIS_ColorScale) aColorScale = new AIS_ColorScale();
- Handle(Aspect_ColorScale) aColorScale = aView->ColorScale();
+ return aColorScale;
+}
+
+void TestViewer::showColorScale( bool isShow )
+{
+ Handle(AIS_ColorScale) aColorScale = colorScale();
if( aColorScale.IsNull() )
- return aColorScale;
+ return;
Standard_Real anXPos = 0.05;
Standard_Real anYPos = 0.1;
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 );
}
- return aColorScale;
+}
+
+bool TestViewer::ColorScaleIsDisplayed()
+{
+ return context()->IsDisplayed( colorScale() );
}
void TestViewer::select( int theViewX, int theViewY )
context()->Select();
}
-bool TestViewer::areScriptsEqual( const QString& theBaseName )
+QString GetLine( QFile& theFile, bool isUtf8 )
{
- QString anExpectedRefFilePath = qgetenv( "HYDRO_REFERENCE_DATA" );
+ 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_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
anExpectedRefFilePath += "/" + theBaseName;
QString anActualFilePath = QDir::tempPath() + "/" + 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();
