#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;
}
int i = 0;
//show all faces first
+ TopTools_ListOfShape aListOfFaces;
TopExp_Explorer aFE( theShape, TopAbs_FACE );
- for( ; aFE.More(); aFE.Next(), i++ )
- show( aFE.Current(), theMode, false, GetColor(i) );
+ 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(), i++ )
- show( aWE.Current(), theMode, false, GetColor(i) );
+ 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(), i++ )
- show( anEE.Current(), theMode, false, GetColor(i) );
+ 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 )
{
{
QImage anActualImage = viewWindow()->dumpView();
- QString anExpectedRefFilePath = qgetenv( "HYDRO_REFERENCE_DATA" );
+ QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
anExpectedRefFilePath += "/" + myKey + ".png";
QImage anExpectedRefImage;
anExpectedRefImage.load( anExpectedRefFilePath );
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;
}
void TestViewer::select( int theViewX, int theViewY )
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;