Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to paraview 5.4
[modules/gui.git]
/
src
/
VTKViewer
/
VTKViewer_Actor.cxx
diff --git
a/src/VTKViewer/VTKViewer_Actor.cxx
b/src/VTKViewer/VTKViewer_Actor.cxx
index 970c4ed0b3f6cf2e380cf8aa74661e248a226edf..76f5d153bde1b9a64534a216f774c4ab2b6b0c82 100755
(executable)
--- a/
src/VTKViewer/VTKViewer_Actor.cxx
+++ b/
src/VTKViewer/VTKViewer_Actor.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-61,18
+61,18
@@
vtkStandardNewMacro(VTKViewer_Actor);
*/
VTKViewer_Actor
::VTKViewer_Actor():
*/
VTKViewer_Actor
::VTKViewer_Actor():
+ myIsResolveCoincidentTopology(true),
myOpacity(1.0),
myOpacity(1.0),
- myIsHighlighted(false),
- myIsPreselected(false),
- myRepresentation(VTKViewer::Representation::Surface),
myDisplayMode(1),
myDisplayMode(1),
- myProperty(vtkProperty::New()),
- PreviewProperty(NULL),
myIsInfinite(false),
myIsInfinite(false),
- myIsResolveCoincidentTopology(true),
myStoreMapping(false),
myGeomFilter(VTKViewer_GeometryFilter::New()),
myStoreMapping(false),
myGeomFilter(VTKViewer_GeometryFilter::New()),
- myTransformFilter(VTKViewer_TransformFilter::New())
+ myTransformFilter(VTKViewer_TransformFilter::New()),
+ myRepresentation(VTKViewer::Representation::Surface),
+ myProperty(vtkProperty::New()),
+ PreviewProperty(NULL),
+ myIsPreselected(false),
+ myIsHighlighted(false)
{
vtkMapper::GetResolveCoincidentTopologyPolygonOffsetParameters(myPolygonOffsetFactor,
myPolygonOffsetUnits);
{
vtkMapper::GetResolveCoincidentTopologyPolygonOffsetParameters(myPolygonOffsetFactor,
myPolygonOffsetUnits);
@@
-218,8
+218,8
@@
VTKViewer_Actor
SetNumberOfCloudPoints(aNbOfPoints);
}
SetNumberOfCloudPoints(aNbOfPoints);
}
+ int aResolveCoincidentTopology = vtkMapper::GetResolveCoincidentTopology();
if(myIsResolveCoincidentTopology){
if(myIsResolveCoincidentTopology){
- int aResolveCoincidentTopology = vtkMapper::GetResolveCoincidentTopology();
double aFactor, aUnit;
vtkMapper::GetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
double aFactor, aUnit;
vtkMapper::GetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
@@
-229,10
+229,11
@@
VTKViewer_Actor
Superclass::Render(ren,m);
vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
Superclass::Render(ren,m);
vtkMapper::SetResolveCoincidentTopologyPolygonOffsetParameters(aFactor,aUnit);
- vtkMapper::SetResolveCoincidentTopology(aResolveCoincidentTopology);
}else{
}else{
+ vtkMapper::SetResolveCoincidentTopologyToOff();
Superclass::Render(ren,m);
}
Superclass::Render(ren,m);
}
+ vtkMapper::SetResolveCoincidentTopology(aResolveCoincidentTopology);
}
/*!
}
/*!
@@
-331,12
+332,12
@@
VTKViewer_Actor
/*!
To calculatate last modified time
*/
/*!
To calculatate last modified time
*/
-unsigned long int
+vtkMTimeType
VTKViewer_Actor
::GetMTime()
{
VTKViewer_Actor
::GetMTime()
{
-
unsigned long
mTime = this->Superclass::GetMTime();
-
unsigned long
time = myTransformFilter->GetMTime();
+
vtkMTimeType
mTime = this->Superclass::GetMTime();
+
vtkMTimeType
time = myTransformFilter->GetMTime();
mTime = ( time > mTime ? time : mTime );
if(vtkDataSet *aDataSet = dynamic_cast<vtkDataSet*>(myPassFilter[0]->GetInput())){ // bad usage of GetInput
time = aDataSet->GetMTime();
mTime = ( time > mTime ? time : mTime );
if(vtkDataSet *aDataSet = dynamic_cast<vtkDataSet*>(myPassFilter[0]->GetInput())){ // bad usage of GetInput
time = aDataSet->GetMTime();
@@
-490,14
+491,14
@@
VTKViewer_Actor
if(myIsInfinite)
return true;
if(myIsInfinite)
return true;
- static double MAX_DISTANCE = 0.9*VTK_
LARGE_FLOAT
;
+ static double MAX_DISTANCE = 0.9*VTK_
FLOAT_MAX
;
double aBounds[6];
GetBounds(aBounds);
for(int i = 0; i < 6; i++)
if(fabs(aBounds[i]) > MAX_DISTANCE)
return true;
double aBounds[6];
GetBounds(aBounds);
for(int i = 0; i < 6; i++)
if(fabs(aBounds[i]) > MAX_DISTANCE)
return true;
- static double MIN_DISTANCE = 1.0/VTK_
LARGE_FLOAT
;
+ static double MIN_DISTANCE = 1.0/VTK_
FLOAT_MAX
;
if(GetLength() < MIN_DISTANCE)
return true;
if(GetLength() < MIN_DISTANCE)
return true;