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
PR: synchro V6_main tag mergeto_V7_main_11Feb13
[modules/smesh.git]
/
src
/
OBJECT
/
SMESH_DeviceActor.cxx
diff --git
a/src/OBJECT/SMESH_DeviceActor.cxx
b/src/OBJECT/SMESH_DeviceActor.cxx
index 7a88f701b6751579b33bba7b74e96f3924701c0b..c82bbf30524a34ebea0025dc4c3737ebc80775b0 100644
(file)
--- a/
src/OBJECT/SMESH_DeviceActor.cxx
+++ b/
src/OBJECT/SMESH_DeviceActor.cxx
@@
-138,33
+138,29
@@
SMESH_DeviceActor
{
if(MYDEBUG) MESSAGE("~SMESH_DeviceActor - "<<this);
{
if(MYDEBUG) MESSAGE("~SMESH_DeviceActor - "<<this);
- myProperty->Delete();
-
myMapper->Delete();
myMapper->Delete();
- my
ShrinkFilter
->Delete();
+ my
Property
->Delete();
- myExtract
UnstructuredGrid
->Delete();
+ myExtract
Geometry
->Delete();
myMergeFilter->Delete();
myMergeFilter->Delete();
+ myExtractUnstructuredGrid->Delete();
- myGeomFilter->Delete();
+ // Orientation of faces
+ myFaceOrientationFilter->Delete();
+ myFaceOrientationDataMapper->RemoveAllInputs();
+ myFaceOrientationDataMapper->Delete();
+ myFaceOrientation->Delete();
- my
ExtractGeometry
->Delete();
+ my
GeomFilter
->Delete();
myTransformFilter->Delete();
myTransformFilter->Delete();
- for(int i = 0, iEnd = myPassFilter.size(); i < iEnd; i++)
{
+ for(int i = 0, iEnd = myPassFilter.size(); i < iEnd; i++)
myPassFilter[i]->Delete();
myPassFilter[i]->Delete();
- }
-
- // Orientation of faces
- myFaceOrientationFilter->Delete();
-
- myFaceOrientationDataMapper->RemoveAllInputs();
- myFaceOrientationDataMapper->Delete();
- my
FaceOrientation
->Delete();
+ my
ShrinkFilter
->Delete();
}
}
@@
-642,16
+638,16
@@
SMESH_DeviceActor
void
SMESH_DeviceActor
void
SMESH_DeviceActor
-::SetFacesOrientationColor(vtkFloatingPointType
theColor[3]
)
+::SetFacesOrientationColor(vtkFloatingPointType
r,vtkFloatingPointType g,vtkFloatingPointType b
)
{
{
- myFaceOrientation->GetProperty()->SetColor(
theColor
);
+ myFaceOrientation->GetProperty()->SetColor(
r, g, b
);
}
void
SMESH_DeviceActor
}
void
SMESH_DeviceActor
-::GetFacesOrientationColor(vtkFloatingPointType
theColor[3]
)
+::GetFacesOrientationColor(vtkFloatingPointType
& r,vtkFloatingPointType& g,vtkFloatingPointType& b
)
{
{
- myFaceOrientation->GetProperty()->GetColor(
theColor
);
+ myFaceOrientation->GetProperty()->GetColor(
r, g, b
);
}
void
}
void