LOT 15

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

diff --git a/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx b/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
index 381923d88e483bd101664345e9bf874b6d2e7c53..3ef0794ee9b50acea02ba342cc13d1360c52934f 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
+++ b/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,7 +22,7 @@
 #include <HYDROData_Tool.h>
 
 #include <SALOME_Actor.h>
-#include <gp_XYZ.hxx>
+#include <gp_Pnt.hxx>
 #include <vtkDoubleArray.h>
 #include <vtkPoints.h>
 #include <vtkPolyData.h>
@@ -67,13 +63,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.size();
 
       HYDROData_Bathymetry::AltitudePoint anAltPnt;
       vtkPoints* aPoints = vtkPoints::New();
@@ -87,21 +85,17 @@ void HYDROGUI_VTKPrsBathymetry::compute()
 
       vtkVertex* aVertex = vtkVertex::New();
 
-      int aZ;
+      double aZ;
       int anInvalidZ = InvalidZValue();
       for (int i = 0; i < aNbPoints; i++ )
       {
-        anAltPnt = anAltPoints.at( i );
-        aZ = anAltPnt.Z();
+        anAltPnt = anAltPoints[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 );
+        aPoints->InsertPoint( i, anAltPnt.X, anAltPnt.Y, aZ );
         aVertex->GetPointIds()->SetId( 0, i );
         aVertexGrid->InsertNextCell( aVertex->GetCellType(), aVertex->GetPointIds());
         aZValues->InsertNextValue( aZ );
@@ -112,23 +106,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 +139,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();
     }
   }
 }