X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_VTKPrsBathymetry.cxx;h=6833acec714a898feb6e226e969ab106b4f9303c;hb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;hp=97d0d6c1237256fa0bffe31157b63819054ada1e;hpb=22b644ae359fb629c422b3554e3353db8d126df2;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx b/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx index 97d0d6c1..6833acec 100644 --- 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 #include -#include +#include #include #include #include @@ -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 );