Initial merge of branch 'BR_HYDRO_IMPS_2016' into BR_PORTING_OCCT_7

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

diff --git a/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx b/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
index 49217c954aa77cfd0ca89a914d748738cfc7548e..6833acec714a898feb6e226e969ab106b4f9303c 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
+++ b/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  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
@@ -75,7 +71,7 @@ void HYDROGUI_VTKPrsBathymetry::compute()
     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();
@@ -91,15 +87,15 @@ void HYDROGUI_VTKPrsBathymetry::compute()
 
       double aZ;
       int anInvalidZ = InvalidZValue();
-      for (int i = 1; i <= aNbPoints; i++ )
+      for (int i = 0; i < aNbPoints; i++ )
       {
-        anAltPnt = anAltPoints.Value( i );
-        aZ = anAltPnt.Z();
+        anAltPnt = anAltPoints[i];
+        aZ = anAltPnt.Z;
         if ( ValuesLessEquals( aZ, anInvalidZ ) )
         {
           aZ = Z_MAX; // If Z value is invalid then use Z_MAX
         }
-        aPoints->InsertPoint( i - 1, anAltPnt.X(), anAltPnt.Y(), aZ );
+        aPoints->InsertPoint( i - 1, anAltPnt.X, anAltPnt.Y, aZ );
         aVertex->GetPointIds()->SetId( 0, i - 1 );
         aVertexGrid->InsertNextCell( aVertex->GetCellType(), aVertex->GetPointIds());
         aZValues->InsertNextValue( aZ );