Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bos #20256: [CEA 18523] Porting SMESH to int 64 bits
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_DeviceActor.cxx
diff --git
a/src/OBJECT/SMESH_DeviceActor.cxx
b/src/OBJECT/SMESH_DeviceActor.cxx
index f6db97d25e162aec96042df4255cdb7114ff7d03..bd9f62e4abb4e148ed6f995ebf04a18d546613bf 100644
(file)
--- a/
src/OBJECT/SMESH_DeviceActor.cxx
+++ b/
src/OBJECT/SMESH_DeviceActor.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-31,12
+31,13
@@
#include "SMESH_ControlsDef.hxx"
#include "SMESH_ActorUtils.h"
#include "SMESH_FaceOrientationFilter.h"
#include "SMESH_ControlsDef.hxx"
#include "SMESH_ActorUtils.h"
#include "SMESH_FaceOrientationFilter.h"
-#include "VTKViewer_CellLocationsArray.h"
+
//
#include "VTKViewer_CellLocationsArray.h"
#include "VTKViewer_PolyDataMapper.h"
#include <VTKViewer_Transform.h>
#include <VTKViewer_TransformFilter.h>
#include <VTKViewer_ExtractUnstructuredGrid.h>
#include "VTKViewer_PolyDataMapper.h"
#include <VTKViewer_Transform.h>
#include <VTKViewer_TransformFilter.h>
#include <VTKViewer_ExtractUnstructuredGrid.h>
+#include <VTKViewer_Actor.h>
// VTK Includes
#include <vtkObjectFactory.h>
// VTK Includes
#include <vtkObjectFactory.h>
@@
-76,7
+77,7
@@
static int MYDEBUG = 0;
using namespace std;
using namespace std;
-vtkStandardNewMacro(SMESH_DeviceActor)
;
+vtkStandardNewMacro(SMESH_DeviceActor)
SMESH_DeviceActor
SMESH_DeviceActor
@@
-94,8
+95,8
@@
SMESH_DeviceActor
myMapper = VTKViewer_PolyDataMapper::New();
myPlaneCollection = vtkPlaneCollection::New();
myMapper = VTKViewer_PolyDataMapper::New();
myPlaneCollection = vtkPlaneCollection::New();
-
vtkMapper::GetResolveCoincidentTopology
PolygonOffsetParameters(myPolygonOffsetFactor,
-
myPolygonOffsetUnits);
+
VTKViewer_Actor::GetDefault
PolygonOffsetParameters(myPolygonOffsetFactor,
+ myPolygonOffsetUnits);
myMapper->UseLookupTableScalarRangeOn();
myMapper->SetColorModeToMapScalars();
myMapper->UseLookupTableScalarRangeOn();
myMapper->SetColorModeToMapScalars();
@@
-160,7
+161,7
@@
SMESH_DeviceActor
myTransformFilter->Delete();
myTransformFilter->Delete();
- for(
in
t i = 0, iEnd = myPassFilter.size(); i < iEnd; i++)
+ for(
size_
t i = 0, iEnd = myPassFilter.size(); i < iEnd; i++)
myPassFilter[i]->Delete();
myShrinkFilter->Delete();
myPassFilter[i]->Delete();
myShrinkFilter->Delete();
@@
-409,7
+410,7
@@
SMESH_DeviceActor
aNbCells = 0;
for(; anIter != aValues.end(); anIter++){
const Length2D::Value& aValue = *anIter;
aNbCells = 0;
for(; anIter != aValues.end(); anIter++){
const Length2D::Value& aValue = *anIter;
-
int
aNode[2] = {
+
vtkIdType
aNode[2] = {
myVisualObj->GetNodeVTKId(aValue.myPntId[0]),
myVisualObj->GetNodeVTKId(aValue.myPntId[1])
};
myVisualObj->GetNodeVTKId(aValue.myPntId[0]),
myVisualObj->GetNodeVTKId(aValue.myPntId[1])
};
@@
-425,12
+426,13
@@
SMESH_DeviceActor
aCellTypesArray->SetNumberOfTuples( aNbCells );
aScalars->SetNumberOfTuples( aNbCells );
aCellTypesArray->SetNumberOfTuples( aNbCells );
aScalars->SetNumberOfTuples( aNbCells );
-
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocations
Array::New();
+
vtkIdTypeArray* aCellLocationsArray = vtkIdType
Array::New();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( aNbCells );
aConnectivity->InitTraversal();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( aNbCells );
aConnectivity->InitTraversal();
- for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
+ vtkIdType const *pts(nullptr);
+ for( vtkIdType idType = 0, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
aDataSet->SetCells( aCellTypesArray, aCellLocationsArray, aConnectivity );
aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
aDataSet->SetCells( aCellTypesArray, aCellLocationsArray, aConnectivity );
@@
-473,7
+475,7
@@
SMESH_DeviceActor
aNbCells = 0;
for(; anIter != aValues.end(); anIter++){
const MultiConnection2D::Value& aValue = (*anIter).first;
aNbCells = 0;
for(; anIter != aValues.end(); anIter++){
const MultiConnection2D::Value& aValue = (*anIter).first;
-
int
aNode[2] = {
+
vtkIdType
aNode[2] = {
myVisualObj->GetNodeVTKId(aValue.myPntId[0]),
myVisualObj->GetNodeVTKId(aValue.myPntId[1])
};
myVisualObj->GetNodeVTKId(aValue.myPntId[0]),
myVisualObj->GetNodeVTKId(aValue.myPntId[1])
};
@@
-489,12
+491,13
@@
SMESH_DeviceActor
aCellTypesArray->SetNumberOfTuples( aNbCells );
aScalars->SetNumberOfTuples( aNbCells );
aCellTypesArray->SetNumberOfTuples( aNbCells );
aScalars->SetNumberOfTuples( aNbCells );
-
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocations
Array::New();
+
vtkIdTypeArray* aCellLocationsArray = vtkIdType
Array::New();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( aNbCells );
aConnectivity->InitTraversal();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( aNbCells );
aConnectivity->InitTraversal();
- for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
+ vtkIdType const *pts(nullptr);
+ for( vtkIdType idType = 0, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
aDataSet->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity );
aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
aDataSet->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity );
@@
-570,7
+573,7
@@
SMESH_DeviceActor
FreeEdges::TBorders::const_iterator anIter = aBorders.begin();
for(; anIter != aBorders.end(); anIter++){
const FreeEdges::Border& aBorder = *anIter;
FreeEdges::TBorders::const_iterator anIter = aBorders.begin();
for(; anIter != aBorders.end(); anIter++){
const FreeEdges::Border& aBorder = *anIter;
-
int
aNode[2] = {
+
vtkIdType
aNode[2] = {
myVisualObj->GetNodeVTKId(aBorder.myPntId[0]),
myVisualObj->GetNodeVTKId(aBorder.myPntId[1])
};
myVisualObj->GetNodeVTKId(aBorder.myPntId[0]),
myVisualObj->GetNodeVTKId(aBorder.myPntId[1])
};
@@
-583,12
+586,13
@@
SMESH_DeviceActor
}
}
}
}
-
VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocations
Array::New();
+
vtkIdTypeArray* aCellLocationsArray = vtkIdType
Array::New();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( aNbCells );
aConnectivity->InitTraversal();
aCellLocationsArray->SetNumberOfComponents( 1 );
aCellLocationsArray->SetNumberOfTuples( aNbCells );
aConnectivity->InitTraversal();
- for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
+ vtkIdType const *pts(nullptr);
+ for( vtkIdType idType = 0, npts; aConnectivity->GetNextCell( npts, pts ); idType++ )
aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
aDataSet->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity );
aCellLocationsArray->SetValue( idType, aConnectivity->GetTraversalLocation( npts ) );
aDataSet->SetCells( aCellTypesArray, aCellLocationsArray,aConnectivity );
@@
-600,7
+604,7
@@
SMESH_DeviceActor
( aPredicate = dynamic_cast<CoincidentNodes*>(theFunctor.get())))
{
myExtractUnstructuredGrid->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding);
( aPredicate = dynamic_cast<CoincidentNodes*>(theFunctor.get())))
{
myExtractUnstructuredGrid->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding);
- vtkIdType aNbNodes =
myVisualObj->GetNbEntities(SMDSAbs_Node
);
+ vtkIdType aNbNodes =
FromSmIdType<vtkIdType>(myVisualObj->GetNbEntities(SMDSAbs_Node)
);
for( vtkIdType i = 0; i < aNbNodes; i++ ){
vtkIdType anObjId = myVisualObj->GetNodeObjId(i);
if(aPredicate->IsSatisfy(anObjId))
for( vtkIdType i = 0; i < aNbNodes; i++ ){
vtkIdType anObjId = myVisualObj->GetNodeObjId(i);
if(aPredicate->IsSatisfy(anObjId))
@@
-615,7
+619,7
@@
SMESH_DeviceActor
-unsigned long int
+vtkMTimeType
SMESH_DeviceActor
::GetMTime()
{
SMESH_DeviceActor
::GetMTime()
{
@@
-640,7
+644,7
@@
SMESH_DeviceActor
// << " " << myTransformFilter->GetMTime()
// << " " << myFaceOrientationFilter->GetMTime() << endl;
// << " " << myTransformFilter->GetMTime()
// << " " << myFaceOrientationFilter->GetMTime() << endl;
-
unsigned long
mTime = this->Superclass::GetMTime();
+
vtkMTimeType
mTime = this->Superclass::GetMTime();
mTime = max(mTime,myExtractGeometry->GetMTime());
mTime = max(mTime,myExtractUnstructuredGrid->GetMTime());
mTime = max(mTime,myMergeFilter->GetMTime());
mTime = max(mTime,myExtractGeometry->GetMTime());
mTime = max(mTime,myExtractUnstructuredGrid->GetMTime());
mTime = max(mTime,myMergeFilter->GetMTime());
@@
-748,7
+752,7
@@
SMESH_DeviceActor
{
bool aShowFaceOrientation = myIsFacesOriented;
aShowFaceOrientation &= vtkLODActor::GetVisibility(); //GetVisibility(); -- avoid calling GetUnstructuredGrid()
{
bool aShowFaceOrientation = myIsFacesOriented;
aShowFaceOrientation &= vtkLODActor::GetVisibility(); //GetVisibility(); -- avoid calling GetUnstructuredGrid()
- aShowFaceOrientation &=
myRepresentation == eSurface
;
+ aShowFaceOrientation &=
( myRepresentation != ePoint )
;
myFaceOrientation->SetVisibility(aShowFaceOrientation);
}
myFaceOrientation->SetVisibility(aShowFaceOrientation);
}
@@
-779,6
+783,8
@@
SMESH_DeviceActor
myGeomFilter->SetInside(false);
myGeomFilter->SetWireframeMode(false);
GetProperty()->SetRepresentation(theMode);
myGeomFilter->SetInside(false);
myGeomFilter->SetWireframeMode(false);
GetProperty()->SetRepresentation(theMode);
+ case eNoneRepr:
+ return;
}
SetMarkerEnabled(theMode == ePoint);
myRepresentation = theMode;
}
SetMarkerEnabled(theMode == ePoint);
myRepresentation = theMode;
@@
-835,9
+841,9
@@
SMESH_DeviceActor
}
}
-int
+vtkIdType
SMESH_DeviceActor
SMESH_DeviceActor
-::GetNodeObjId(
int
theVtkID)
+::GetNodeObjId(
vtkIdType
theVtkID)
{
vtkIdType anID = theVtkID;
{
vtkIdType anID = theVtkID;
@@
-851,7
+857,7
@@
SMESH_DeviceActor
double*
SMESH_DeviceActor
double*
SMESH_DeviceActor
-::GetNodeCoord(
int
theObjID)
+::GetNodeCoord(
vtkIdType
theObjID)
{
vtkDataSet* aDataSet = myMergeFilter->GetOutput();
vtkIdType anID = myVisualObj->GetNodeVTKId(theObjID);
{
vtkDataSet* aDataSet = myMergeFilter->GetOutput();
vtkIdType anID = myVisualObj->GetNodeVTKId(theObjID);
@@
-860,10
+866,16
@@
SMESH_DeviceActor
return aCoord;
}
return aCoord;
}
+vtkIdType
+SMESH_DeviceActor
+::GetNodeVtkId(vtkIdType theObjID)
+{
+ return myVisualObj->GetNodeVTKId(theObjID);
+}
-int
+vtkIdType
SMESH_DeviceActor
SMESH_DeviceActor
-::GetElemObjId(
int
theVtkID)
+::GetElemObjId(
vtkIdType
theVtkID)
{
vtkIdType anId = myGeomFilter->GetElemObjId(theVtkID);
if(anId < 0)
{
vtkIdType anId = myGeomFilter->GetElemObjId(theVtkID);
if(anId < 0)
@@
-887,7
+899,7
@@
SMESH_DeviceActor
vtkCell*
SMESH_DeviceActor
vtkCell*
SMESH_DeviceActor
-::GetElemCell(
int
theObjID)
+::GetElemCell(
vtkIdType
theObjID)
{
vtkDataSet* aDataSet = myVisualObj->GetUnstructuredGrid();
vtkIdType aGridID = myVisualObj->GetElemVTKId(theObjID);
{
vtkDataSet* aDataSet = myVisualObj->GetUnstructuredGrid();
vtkIdType aGridID = myVisualObj->GetElemVTKId(theObjID);