#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>
}
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)
if( theCase )
myKey = theCase;
- QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test";
+ QString anExpectedRefFilePath = qgetenv( "HYDRO_ROOT_DIR" ) + "/bin/salome/test/HYDRO";
anExpectedRefFilePath += "/" + myKey + ".png";
QImage anExpectedRefImage;
anExpectedRefImage.load( anExpectedRefFilePath );
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();