Fix for the "0020314: EDF 993 SMESH : Display bug with Volumes created by GHS3D"...

[modules/visu.git] / src / OBJECT / VISU_ScalarMapAct.cxx

diff --git a/src/OBJECT/VISU_ScalarMapAct.cxx b/src/OBJECT/VISU_ScalarMapAct.cxx
index ac4e542b1d54c8c63adcc4c69585648d960dfff1..c3adfaafc5843e14da398a3f3f020465c7f58323 100644 (file)
--- a/src/OBJECT/VISU_ScalarMapAct.cxx
+++ b/src/OBJECT/VISU_ScalarMapAct.cxx
@@ -140,6 +140,8 @@ class VISU_PointsDeviceActor: public VISU_GaussDeviceActorBase
 
     SetPointSpriteMapper( aMapper );
 
+    myGeomFilter->SetAppendCoincident3D(true);
+
     aMapper->Delete();
 
     myEventCallbackCommand->SetClientData( this );
@@ -233,17 +235,20 @@ VISU_ScalarMapAct
   vtkMatrix4x4 *aMatrix = vtkMatrix4x4::New();
 
   mySurfaceActor= SVTK_DeviceActor::New();
-  mySurfaceActor->SetRepresentation(SVTK::Representation::Surface);
+  mySurfaceActor->SetRepresentation(VTKViewer::Representation::Surface);
   mySurfaceActor->SetProperty(aProperty);
   mySurfaceActor->SetUserMatrix(aMatrix);
+  mySurfaceActor->SetCoincident3DAllowed(true);
 
   myEdgeActor = SVTK_DeviceActor::New();
-  myEdgeActor->SetRepresentation(SVTK::Representation::Wireframe);
+  myEdgeActor->SetRepresentation(VTKViewer::Representation::Wireframe);
   myEdgeActor->SetUserMatrix(aMatrix);
   myEdgeActor->GetProperty()->SetColor(255.,255.,255.);
 
+  myEdgeActor->SetCoincident3DAllowed(true);
+
   myPointsActor = SVTK_DeviceActor::New();
-  myPointsActor->SetRepresentation(SVTK::Representation::Points);
+  myPointsActor->SetRepresentation(VTKViewer::Representation::Points);
   myPointsActor->SetProperty(aProperty);
   myPointsActor->SetUserMatrix(aMatrix);
 
@@ -572,8 +577,8 @@ VISU_ScalarMapAct
 
   Superclass::SetRepresentation(theMode);
 
-  if(theMode == SVTK::Representation::Surfaceframe)
-    mySurfaceActor->SetRepresentation(SVTK::Representation::Surface);
+  if(theMode == VTKViewer::Representation::Surfaceframe)
+    mySurfaceActor->SetRepresentation(VTKViewer::Representation::Surface);
   else
     mySurfaceActor->SetRepresentation(theMode);
 
@@ -619,7 +624,7 @@ VISU_ScalarMapAct
   GetMatrix(myPointsActor->GetUserMatrix());
   GetMatrix(myPointSpriteActor->GetUserMatrix());
 
-  using namespace SVTK::Representation;
+  using namespace VTKViewer::Representation;
   switch ( GetRepresentation() ) {
 
   case Surfaceframe:
@@ -659,7 +664,7 @@ VISU_ScalarMapAct
   GetMatrix(myEdgeActor->GetUserMatrix());
   GetMatrix(mySurfaceActor->GetUserMatrix());
 
-  using namespace SVTK::Representation;
+  using namespace VTKViewer::Representation;
   switch ( GetRepresentation() ) {
 
   case Surfaceframe:
@@ -716,7 +721,7 @@ VISU_ScalarMapAct
 {
   int result = 0; 
 
-  using namespace SVTK::Representation;
+  using namespace VTKViewer::Representation;
   switch ( GetRepresentation() ) {
   case Surfaceframe:
     result |= mySurfaceActor->HasTranslucentPolygonalGeometry();