#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
+#include <GEOMUtils.hxx>
+#include <TopTools_ListOfShape.hxx>
+#include <TopTools_ListIteratorOfListOfShape.hxx>
+
#ifdef WIN32
#pragma warning ( default: 4251 )
#endif
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 );
QString aNewKey = theKey;
if( !aNewKey.isEmpty() )
{
- context()->CloseLocalContext();
- context()->EraseAll( Standard_False );
+ eraseAll( false );
myKey = aNewKey;
}
return;
int i = 0;
- if( theShape.ShapeType()==TopAbs_COMPOUND )
- {
- TopExp_Explorer anExplorer( theShape, TopAbs_FACE );
- for( ; anExplorer.More(); anExplorer.Next() )
- ShowShape (anExplorer.Current(), theMode, i);
- }
- else
- ShowShape(theShape, theMode, i);
-
+ //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) );
+
+ //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 )
{
}
}
-void TestViewer::ShowShape(const TopoDS_Shape& theShape, int theMode, int& i)
+/*void TestViewer::ShowShape(const TopoDS_Shape& theShape, int theMode, int& i)
{
if( theShape.ShapeType()==TopAbs_SHELL )
{
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();
+
+ if( theCase )
+ myKey = theCase;
- QString anExpectedRefFilePath = qgetenv( "HYDRO_REFERENCE_DATA" );
+ QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test";
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_Aspect_ColorScale TestViewer::colorScale()
{
Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
if( aView.IsNull() )
return Handle(Aspect_ColorScale)();
+ else
+ return aView->ColorScale();
+}
- Handle(Aspect_ColorScale) aColorScale = aView->ColorScale();
+void TestViewer::showColorScale( bool isShow )
+{
+ Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
+ if( aView.IsNull() )
+ return;
+
+ Handle(Aspect_ColorScale) aColorScale = colorScale();
if( aColorScale.IsNull() )
- return aColorScale;
+ return;
Standard_Real anXPos = 0.05;
Standard_Real anYPos = 0.1;
if( aView->ColorScaleIsDisplayed() )
aView->ColorScaleErase();
}
- return aColorScale;
+}
+
+bool TestViewer::ColorScaleIsDisplayed()
+{
+ Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
+ if( aView.IsNull() )
+ return false;
+ return aView->ColorScaleIsDisplayed();
}
void TestViewer::select( int theViewX, int theViewY )
context()->Select();
}
-bool TestViewer::areScriptsEqual( const QString& theBaseName )
+QString GetLine( QFile& theFile, bool isUtf8 )
+{
+ 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_REFERENCE_DATA" );
+ 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();
