correct merge BR_hydro_v1_0_3 on BR_quadtree

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

diff --git a/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx b/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
index 5b7a850be4cb5d9ede0d6660454d4bd3bea06979..1500654565d928fe36a92c8e3146093abc1f9816 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
+++ b/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
@@ -26,7 +26,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>
@@ -75,7 +75,7 @@ void HYDROGUI_VTKPrsBathymetry::compute()
     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();
@@ -91,16 +91,16 @@ void HYDROGUI_VTKPrsBathymetry::compute()
 
       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; // If Z value is invalid then use Z_MAX
         }
-        aPoints->InsertPoint( i, anAltPnt.X(), anAltPnt.Y(), aZ );
-        aVertex->GetPointIds()->SetId( 0, i );
+        aPoints->InsertPoint( i - 1, anAltPnt.X(), anAltPnt.Y(), aZ );
+        aVertex->GetPointIds()->SetId( 0, i - 1 );
         aVertexGrid->InsertNextCell( aVertex->GetCellType(), aVertex->GetPointIds());
         aZValues->InsertNextValue( aZ );
       }