Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
quick optimization patch (bytearray for images)
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_VTKPrsBathymetry.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
b/src/HYDROGUI/HYDROGUI_VTKPrsBathymetry.cxx
index 49217c954aa77cfd0ca89a914d748738cfc7548e..3ef0794ee9b50acea02ba342cc13d1360c52934f 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
// 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();
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();
HYDROData_Bathymetry::AltitudePoint anAltPnt;
vtkPoints* aPoints = vtkPoints::New();
@@
-91,16
+87,16
@@
void HYDROGUI_VTKPrsBathymetry::compute()
double aZ;
int anInvalidZ = InvalidZValue();
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
}
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 );
- aVertex->GetPointIds()->SetId( 0, i
- 1
);
+ aPoints->InsertPoint( i
, anAltPnt.X, anAltPnt.Y
, aZ );
+ aVertex->GetPointIds()->SetId( 0, i );
aVertexGrid->InsertNextCell( aVertex->GetCellType(), aVertex->GetPointIds());
aZValues->InsertNextValue( aZ );
}
aVertexGrid->InsertNextCell( aVertex->GetCellType(), aVertex->GetPointIds());
aZValues->InsertNextValue( aZ );
}