Merge branch 'BR_1328' into BR_DEMO

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

diff --git a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
index 76065dfc3909fa9dd00b42a53afdce6a4ddef60d..cf9a3681c99a0a7007b8fb5800bd7e4057bd87f9 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
+++ b/src/HYDROGUI/HYDROGUI_ShapeBathymetry.cxx
@@ -70,8 +70,8 @@ Handle(AIS_InteractiveObject) HYDROGUI_ShapeBathymetry::createShape() const
   Handle(HYDROData_Bathymetry) aBath = Handle(HYDROData_Bathymetry)::DownCast( getObject() );
   if( !aBath.IsNull() )
   {
-    aPntCloud = new HYDROGUI_BathymetryPrs();
-    aPntCloud->SetHilightMode( AIS_PointCloud::DM_BndBox );
+    aPntCloud = new HYDROGUI_BathymetryPrs( this );
+    //aPntCloud->SetHilightMode( AIS_PointCloud::DM_BndBox );
     aPntCloud->Attributes()->SetPointAspect (new Prs3d_PointAspect (Aspect_TOM_POINT, Quantity_NOC_WHITE, 2.0));
 
     const HYDROData_Bathymetry::AltitudePoints& aBathPoints = aBath->GetAltitudePoints();
@@ -104,9 +104,10 @@ void HYDROGUI_ShapeBathymetry::UpdateWithColorScale( const Handle(AIS_ColorScale
     theColorScale->FindColor( z, aColor );
     myColors->SetValue( i, aColor );
   }
-  Handle(AIS_PointCloud) aPntCloud = Handle(AIS_PointCloud)::DownCast( getAISObject() );
+  Handle(HYDROGUI_BathymetryPrs) aPntCloud = Handle(HYDROGUI_BathymetryPrs)::DownCast( getAISObject() );
   aPntCloud->SetPoints( myCoords, myColors );
   getContext()->RecomputePrsOnly( aPntCloud, Standard_True );
+  getContext()->RecomputeSelectionOnly( aPntCloud );
 }
 
 void HYDROGUI_ShapeBathymetry::setVisible( const bool theState,
@@ -227,6 +228,7 @@ void HYDROGUI_ShapeBathymetry::Rescale( double theMin, double theMax )
   getContext()->ClearSelected();
   myMin = qMin( theMin, theMax );
   myMax = qMax( theMin, theMax );
+  setToUpdateColorScale( true );
   getAISObject()->Redisplay();
 }
 
@@ -268,7 +270,10 @@ void HYDROGUI_ShapeBathymetry::TextLabels( bool isOn )
   if( prs.IsNull() )
     return;
 
-  QList<int> selection = selected();
+  QList<int> selection;
+  if( isOn )
+    selection = selected();
+
   getContext()->ClearSelected();
   prs->SetTextLabels( selection );
   getAISObject()->Redisplay();