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
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 31817f2c4b09d4e5245763f62d778ea4b04caba1..6833acec714a898feb6e226e969ab106b4f9303c 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
// 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
//
// 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 <HYDROData_Tool.h>
#include <SALOME_Actor.h>
-#include <gp_
XYZ
.hxx>
+#include <gp_
Pnt
.hxx>
#include <vtkDoubleArray.h>
#include <vtkPoints.h>
#include <vtkPolyData.h>
#include <vtkDoubleArray.h>
#include <vtkPoints.h>
#include <vtkPolyData.h>
@@
-67,13
+63,15
@@
HYDROGUI_VTKPrsBathymetry::~HYDROGUI_VTKPrsBathymetry()
//================================================================
void HYDROGUI_VTKPrsBathymetry::compute()
{
//================================================================
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();
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();
HYDROData_Bathymetry::AltitudePoint anAltPnt;
vtkPoints* aPoints = vtkPoints::New();
@@
-91,14
+89,14
@@
void HYDROGUI_VTKPrsBathymetry::compute()
int anInvalidZ = InvalidZValue();
for (int i = 0; i < aNbPoints; i++ )
{
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; // 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
, 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 );
}
aVertexGrid->InsertNextCell( aVertex->GetCellType(), aVertex->GetPointIds());
aZValues->InsertNextValue( aZ );
}
@@
-141,12
+139,11
@@
void HYDROGUI_VTKPrsBathymetry::compute()
myMapper->SetInputData( aVertexGrid );
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 );
anActor->SetMapper( myMapper.GetPointer() );
anActor->setIO( getIO() );
AddObject( anActor );
- anActor->Delete();
aVertexGrid->Delete();
aZValues->Delete();
}
aVertexGrid->Delete();
aZValues->Delete();
}