compilation on Linux

[modules/hydro.git] / src / HYDRO_tests / TestViewer.cxx

diff --git a/src/HYDRO_tests/TestViewer.cxx b/src/HYDRO_tests/TestViewer.cxx
index f54fdfc064a7b80137e9c1de65fa5c1f91a484cf..8315d811ff5d02c3cfccbe535c3a6d775c89b465 100644 (file)
--- a/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@ -20,6 +20,7 @@
 #include <AIS_InteractiveContext.hxx>
 #include <AIS_Shape.hxx>
 #include <Aspect_ColorScale.hxx>
+#include <Prs3d_PointAspect.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <QDir>
 #include <QPainter>
@@ -88,17 +89,21 @@ QColor TestViewer::GetColor(int i)
 void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject,
                        int theMode, int theSelectionMode, bool isFitAll, const char* theKey )
 {
-  context()->CloseLocalContext();
-  context()->EraseAll( Standard_False );
+  QString aNewKey = theKey;
+  if( !aNewKey.isEmpty() )
+  {
+    myKey = aNewKey;
+    context()->CloseLocalContext();
+    context()->EraseAll( Standard_False );
+  }
+  
+  context()->Display( theObject, theMode, theSelectionMode );
   if( theSelectionMode > 0 )
   {
-    context()->Display( theObject, theMode, theSelectionMode );
     context()->OpenLocalContext();
     context()->Activate( theObject, theSelectionMode, Standard_True );
   }
 
-  myKey = theKey;
-
   if( isFitAll )
   {
     viewWindow()->onTopView();
@@ -109,6 +114,8 @@ void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject,
 void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const QColor& theColor )
 {
   Handle(AIS_Shape) aShape = new AIS_Shape( theShape );
+  if( theShape.ShapeType()==TopAbs_VERTEX )
+    aShape->Attributes()->PointAspect()->SetTypeOfMarker( Aspect_TOM_X );
   aShape->SetMaterial( Graphic3d_NOM_PLASTIC );
   aShape->SetColor( HYDROData_Tool::toOccColor( theColor ) );
   context()->Display( aShape, theMode, 0, Standard_False );
@@ -122,9 +129,14 @@ void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll,
 
 void TestViewer::show( const TopoDS_Shape& theShape, int theMode, bool isFitAll, const char* theKey )
 {
+  context()->CloseLocalContext();
   context()->EraseAll( Standard_False );
   
   myKey = theKey;
+
+  if( theShape.IsNull() )
+    return;
+
   int i = 0;
   if( theShape.ShapeType()==TopAbs_SHELL )
   {
@@ -235,3 +247,10 @@ Handle_Aspect_ColorScale TestViewer::showColorScale( bool isShow )
   }
   return aColorScale;
 }
+
+void TestViewer::select( int theViewX, int theViewY )
+{
+  Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
+  context()->MoveTo( theViewX, theViewY, aView );
+  context()->Select();
+}