Bathymetry prs corrected according to new API.

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

diff --git a/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx b/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
index 381923d88e483bd101664345e9bf874b6d2e7c53..b02bd0e2fc9f604be416e24d73d82a6857036977 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
+++ b/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
@@ -67,13 +67,15 @@ HYDROGUI_VTKPrsBathymetry::~HYDROGUI_VTKPrsBathymetry()
 //================================================================
 void HYDROGUI_VTKPrsBathymetry::compute()
 {
+  HYDROGUI_VTKPrs::compute();
+
   if ( !getObject().IsNull() )
   {
     Handle(HYDROData_Bathymetry) aBathymetry = Handle(HYDROData_Bathymetry)::DownCast( getObject() );
     if ( !aBathymetry.IsNull() )
     {
       HYDROData_Bathymetry::AltitudePoints anAltPoints = aBathymetry->GetAltitudePoints();
-      int aNbPoints = anAltPoints.length();
+      int aNbPoints = anAltPoints.Length();
 
       HYDROData_Bathymetry::AltitudePoint anAltPnt;
       vtkPoints* aPoints = vtkPoints::New();
@@ -87,19 +89,15 @@ void HYDROGUI_VTKPrsBathymetry::compute()
 
       vtkVertex* aVertex = vtkVertex::New();
 
-      int aZ;
+      double aZ;
       int anInvalidZ = InvalidZValue();
-      for (int i = 0; i < aNbPoints; i++ )
+      for (int i = 1; i <= aNbPoints; i++ )
       {
-        anAltPnt = anAltPoints.at( i );
+        anAltPnt = anAltPoints.Value( i );
         aZ = anAltPnt.Z();
         if ( ValuesLessEquals( aZ, anInvalidZ ) )
         {
-          aZ = Z_MAX;
-        }
-        else
-        {
-          aZ = -aZ;
+          aZ = Z_MAX; // If Z value is invalid then use Z_MAX
         }
         aPoints->InsertPoint( i, anAltPnt.X(), anAltPnt.Y(), aZ );
         aVertex->GetPointIds()->SetId( 0, i );
@@ -112,23 +110,13 @@ void HYDROGUI_VTKPrsBathymetry::compute()
       aVertexGrid->SetPoints( aPoints );
       aVertexGrid->GetPointData()->SetScalars( aZValues );
       
-      //vtkLookupTable* aLut = vtkLookupTable::New();
-      //aLut->SetHueRange( HUE_START, HUE_END );
-      //aLut->SetSaturationRange( SATURATION_START, SATURATION_END );
-      //aLut->SetTableRange( Z_MIN, Z_MAX );
-      //aLut->SetValueRange( 1.0, 1.0 );
-      //aLut->SetAlphaRange( 1.0, 1.0 );
-      //aLut->SetNumberOfColors( NB_COLORS );
-      //aLut->Build();
-      
       // Update the lookup table range if this bathymetry is out of it
       if ( myLookupTable )
       {
         aZValues->GetRange( myInternalZRange );
-
         double* aGlobalRange = myLookupTable->GetRange();
         // If the global range is not yet initialized or the current one is out of scope then update the global
-        bool anIsUpdated;
+        bool anIsUpdated = false;
         if (  ValuesEquals( aGlobalRange[0], anInvalidZ ) || ( aGlobalRange[0] > myInternalZRange[0] ) )
         {
           aGlobalRange[0] = myInternalZRange[0];
@@ -155,10 +143,13 @@ void HYDROGUI_VTKPrsBathymetry::compute()
 
       myMapper->SetInputData( aVertexGrid );
       
-      SALOME_Actor* anActor = SALOME_Actor::New();
+      SALOME_Actor* anActor = getActor<SALOME_Actor>(this);
       anActor->SetMapper( myMapper.GetPointer() );
       anActor->setIO( getIO() );
       AddObject( anActor );
+
+      aVertexGrid->Delete();
+      aZValues->Delete();
     }
   }
 }