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 fd8c5f867f3550c52a7ec04818a8a747680dfdd3..8315d811ff5d02c3cfccbe535c3a6d775c89b465 100644 (file)
--- a/src/HYDRO_tests/TestViewer.cxx
+++ b/src/HYDRO_tests/TestViewer.cxx
@@ -2,6 +2,9 @@
 #include <TestViewer.h>
 #include <HYDROData_Tool.h>
 #include <OCCViewer_ViewManager.h>
+#ifdef WIN32
+  #pragma warning ( disable: 4251 )
+#endif
 #include <OCCViewer_ViewPort3d.h>
 #ifdef WIN32
   #pragma warning ( disable: 4251 )
@@ -17,8 +20,8 @@
 #include <AIS_InteractiveContext.hxx>
 #include <AIS_Shape.hxx>
 #include <Aspect_ColorScale.hxx>
+#include <Prs3d_PointAspect.hxx>
 #include <TopoDS_Iterator.hxx>
-
 #include <QDir>
 #include <QPainter>
 #include <QHash>
@@ -69,24 +72,37 @@ Handle(AIS_InteractiveContext) context()
 
 QColor TestViewer::GetColor(int i)
 {
-  QVector<QColor> aCV;
-  aCV  << QColor(0,0,255) 
-    << QColor(0,255,0)
-    << QColor(255,0,0)
-    << QColor(255,255,20) 
-    << QColor(20,255,255) 
-    << QColor(100,100,20) 
-    << QColor(10,100,150);
+  static QVector<QColor> aCV;
+  if( aCV.isEmpty() )
+  {
+    aCV  << QColor(0,0,255) 
+         << QColor(0,255,0)
+         << QColor(255,0,0)
+         << QColor(255,255,20) 
+         << QColor(20,255,255) 
+         << QColor(100,100,20) 
+         << QColor(10,100,150);
+  }
   return aCV[i];
 }
 
 void TestViewer::show( const Handle(AIS_InteractiveObject)& theObject,
                        int theMode, int theSelectionMode, bool isFitAll, const char* theKey )
 {
-  context()->EraseAll( Standard_False );
+  QString aNewKey = theKey;
+  if( !aNewKey.isEmpty() )
+  {
+    myKey = aNewKey;
+    context()->CloseLocalContext();
+    context()->EraseAll( Standard_False );
+  }
+  
   context()->Display( theObject, theMode, theSelectionMode );
-
-  myKey = theKey;
+  if( theSelectionMode > 0 )
+  {
+    context()->OpenLocalContext();
+    context()->Activate( theObject, theSelectionMode, Standard_True );
+  }
 
   if( isFitAll )
   {
@@ -98,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 );
@@ -111,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 )
   {
@@ -185,7 +208,7 @@ bool TestViewer::AssertImages( QString& theMessage )
   return false;
 }
 
-Handle_Aspect_ColorScale TestViewer::showColorScale()
+Handle_Aspect_ColorScale TestViewer::showColorScale( bool isShow )
 {
   Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
   if( aView.IsNull() )
@@ -212,8 +235,22 @@ Handle_Aspect_ColorScale TestViewer::showColorScale()
   aColorScale->SetTitle( "test" );
   aColorScale->SetRange( 0, 1 );
 
-  if( !aView->ColorScaleIsDisplayed() )
-    aView->ColorScaleDisplay();
-
+  if( isShow )
+  {
+    if( !aView->ColorScaleIsDisplayed() )
+      aView->ColorScaleDisplay();
+  }
+  else
+  {
+    if( aView->ColorScaleIsDisplayed() )
+      aView->ColorScaleErase();
+  }
   return aColorScale;
 }
+
+void TestViewer::select( int theViewX, int theViewY )
+{
+  Handle(V3d_View) aView = myViewWindow->getViewPort()->getView();
+  context()->MoveTo( theViewX, theViewY, aView );
+  context()->Select();
+}