refs #1330: draft preferences implementation for polyline arrow

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ShapeBathymetry.cxx

diff --git a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
index e8e7941b670df5490036037941cc70b95161a62b..3a72a138893dc1707e32925cd620335dedcaa9c8 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
+++ b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
@@ -22,12 +22,12 @@
 #include <HYDROData_Bathymetry.h>
 
 #include <AIS_InteractiveContext.hxx>
-#include <Aspect_ColorScale.hxx>
+#include <AIS_ColorScale.hxx>
 #include <Prs3d_PointAspect.hxx>
 
 HYDROGUI_ShapeBathymetry::HYDROGUI_ShapeBathymetry( HYDROGUI_OCCDisplayer*                theDisplayer,
                                                     const Handle(AIS_InteractiveContext)& theContext,
-                                                    const Handle_HYDROData_Bathymetry&    theBathymetry,
+                                                    const Handle(HYDROData_Bathymetry)&   theBathymetry,
                                                     const int                             theZLayer )
 : HYDROGUI_Shape( theContext, theBathymetry, theZLayer ),
   myDisplayer( theDisplayer )
@@ -58,12 +58,16 @@ void HYDROGUI_ShapeBathymetry::update( bool theIsUpdateViewer, bool isDeactivate
 }
 
 
-Handle_AIS_InteractiveObject HYDROGUI_ShapeBathymetry::createShape() const
+QList<Handle(AIS_InteractiveObject)> HYDROGUI_ShapeBathymetry::createShape() const
 {
-  Handle_HYDROData_Bathymetry aBath = Handle_HYDROData_Bathymetry::DownCast( getObject() );
+  QList<Handle(AIS_InteractiveObject)> shapes;
+
+  Handle(AIS_InteractiveObject) aPntCloud;
+
+  Handle(HYDROData_Bathymetry) aBath = Handle(HYDROData_Bathymetry)::DownCast( getObject() );
   if( !aBath.IsNull() )
   {
-    Handle_AIS_PointCloud aPntCloud = new HYDROGUI_BathymetryPrs();
+    aPntCloud = new HYDROGUI_BathymetryPrs();
     aPntCloud->SetHilightMode( AIS_PointCloud::DM_BndBox );
     aPntCloud->Attributes()->SetPointAspect (new Prs3d_PointAspect (Aspect_TOM_POINT, Quantity_NOC_WHITE, 2.0));
 
@@ -77,10 +81,10 @@ Handle_AIS_InteractiveObject HYDROGUI_ShapeBathymetry::createShape() const
     for( int i=aLower; i<=anUpper; i++ )
       aThat->myCoords->SetValue( i, gp_Pnt( aBathPoints[i].X, aBathPoints[i].Y, aBathPoints[i].Z ) );
 
-    return aPntCloud;
+    shapes.append( aPntCloud );
   }
-  else
-    return Handle_AIS_InteractiveObject();
+
+  return shapes;
 }
 
 void HYDROGUI_ShapeBathymetry::GetRange( double& theMin, double& theMax ) const
@@ -102,7 +106,7 @@ void HYDROGUI_ShapeBathymetry::GetRange( double& theMin, double& theMax ) const
   }
 }
 
-void HYDROGUI_ShapeBathymetry::UpdateWithColorScale( const Handle(Aspect_ColorScale)& theColorScale )
+void HYDROGUI_ShapeBathymetry::UpdateWithColorScale( const Handle(AIS_ColorScale)& theColorScale )
 {
   if (!myCoords)
     return;
@@ -113,7 +117,7 @@ void HYDROGUI_ShapeBathymetry::UpdateWithColorScale( const Handle(Aspect_ColorSc
     theColorScale->FindColor( z, aColor );
     myColors->SetValue( i, aColor );
   }
-  Handle_AIS_PointCloud aPntCloud = Handle_AIS_PointCloud::DownCast( getAISObject() );
+  Handle(AIS_PointCloud) aPntCloud = Handle(AIS_PointCloud)::DownCast( getAISObjects()[0] );
   aPntCloud->SetPoints( myCoords, myColors );
   getContext()->Redisplay( aPntCloud, Standard_False );
 }
@@ -121,7 +125,7 @@ void HYDROGUI_ShapeBathymetry::UpdateWithColorScale( const Handle(Aspect_ColorSc
 void HYDROGUI_ShapeBathymetry::setVisible( const bool theState,
                                            const bool theIsUpdateViewer )
 {
-  bool isShown = getContext()->IsDisplayed( getAISObject() );
+  bool isShown = getContext()->IsDisplayed( getAISObjects()[0] );
   bool isChanged = ( isShown != theState );
   HYDROGUI_Shape::setVisible( theState, theIsUpdateViewer );
   setToUpdateColorScale( isChanged );
@@ -129,7 +133,7 @@ void HYDROGUI_ShapeBathymetry::setVisible( const bool theState,
 
 void HYDROGUI_ShapeBathymetry::displayShape( const bool theIsUpdateViewer )
 {
-  bool isShown = getContext()->IsDisplayed( getAISObject() );
+  bool isShown = getContext()->IsDisplayed( getAISObjects()[0] );
   bool isChanged = ( !isShown  );
   HYDROGUI_Shape::displayShape( theIsUpdateViewer );
   setToUpdateColorScale( isChanged );
@@ -137,7 +141,7 @@ void HYDROGUI_ShapeBathymetry::displayShape( const bool theIsUpdateViewer )
 
 void HYDROGUI_ShapeBathymetry::display( const bool theIsUpdateViewer )
 {
-  bool isShown = getContext()->IsDisplayed( getAISObject() );
+  bool isShown = getContext()->IsDisplayed( getAISObjects()[0] );
   bool isChanged = ( !isShown  );
   HYDROGUI_Shape::display( theIsUpdateViewer );
   setToUpdateColorScale( isChanged );
@@ -145,7 +149,7 @@ void HYDROGUI_ShapeBathymetry::display( const bool theIsUpdateViewer )
 
 void HYDROGUI_ShapeBathymetry::erase( const bool theIsUpdateViewer )
 {
-  bool isShown = getContext()->IsDisplayed( getAISObject() );
+  bool isShown = getContext()->IsDisplayed( getAISObjects()[0] );
   bool isChanged = ( isShown  );
   HYDROGUI_Shape::erase( theIsUpdateViewer );
   setToUpdateColorScale( isChanged );