GPUSPHGUI: show a custom control by setting a functor

[modules/smesh.git] / src / OBJECT / SMESH_Actor.cxx

diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx
index 34c956b5ce12c4c9b589955d30cf82d49cf1e2d3..dac3d4a0d6418b22e1e8afcf6d0bd3ef55b6ca24 100644 (file)
--- a/src/OBJECT/SMESH_Actor.cxx
+++ b/src/OBJECT/SMESH_Actor.cxx
@@ -26,23 +26,23 @@
 //  Module : SMESH
 
 #include "SMESH_ActorDef.h"
 //  Module : SMESH
 
 #include "SMESH_ActorDef.h"

+
+#include "SMDS_UnstructuredGrid.hxx"

 #include "SMESH_ActorUtils.h"
 #include "SMESH_ActorUtils.h"

+#include "SMESH_CellLabelActor.h"
+#include "SMESH_ControlsDef.hxx"

 #include "SMESH_DeviceActor.h"
 #include "SMESH_NodeLabelActor.h"
 #include "SMESH_DeviceActor.h"
 #include "SMESH_NodeLabelActor.h"

-#include "SMESH_CellLabelActor.h"

 #include "SMESH_ObjectDef.h"
 #include "SMESH_ObjectDef.h"

-#include "SMESH_ControlsDef.hxx"
-#include "SMDS_UnstructuredGrid.hxx"
-#include "SMESH_ScalarBarActor.h"
-#include "VTKViewer_ExtractUnstructuredGrid.h"
-#include "VTKViewer_FramedTextActor.h"
-#include "SALOME_InteractiveObject.hxx"

 #include "SMESH_SVTKActor.h"
 #include "SMESH_SVTKActor.h"

-
-#include "SUIT_Session.h"
-#include "SUIT_ResourceMgr.h"
+#include "SMESH_ScalarBarActor.h"

 
 #include <Qtx.h>
 
 #include <Qtx.h>

+#include <SALOME_InteractiveObject.hxx>
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+#include <VTKViewer_ExtractUnstructuredGrid.h>
+#include <VTKViewer_FramedTextActor.h>

 
 #ifndef DISABLE_PLOT2DVIEWER
 #include <SPlot2d_Histogram.h>
 
 #ifndef DISABLE_PLOT2DVIEWER
 #include <SPlot2d_Histogram.h>


@@ -117,12 +117,16 @@ SMESH_Actor* SMESH_Actor::New(TVisualObjPtr theVisualObj,
 SMESH_ActorDef::SMESH_ActorDef()
 {
   if(MYDEBUG) MESSAGE("SMESH_ActorDef - "<<this);
 SMESH_ActorDef::SMESH_ActorDef()
 {
   if(MYDEBUG) MESSAGE("SMESH_ActorDef - "<<this);

+
+  SALOME_Actor::SetVisibility(false); // avoid update of pipelines
+

   myBaseActor = SMESH_DeviceActor::New();
 
   myTimeStamp = vtkTimeStamp::New();
 
   myIsPointsVisible = false;
   myIsEntityModeCache = false;
   myBaseActor = SMESH_DeviceActor::New();
 
   myTimeStamp = vtkTimeStamp::New();
 
   myIsPointsVisible = false;
   myIsEntityModeCache = false;

+  myRepresentationCache = 0;

 
   myHighlightActor = SMESH_SVTKActor::New();
   myHighlightActor->Delete(); // vtkSmartPointer!
 
   myHighlightActor = SMESH_SVTKActor::New();
   myHighlightActor->Delete(); // vtkSmartPointer!


@@ -212,7 +216,7 @@ SMESH_ActorDef::SMESH_ActorDef()
   myReversedVProp->SetColor( bfc.red() / 255. , bfc.green() / 255. , bfc.blue() / 255. );
 
   my2DActor = SMESH_CellLabelActor::New();
   myReversedVProp->SetColor( bfc.red() / 255. , bfc.green() / 255. , bfc.blue() / 255. );
 
   my2DActor = SMESH_CellLabelActor::New();

-  my2DActor->SetStoreGemetryMapping(true);
+  my2DActor->SetStoreClippingMapping(true);

   my2DActor->SetUserMatrix(aMatrix);
   my2DActor->PickableOff();
   my2DActor->SetFontProperties( aFamilyEl, aSizeEl, aBoldEl, anItalicEl, aShadowEl, anRGBEl[0], anRGBEl[1], anRGBEl[2] );
   my2DActor->SetUserMatrix(aMatrix);
   my2DActor->PickableOff();
   my2DActor->SetFontProperties( aFamilyEl, aSizeEl, aBoldEl, anItalicEl, aShadowEl, anRGBEl[0], anRGBEl[1], anRGBEl[2] );


@@ -255,7 +259,7 @@ SMESH_ActorDef::SMESH_ActorDef()
   aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_TRIANGLE);
 
   my3DActor = SMESH_CellLabelActor::New();
   aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_TRIANGLE);
 
   my3DActor = SMESH_CellLabelActor::New();

-  my3DActor->SetStoreGemetryMapping(true);
+  my3DActor->SetStoreClippingMapping(true);

   my3DActor->SetUserMatrix(aMatrix);
   my3DActor->PickableOff();
   my3DActor->SetFontProperties( aFamilyEl, aSizeEl, aBoldEl, anItalicEl, aShadowEl, anRGBEl[0], anRGBEl[1], anRGBEl[2] );
   my3DActor->SetUserMatrix(aMatrix);
   my3DActor->PickableOff();
   my3DActor->SetFontProperties( aFamilyEl, aSizeEl, aBoldEl, anItalicEl, aShadowEl, anRGBEl[0], anRGBEl[1], anRGBEl[2] );


@@ -275,6 +279,7 @@ SMESH_ActorDef::SMESH_ActorDef()
   aFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON);
   aFilter->RegisterCellsWithType(VTK_TRIQUADRATIC_HEXAHEDRON);
   aFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE);
   aFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON);
   aFilter->RegisterCellsWithType(VTK_TRIQUADRATIC_HEXAHEDRON);
   aFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE);

+  aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_QUADRATIC_WEDGE);

   aFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID);
   aFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET);
   aFilter->RegisterCellsWithType(VTK_POLYHEDRON);
   aFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID);
   aFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET);
   aFilter->RegisterCellsWithType(VTK_POLYHEDRON);


@@ -306,6 +311,7 @@ SMESH_ActorDef::SMESH_ActorDef()
   aFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON);
   aFilter->RegisterCellsWithType(VTK_TRIQUADRATIC_HEXAHEDRON);
   aFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE);
   aFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON);
   aFilter->RegisterCellsWithType(VTK_TRIQUADRATIC_HEXAHEDRON);
   aFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE);

+  aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_QUADRATIC_WEDGE);

   aFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID);
   aFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET);
   aFilter->RegisterCellsWithType(VTK_POLYHEDRON);
   aFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID);
   aFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET);
   aFilter->RegisterCellsWithType(VTK_POLYHEDRON);


@@ -320,8 +326,12 @@ SMESH_ActorDef::SMESH_ActorDef()
   myEdgeProp->SetColor(anRGB[0],anRGB[1],anRGB[2]);
   myEdgeProp->SetLineWidth(aLineWidth);
 
   myEdgeProp->SetColor(anRGB[0],anRGB[1],anRGB[2]);
   myEdgeProp->SetLineWidth(aLineWidth);
 

+  // my1DActor is used to
+  // - show numbers
+  // - show controls on all edges (eg Length)
+  // since edges are shown by myHighlitableActor

   my1DActor = SMESH_CellLabelActor::New();
   my1DActor = SMESH_CellLabelActor::New();

-  my1DActor->SetStoreGemetryMapping(true);
+  my1DActor->SetStoreClippingMapping(true);

   my1DActor->SetUserMatrix(aMatrix);
   my1DActor->PickableOff();
   my1DActor->SetHighlited(true);
   my1DActor->SetUserMatrix(aMatrix);
   my1DActor->PickableOff();
   my1DActor->SetHighlited(true);


@@ -347,6 +357,7 @@ SMESH_ActorDef::SMESH_ActorDef()
   my1DExtProp->SetLineWidth(aLineWidth + aLineWidthInc);
   my1DExtProp->SetPointSize(aElem0DSize);
 
   my1DExtProp->SetLineWidth(aLineWidth + aLineWidthInc);
   my1DExtProp->SetPointSize(aElem0DSize);
 

+  // my1DExtActor is used to show filtered edges or links between nodes

   my1DExtActor = SMESH_DeviceActor::New();
   my1DExtActor->SetUserMatrix(aMatrix);
   my1DExtActor->PickableOff();
   my1DExtActor = SMESH_DeviceActor::New();
   my1DExtActor->SetUserMatrix(aMatrix);
   my1DExtActor->PickableOff();


@@ -369,7 +380,7 @@ SMESH_ActorDef::SMESH_ActorDef()
 
   my0DActor = SMESH_CellLabelActor::New();
   my0DActor->SetUserMatrix(aMatrix);
 
   my0DActor = SMESH_CellLabelActor::New();
   my0DActor->SetUserMatrix(aMatrix);

-  my0DActor->SetStoreGemetryMapping(true);
+  my0DActor->SetStoreClippingMapping(true);

   my0DActor->PickableOff();
   my0DActor->SetFontProperties( aFamilyEl, aSizeEl, aBoldEl, anItalicEl, aShadowEl, anRGBEl[0], anRGBEl[1], anRGBEl[2] );
   my0DActor->SetVisibility(false);
   my0DActor->PickableOff();
   my0DActor->SetFontProperties( aFamilyEl, aSizeEl, aBoldEl, anItalicEl, aShadowEl, anRGBEl[0], anRGBEl[1], anRGBEl[2] );
   my0DActor->SetVisibility(false);


@@ -388,7 +399,7 @@ SMESH_ActorDef::SMESH_ActorDef()
 
   myBallActor = SMESH_CellLabelActor::New();
   myBallActor->SetUserMatrix(aMatrix);
 
   myBallActor = SMESH_CellLabelActor::New();
   myBallActor->SetUserMatrix(aMatrix);

-  myBallActor->SetStoreGemetryMapping(true);
+  myBallActor->SetStoreClippingMapping(true);

   myBallActor->PickableOff();
   myBallActor->SetFontProperties( aFamilyEl, aSizeEl, aBoldEl, anItalicEl, aShadowEl, anRGBEl[0], anRGBEl[1], anRGBEl[2] );
   myBallActor->SetVisibility(false);
   myBallActor->PickableOff();
   myBallActor->SetFontProperties( aFamilyEl, aSizeEl, aBoldEl, anItalicEl, aShadowEl, anRGBEl[0], anRGBEl[1], anRGBEl[2] );
   myBallActor->SetVisibility(false);


@@ -461,6 +472,8 @@ SMESH_ActorDef::SMESH_ActorDef()
   //----------------------------------------------
 
   myBaseActor->SetUserMatrix(aMatrix);
   //----------------------------------------------
 
   myBaseActor->SetUserMatrix(aMatrix);

+  myBaseActor->SetStoreIDMapping(true);
+  myBaseActor->SetStoreClippingMapping(true);

   myBaseActor->SetStoreGemetryMapping(true);
   myBaseActor->GetProperty()->SetOpacity(0.0);
   myPickableActor = myBaseActor;
   myBaseActor->SetStoreGemetryMapping(true);
   myBaseActor->GetProperty()->SetOpacity(0.0);
   myPickableActor = myBaseActor;


@@ -791,12 +804,20 @@ bool SMESH_ActorDef::GetFacesOrientation3DVectors()
 }
 
 
 }
 
 

+void SMESH_ActorDef::SetControl(SMESH::Controls::FunctorPtr theFunctor)
+{
+  myFunctor = theFunctor;
+  if ( !theFunctor )
+    SetControlMode( eNone, true );
+  else
+    SetControlMode( eCustomControl, true );
+}
+

 void SMESH_ActorDef::SetControlMode(eControl theMode)
 {
   SetControlMode(theMode,true);
 }
 
 void SMESH_ActorDef::SetControlMode(eControl theMode)
 {
   SetControlMode(theMode,true);
 }
 

-

 void SMESH_ActorDef::SetControlMode( eControl theMode, bool theCheckEntityMode )
 {
   vtkLookupTable* lookupTable = static_cast<vtkLookupTable*>(myScalarBarActor->GetLookupTable());
 void SMESH_ActorDef::SetControlMode( eControl theMode, bool theCheckEntityMode )
 {
   vtkLookupTable* lookupTable = static_cast<vtkLookupTable*>(myScalarBarActor->GetLookupTable());


@@ -807,7 +828,8 @@ void SMESH_ActorDef::SetControlMode( eControl theMode, bool theCheckEntityMode )
   if( !mgr )
     return;
 
   if( !mgr )
     return;
 

-  myControlMode = eNone;
+  //myControlMode = eNone;
+  myControlMode = theMode;

   theCheckEntityMode &= mgr->booleanValue( "SMESH", "display_entity", false );
 
   my0DActor->GetMapper()->SetScalarVisibility(false);
   theCheckEntityMode &= mgr->booleanValue( "SMESH", "display_entity", false );
 
   my0DActor->GetMapper()->SetScalarVisibility(false);


@@ -830,11 +852,9 @@ void SMESH_ActorDef::SetControlMode( eControl theMode, bool theCheckEntityMode )
       break;
     }
     case eLength2D:
       break;
     }
     case eLength2D:

-    {

       myFunctor.reset(new SMESH::Controls::Length2D());
       myControlActor = my2DActor;
       break;
       myFunctor.reset(new SMESH::Controls::Length2D());
       myControlActor = my2DActor;
       break;

-    }

     case eFreeBorders:
       myFunctor.reset(new SMESH::Controls::FreeBorders());
       myControlActor = my1DActor;
     case eFreeBorders:
       myFunctor.reset(new SMESH::Controls::FreeBorders());
       myControlActor = my1DActor;


@@ -944,6 +964,14 @@ void SMESH_ActorDef::SetControlMode( eControl theMode, bool theCheckEntityMode )
       myControlActor = my3DActor;
       break;
     }
       myControlActor = my3DActor;
       break;
     }

+    case eDeflection2D:
+    {
+      SMESH::Controls::Deflection2D* aControl = new SMESH::Controls::Deflection2D();
+      aControl->SetPrecision( myControlsPrecision );
+      myFunctor.reset( aControl );
+      myControlActor = my2DActor;
+      break;
+    }

     case eBareBorderVolume:
     {
       myFunctor.reset(new SMESH::Controls::BareBorderVolume());
     case eBareBorderVolume:
     {
       myFunctor.reset(new SMESH::Controls::BareBorderVolume());


@@ -986,15 +1014,27 @@ void SMESH_ActorDef::SetControlMode( eControl theMode, bool theCheckEntityMode )
       myControlActor = myNodeActor;
       break;
     }
       myControlActor = myNodeActor;
       break;
     }

+    case eCustomControl:
+    {
+      if ( !myFunctor )
+        return;
+      switch ( myFunctor->GetType() ) {
+      case SMDSAbs_Node          : myControlActor = myNodeActor; break;
+      case SMDSAbs_Edge          : myControlActor = my1DActor;   break;
+      case SMDSAbs_Face          : myControlActor = my2DActor;   break;
+      case SMDSAbs_Volume        : myControlActor = my3DActor;   break;
+      default                    : return;
+      }
+      break;
+    }

     default:
       return;
     }
 
     default:
       return;
     }
 

-    vtkUnstructuredGrid* aGrid = myControlActor->GetUnstructuredGrid();
-    vtkIdType aNbCells = aGrid->GetNumberOfCells();
+    int aNbCells = myFunctor ? myVisualObj->GetNbEntities( myFunctor->GetType() ) : 0;

     bool aShowOnlyScalarBarTitle = false;
     if(aNbCells) {
     bool aShowOnlyScalarBarTitle = false;
     if(aNbCells) {

-      myControlMode = theMode;
+      //myControlMode = theMode;

       switch(myControlMode){
       case eFreeNodes:
       case eCoincidentNodes:
       switch(myControlMode){
       case eFreeNodes:
       case eCoincidentNodes:


@@ -1050,25 +1090,13 @@ void SMESH_ActorDef::SetControlMode( eControl theMode, bool theCheckEntityMode )
         SetEntityMode(eEdges);
       }
       else if(myControlActor == my2DActor) {
         SetEntityMode(eEdges);
       }
       else if(myControlActor == my2DActor) {

-        switch(myControlMode) {
-        case eLength2D:
-        case eFreeEdges:
-        case eFreeFaces:
-        case eMultiConnection2D:
-          if (!myIsEntityModeCache){
-            myEntityModeCache = GetEntityMode();
-            myIsEntityModeCache=true;
-          }
-          SetEntityMode(eFaces);
-          break;
-        default:
-          if (!myIsEntityModeCache){
-            myEntityModeCache = GetEntityMode();
-            myIsEntityModeCache=true;
-          }
-          SetEntityMode(eFaces);
+        if (!myIsEntityModeCache){
+          myEntityModeCache = GetEntityMode();
+          myIsEntityModeCache=true;

         }
         }

-      }else if(myControlActor == my3DActor) {
+        SetEntityMode(eFaces);
+      }
+      else if(myControlActor == my3DActor) {

         if (!myIsEntityModeCache){
             myEntityModeCache = GetEntityMode();
             myIsEntityModeCache=true;
         if (!myIsEntityModeCache){
             myEntityModeCache = GetEntityMode();
             myIsEntityModeCache=true;


@@ -1100,7 +1128,7 @@ void SMESH_ActorDef::SetControlMode( eControl theMode, bool theCheckEntityMode )
   if (isLogarithmic && range[0] > 1e-07 && range[1] > 1e-07)
     lookupTable->SetScale(VTK_SCALE_LOG10);
 
   if (isLogarithmic && range[0] > 1e-07 && range[1] > 1e-07)
     lookupTable->SetScale(VTK_SCALE_LOG10);
 

-  Update();
+  //Update();

 }
 
 int SMESH_ActorDef::GetNumberControlEntities()
 }
 
 int SMESH_ActorDef::GetNumberControlEntities()


@@ -1134,6 +1162,11 @@ int SMESH_ActorDef::GetNumberControlEntities()
 
 void SMESH_ActorDef::AddToRender(vtkRenderer* theRenderer)
 {
 
 void SMESH_ActorDef::AddToRender(vtkRenderer* theRenderer)
 {

+  if ( !mySelector || !mySelector->IsSelectionEnabled() )
+  {
+    myBaseActor->SetUnstructuredGrid( NULL );
+    //myHighlitableActor->SetUnstructuredGrid( NULL );
+  }

   theRenderer->AddActor(myBaseActor);
   theRenderer->AddActor(myNodeExtActor);
   theRenderer->AddActor(my1DExtActor);
   theRenderer->AddActor(myBaseActor);
   theRenderer->AddActor(myNodeExtActor);
   theRenderer->AddActor(my1DExtActor);


@@ -1274,7 +1307,9 @@ bool SMESH_ActorDef::Init(TVisualObjPtr theVisualObj,
 
 double* SMESH_ActorDef::GetBounds()
 {
 
 double* SMESH_ActorDef::GetBounds()
 {

-  return myNodeActor->GetBounds();
+  if ( GetNumberOfClippingPlanes() + myPlaneCollection->GetNumberOfItems() > 0 )
+    return myNodeActor->GetBounds();
+  return myVisualObj->GetUnstructuredGrid()->GetPoints()->GetBounds();

 }
 
 
 }
 
 


@@ -1424,6 +1459,10 @@ double* SMESH_ActorDef::GetNodeCoord(int theObjID)
   return myPickableActor->GetNodeCoord(theObjID);
 }
 
   return myPickableActor->GetNodeCoord(theObjID);
 }
 

+int SMESH_ActorDef::GetNodeVtkId(int theObjID)
+{
+  return myPickableActor->GetNodeVtkId(theObjID);
+}

 
 int SMESH_ActorDef::GetElemObjId(int theVtkID)
 {
 
 int SMESH_ActorDef::GetElemObjId(int theVtkID)
 {


@@ -1465,8 +1504,8 @@ void SMESH_ActorDef::SetVisibility(int theMode, bool theIsUpdateRepersentation)
 
   myScalarBarActor->VisibilityOff();
 
 
   myScalarBarActor->VisibilityOff();
 

-  if(GetVisibility()){
-    if(theIsUpdateRepersentation)
+  if ( GetVisibility() ) {
+    if ( theIsUpdateRepersentation )

       SetRepresentation(GetRepresentation());
 
     if(myControlMode != eNone) {
       SetRepresentation(GetRepresentation());
 
     if(myControlMode != eNone) {


@@ -1475,9 +1514,15 @@ void SMESH_ActorDef::SetVisibility(int theMode, bool theIsUpdateRepersentation)
       case eCoincidentNodes:
         myNodeExtActor->VisibilityOn();
         break;
       case eCoincidentNodes:
         myNodeExtActor->VisibilityOn();
         break;

+      case eLength:
+      case eMultiConnection:
+        my1DActor->VisibilityOn();
+        break;

       case eFreeEdges:
       case eFreeBorders:
       case eCoincidentElems1D:
       case eFreeEdges:
       case eFreeBorders:
       case eCoincidentElems1D:

+      case eLength2D:
+      case eMultiConnection2D:

         my1DExtActor->VisibilityOn();
         break;
       case eFreeFaces:
         my1DExtActor->VisibilityOn();
         break;
       case eFreeFaces:


@@ -1491,45 +1536,37 @@ void SMESH_ActorDef::SetVisibility(int theMode, bool theIsUpdateRepersentation)
       case eCoincidentElems3D:
         my3DExtActor->VisibilityOn();
         break;
       case eCoincidentElems3D:
         my3DExtActor->VisibilityOn();
         break;

-      case eLength2D:
-      case eMultiConnection2D:
-        my1DExtActor->VisibilityOn();
-        break;

       default:;
       }
       default:;
       }

-      if(myControlActor->GetUnstructuredGrid()->GetNumberOfCells())
+      if ( myFunctor && myVisualObj->GetNbEntities( myFunctor->GetType() ))

         myScalarBarActor->VisibilityOn();
     }
 
         myScalarBarActor->VisibilityOn();
     }
 

-    if(myRepresentation != ePoint)
-      myPickableActor->VisibilityOn();
-    else {
-      myNodeActor->VisibilityOn();
-    }
-
-    if(myEntityMode & e0DElements && GetRepresentation() != ePoint ){
-      my0DActor->VisibilityOn();
-    }
-    if(myEntityMode & eBallElem && GetRepresentation() != ePoint ){
-      myBallActor->VisibilityOn();
-    }
-
-    if(myEntityMode & eEdges && GetRepresentation() != ePoint){
-      my1DActor->VisibilityOn();
-    }
-
-    if(myEntityMode & eFaces && GetRepresentation() != ePoint){
-      my2DActor->VisibilityOn();
-    }
+    myPickableActor->VisibilityOn();

 
 

-    if(myEntityMode & eVolumes && GetRepresentation() != ePoint){
-      my3DActor->VisibilityOn();
+    if ( GetRepresentation() != ePoint )
+    {
+      if(myEntityMode & e0DElements  ){
+        my0DActor->VisibilityOn();
+      }
+      if(myEntityMode & eBallElem    ){
+        myBallActor->VisibilityOn();
+      }
+      if(myEntityMode & eEdges && GetCellsLabeled() ){ // my1DActor shows labels only
+        my1DActor->VisibilityOn();
+      }
+      if(myEntityMode & eFaces      ){
+        my2DActor->VisibilityOn();
+      }
+      if(myEntityMode & eVolumes    ){
+        my3DActor->VisibilityOn();
+      }

     }
 
     }
 

-    if(myNodeActor->GetPointsLabeled()){
+    if(myNodeActor->GetPointsLabeled()) {
+      myNodeActor->UpdateLabels();

       myNodeActor->VisibilityOn();
     }
       myNodeActor->VisibilityOn();
     }

-

     if(my0DActor)
       my0DActor->UpdateLabels();
 
     if(my0DActor)
       my0DActor->UpdateLabels();
 


@@ -1556,30 +1593,30 @@ void SMESH_ActorDef::SetVisibility(int theMode, bool theIsUpdateRepersentation)
 
 void SMESH_ActorDef::SetEntityMode(unsigned int theMode)
 {
 
 void SMESH_ActorDef::SetEntityMode(unsigned int theMode)
 {

-  myEntityState = eAllEntity;
+  unsigned int anObjectEntities = eAllEntity; // entities present in my object

 
   if(!myVisualObj->GetNbEntities(SMDSAbs_0DElement)) {
 
   if(!myVisualObj->GetNbEntities(SMDSAbs_0DElement)) {

-    myEntityState &= ~e0DElements;
+    anObjectEntities &= ~e0DElements;

     theMode &= ~e0DElements;
   }
 
   if(!myVisualObj->GetNbEntities(SMDSAbs_Ball)) {
     theMode &= ~e0DElements;
   }
 
   if(!myVisualObj->GetNbEntities(SMDSAbs_Ball)) {

-    myEntityState &= ~eBallElem;
+    anObjectEntities &= ~eBallElem;

     theMode &= ~eBallElem;
   }
 
   if(!myVisualObj->GetNbEntities(SMDSAbs_Edge)) {
     theMode &= ~eBallElem;
   }
 
   if(!myVisualObj->GetNbEntities(SMDSAbs_Edge)) {

-    myEntityState &= ~eEdges;
+    anObjectEntities &= ~eEdges;

     theMode &= ~eEdges;
   }
 
   if(!myVisualObj->GetNbEntities(SMDSAbs_Face)) {
     theMode &= ~eEdges;
   }
 
   if(!myVisualObj->GetNbEntities(SMDSAbs_Face)) {

-    myEntityState &= ~eFaces;
+    anObjectEntities &= ~eFaces;

     theMode &= ~eFaces;
   }
 
   if(!myVisualObj->GetNbEntities(SMDSAbs_Volume)) {
     theMode &= ~eFaces;
   }
 
   if(!myVisualObj->GetNbEntities(SMDSAbs_Volume)) {

-    myEntityState &= ~eVolumes;
+    anObjectEntities &= ~eVolumes;

     theMode &= ~eVolumes;
   }
 
     theMode &= ~eVolumes;
   }
 


@@ -1600,100 +1637,129 @@ void SMESH_ActorDef::SetEntityMode(unsigned int theMode)
       theMode |= eVolumes;
   }
 
       theMode |= eVolumes;
   }
 

-  myBaseActor->myGeomFilter->SetInside(myEntityMode != myEntityState);
+  myBaseActor->myGeomFilter->SetInside(myEntityMode != anObjectEntities);

 
 

-  myEntityMode = theMode;
-  VTKViewer_ExtractUnstructuredGrid* aFilter = NULL;
-  aFilter = myBaseActor->GetExtractUnstructuredGrid();
-  aFilter->ClearRegisteredCellsWithType();
-  aFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding);
+  if ( anObjectEntities == 0 && myRepresentation != ePoint ) // no elements, show nodes
+  {
+    myRepresentationCache = GetRepresentation();
+    SetRepresentation( ePoint );
+  }

 
 

-  VTKViewer_ExtractUnstructuredGrid* aHightFilter = myHighlitableActor->GetExtractUnstructuredGrid();
-  aHightFilter->ClearRegisteredCellsWithType();
-  aHightFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding);
+  if ( myEntityMode != theMode )
+  {
+    myEntityMode = theMode; // entities to show

 
 

-  if (myEntityMode & e0DElements) {
-    if (MYDEBUG) MESSAGE("0D ELEMENTS");
-    aFilter->RegisterCellsWithType(VTK_VERTEX);
-    aHightFilter->RegisterCellsWithType(VTK_VERTEX);
-  }
+    // Set cell types to extract

 
 

-  if (myEntityMode & eBallElem) {
-    aFilter->RegisterCellsWithType(VTK_POLY_VERTEX);
-  }
+    VTKViewer_ExtractUnstructuredGrid*    aFilter = myBaseActor->GetExtractUnstructuredGrid();
+    VTKViewer_ExtractUnstructuredGrid* aHltFilter = myHighlitableActor->GetExtractUnstructuredGrid();
+    aFilter->ClearRegisteredCellsWithType();
+    aHltFilter->ClearRegisteredCellsWithType();
+
+    bool isPassAll = ( myEntityMode == anObjectEntities && myEntityMode );
+    if ( isPassAll )
+    {
+      aFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::ePassAll);
+      aHltFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::ePassAll);
+    }
+    else
+    {
+      aFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding);
+      aHltFilter->SetModeOfChanging(VTKViewer_ExtractUnstructuredGrid::eAdding);

 
 

-  if (myEntityMode & eEdges) {
-    if (MYDEBUG) MESSAGE("EDGES");
-    aFilter->RegisterCellsWithType(VTK_LINE);
-    aFilter->RegisterCellsWithType(VTK_QUADRATIC_EDGE);
+      if (myEntityMode & e0DElements) {
+        aFilter->RegisterCellsWithType(VTK_VERTEX);
+        aHltFilter->RegisterCellsWithType(VTK_VERTEX);
+      }

 
 

-    aHightFilter->RegisterCellsWithType(VTK_LINE);
-    aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_EDGE);
-  }
+      if (myEntityMode & eBallElem) {
+        aFilter->RegisterCellsWithType(VTK_POLY_VERTEX);
+      }

 
 

-  if (myEntityMode & eFaces) {
-    if (MYDEBUG) MESSAGE("FACES");
-    aFilter->RegisterCellsWithType(VTK_TRIANGLE);
-    aFilter->RegisterCellsWithType(VTK_QUAD);
-    aFilter->RegisterCellsWithType(VTK_POLYGON);
-    aFilter->RegisterCellsWithType(VTK_QUADRATIC_TRIANGLE);
-    aFilter->RegisterCellsWithType(VTK_QUADRATIC_QUAD);
-    aFilter->RegisterCellsWithType(VTK_QUADRATIC_POLYGON);
-    aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_QUAD);
-    aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_TRIANGLE);
-
-    aHightFilter->RegisterCellsWithType(VTK_TRIANGLE);
-    aHightFilter->RegisterCellsWithType(VTK_QUAD);
-    aHightFilter->RegisterCellsWithType(VTK_POLYGON);
-    aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_TRIANGLE);
-    aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_QUAD);
-    aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_POLYGON);
-    aHightFilter->RegisterCellsWithType(VTK_BIQUADRATIC_QUAD);
-    aHightFilter->RegisterCellsWithType(VTK_BIQUADRATIC_TRIANGLE);
-  }
+      if (myEntityMode & eEdges) {
+        aFilter->RegisterCellsWithType(VTK_LINE);
+        aFilter->RegisterCellsWithType(VTK_QUADRATIC_EDGE);

 
 

-  if (myEntityMode & eVolumes) {
-    if (MYDEBUG) MESSAGE("VOLUMES");
-    aFilter->RegisterCellsWithType(VTK_TETRA);
-    aFilter->RegisterCellsWithType(VTK_VOXEL);
-    aFilter->RegisterCellsWithType(VTK_HEXAHEDRON);
-    aFilter->RegisterCellsWithType(VTK_WEDGE);
-    aFilter->RegisterCellsWithType(VTK_PYRAMID);
-    aFilter->RegisterCellsWithType(VTK_HEXAGONAL_PRISM);
-    aFilter->RegisterCellsWithType(VTK_QUADRATIC_TETRA);
-    aFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON);
-    aFilter->RegisterCellsWithType(VTK_TRIQUADRATIC_HEXAHEDRON);
-    aFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID);
-    aFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE);
-    aFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET);
-    aFilter->RegisterCellsWithType(VTK_POLYHEDRON);
-
-    aHightFilter->RegisterCellsWithType(VTK_TETRA);
-    aHightFilter->RegisterCellsWithType(VTK_VOXEL);
-    aHightFilter->RegisterCellsWithType(VTK_HEXAHEDRON);
-    aHightFilter->RegisterCellsWithType(VTK_WEDGE);
-    aHightFilter->RegisterCellsWithType(VTK_PYRAMID);
-    aHightFilter->RegisterCellsWithType(VTK_HEXAGONAL_PRISM);
-    aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_TETRA);
-    aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON);
-    aHightFilter->RegisterCellsWithType(VTK_TRIQUADRATIC_HEXAHEDRON);
-    aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE);
-    aHightFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID);
-    aHightFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET);
-    aHightFilter->RegisterCellsWithType(VTK_POLYHEDRON);
+        aHltFilter->RegisterCellsWithType(VTK_LINE);
+        aHltFilter->RegisterCellsWithType(VTK_QUADRATIC_EDGE);
+      }
+
+      if (myEntityMode & eFaces) {
+        aFilter->RegisterCellsWithType(VTK_TRIANGLE);
+        aFilter->RegisterCellsWithType(VTK_QUAD);
+        aFilter->RegisterCellsWithType(VTK_POLYGON);
+        aFilter->RegisterCellsWithType(VTK_QUADRATIC_TRIANGLE);
+        aFilter->RegisterCellsWithType(VTK_QUADRATIC_QUAD);
+        aFilter->RegisterCellsWithType(VTK_QUADRATIC_POLYGON);
+        aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_QUAD);
+        aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_TRIANGLE);
+
+        aHltFilter->RegisterCellsWithType(VTK_TRIANGLE);
+        aHltFilter->RegisterCellsWithType(VTK_QUAD);
+        aHltFilter->RegisterCellsWithType(VTK_POLYGON);
+        aHltFilter->RegisterCellsWithType(VTK_QUADRATIC_TRIANGLE);
+        aHltFilter->RegisterCellsWithType(VTK_QUADRATIC_QUAD);
+        aHltFilter->RegisterCellsWithType(VTK_QUADRATIC_POLYGON);
+        aHltFilter->RegisterCellsWithType(VTK_BIQUADRATIC_QUAD);
+        aHltFilter->RegisterCellsWithType(VTK_BIQUADRATIC_TRIANGLE);
+      }
+
+      if (myEntityMode & eVolumes) {
+        aFilter->RegisterCellsWithType(VTK_TETRA);
+        aFilter->RegisterCellsWithType(VTK_VOXEL);
+        aFilter->RegisterCellsWithType(VTK_HEXAHEDRON);
+        aFilter->RegisterCellsWithType(VTK_WEDGE);
+        aFilter->RegisterCellsWithType(VTK_PYRAMID);
+        aFilter->RegisterCellsWithType(VTK_HEXAGONAL_PRISM);
+        aFilter->RegisterCellsWithType(VTK_QUADRATIC_TETRA);
+        aFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON);
+        aFilter->RegisterCellsWithType(VTK_TRIQUADRATIC_HEXAHEDRON);
+        aFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID);
+        aFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE);
+        aFilter->RegisterCellsWithType(VTK_BIQUADRATIC_QUADRATIC_WEDGE);
+        aFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET);
+        aFilter->RegisterCellsWithType(VTK_POLYHEDRON);
+
+        aHltFilter->RegisterCellsWithType(VTK_TETRA);
+        aHltFilter->RegisterCellsWithType(VTK_VOXEL);
+        aHltFilter->RegisterCellsWithType(VTK_HEXAHEDRON);
+        aHltFilter->RegisterCellsWithType(VTK_WEDGE);
+        aHltFilter->RegisterCellsWithType(VTK_PYRAMID);
+        aHltFilter->RegisterCellsWithType(VTK_HEXAGONAL_PRISM);
+        aHltFilter->RegisterCellsWithType(VTK_QUADRATIC_TETRA);
+        aHltFilter->RegisterCellsWithType(VTK_QUADRATIC_HEXAHEDRON);
+        aHltFilter->RegisterCellsWithType(VTK_TRIQUADRATIC_HEXAHEDRON);
+        aHltFilter->RegisterCellsWithType(VTK_QUADRATIC_WEDGE);
+        aHltFilter->RegisterCellsWithType(VTK_BIQUADRATIC_QUADRATIC_WEDGE);
+        aHltFilter->RegisterCellsWithType(VTK_QUADRATIC_PYRAMID);
+        aHltFilter->RegisterCellsWithType(VTK_CONVEX_POINT_SET);
+        aHltFilter->RegisterCellsWithType(VTK_POLYHEDRON);
+      }
+    }
+    if ( GetVisibility() )
+      aFilter->Update();
+    if (MYDEBUG) MESSAGE(aFilter->GetOutput()->GetNumberOfCells());

   }
   }

-  aFilter->Update();
-  if (MYDEBUG) MESSAGE(aFilter->GetOutput()->GetNumberOfCells());
-  SetVisibility(GetVisibility(),false);
+
+  SetVisibility( GetVisibility(), myRepresentationCache != 0 );

 }
 
 void SMESH_ActorDef::SetRepresentation (int theMode)
 {
 }
 
 void SMESH_ActorDef::SetRepresentation (int theMode)
 {

-  int aNbEdges = myVisualObj->GetNbEntities(SMDSAbs_Edge);
-  int aNbFaces = myVisualObj->GetNbEntities(SMDSAbs_Face);
+  int aNbEdges   = myVisualObj->GetNbEntities(SMDSAbs_Edge);
+  int aNbFaces   = myVisualObj->GetNbEntities(SMDSAbs_Face);

   int aNbVolumes = myVisualObj->GetNbEntities(SMDSAbs_Volume);
   int aNbVolumes = myVisualObj->GetNbEntities(SMDSAbs_Volume);

-  int aNb0Ds       = myVisualObj->GetNbEntities(SMDSAbs_0DElement);
-  int aNbBalls       = myVisualObj->GetNbEntities(SMDSAbs_Ball);
+  int aNb0Ds     = myVisualObj->GetNbEntities(SMDSAbs_0DElement);
+  int aNbBalls   = myVisualObj->GetNbEntities(SMDSAbs_Ball);
+
+  if ( myRepresentationCache && aNbEdges + aNbFaces + aNbVolumes + aNb0Ds + aNbBalls )
+  {
+    theMode = myRepresentationCache;
+    if ( theMode == eSurface && aNbFaces + aNbVolumes == 0 )
+      theMode = eEdge;
+    else
+      myRepresentationCache = 0;
+  }

 
   if (theMode < 0) {
     myRepresentation = eSurface;
 
   if (theMode < 0) {
     myRepresentation = eSurface;


@@ -1727,8 +1793,6 @@ void SMESH_ActorDef::SetRepresentation (int theMode)
   }
 
   myPickableActor = myBaseActor;
   }
 
   myPickableActor = myBaseActor;

-  myNodeActor->SetVisibility(false);
-  myNodeExtActor->SetVisibility(false);

   vtkProperty *aProp = NULL, *aBackProp = NULL;
   vtkProperty *aPropVN = NULL, *aPropVR = NULL;
   SMESH_DeviceActor::EReperesent aReperesent = SMESH_DeviceActor::EReperesent(-1);
   vtkProperty *aProp = NULL, *aBackProp = NULL;
   vtkProperty *aPropVN = NULL, *aPropVR = NULL;
   SMESH_DeviceActor::EReperesent aReperesent = SMESH_DeviceActor::EReperesent(-1);


@@ -1736,7 +1800,6 @@ void SMESH_ActorDef::SetRepresentation (int theMode)
   switch (myRepresentation) {
   case ePoint:
     myPickableActor = myNodeActor;
   switch (myRepresentation) {
   case ePoint:
     myPickableActor = myNodeActor;

-    myNodeActor->SetVisibility(true);

     aQuadraticMode = SMESH_Actor::eLines;
     aProp = aBackProp = aPropVN = aPropVR = myNodeProp;
     aReperesent = SMESH_DeviceActor::ePoint;
     aQuadraticMode = SMESH_Actor::eLines;
     aProp = aBackProp = aPropVN = aPropVR = myNodeProp;
     aReperesent = SMESH_DeviceActor::ePoint;


@@ -1754,54 +1817,50 @@ void SMESH_ActorDef::SetRepresentation (int theMode)
     break;
   }
 
     break;
   }
 

-  my2DActor->SetProperty(aProp);
-  my2DActor->SetBackfaceProperty(aBackProp);
-  my2DActor->SetRepresentation(aReperesent);
+  if ( myRepresentation != ePoint )
+  {
+    my2DActor->SetProperty(aProp);
+    my2DActor->SetBackfaceProperty(aBackProp);
+    my2DActor->SetRepresentation(aReperesent);

 
 

-  if(aQuadraticMode == SMESH_Actor::eLines)
-    my2DActor->SetQuadraticArcMode(false);
-  else if(aQuadraticMode == SMESH_Actor::eArcs)
-    my2DActor->SetQuadraticArcMode(true);
+    if(aQuadraticMode == SMESH_Actor::eLines)
+      my2DActor->SetQuadraticArcMode(false);
+    else if(aQuadraticMode == SMESH_Actor::eArcs)
+      my2DActor->SetQuadraticArcMode(true);

 
 

-  my2DExtActor->SetRepresentation(aReperesent);
+    my2DExtActor->SetRepresentation(aReperesent);

 
 

-  my3DActor->SetProperty(aPropVN);
-  my3DActor->SetBackfaceProperty(aPropVR);
-  my3DActor->SetRepresentation(aReperesent);
+    my3DActor->SetProperty(aPropVN);
+    my3DActor->SetBackfaceProperty(aPropVR);
+    my3DActor->SetRepresentation(aReperesent);

 
 

+    my0DActor->SetRepresentation(aReperesent);
+    myBallActor->SetRepresentation(aReperesent);

 
 

-  my1DExtActor->SetVisibility(false);
-  my2DExtActor->SetVisibility(false);
-  my3DExtActor->SetVisibility(false);
-
-  my0DActor->SetRepresentation(aReperesent);
-  myBallActor->SetRepresentation(aReperesent);
-
-  switch ( myControlMode ) {
-  case eLength:
-  case eMultiConnection:
-    aProp = aBackProp = my1DProp;
-    if(myRepresentation != ePoint)
-      aReperesent = SMESH_DeviceActor::eInsideframe;
-    break;
-  default:;
-  }
+    switch ( myControlMode ) {
+    case eLength:
+    case eMultiConnection:
+      aProp = aBackProp = my1DProp;
+      if ( myRepresentation != ePoint )
+        aReperesent = SMESH_DeviceActor::eInsideframe;
+      break;
+    default:;
+    }

 
 

-  if(aQuadraticMode == SMESH_Actor::eLines)
-    my1DActor->SetQuadraticArcMode(false);
-  else if(aQuadraticMode == SMESH_Actor::eArcs)
-    my1DActor->SetQuadraticArcMode(true);
+    if(aQuadraticMode == SMESH_Actor::eLines)
+      my1DActor->SetQuadraticArcMode(false);
+    else if(aQuadraticMode == SMESH_Actor::eArcs)
+      my1DActor->SetQuadraticArcMode(true);

 
 

-  my1DActor->SetProperty(aProp);
-  my1DActor->SetBackfaceProperty(aBackProp);
-  my1DActor->SetRepresentation(aReperesent);
+    my1DActor->SetProperty(aProp);
+    my1DActor->SetBackfaceProperty(aBackProp);
+    my1DActor->SetRepresentation(aReperesent);

 
 

-  my1DExtActor->SetRepresentation(aReperesent);
+    my1DExtActor->SetRepresentation(aReperesent);
+  }

 
   if(myIsPointsVisible)
     myPickableActor = myNodeActor;
 
   if(myIsPointsVisible)
     myPickableActor = myNodeActor;

-  if(GetPointRepresentation())
-    myNodeActor->SetVisibility(true);

 
   SetMapper(myPickableActor->GetMapper());
 
 
   SetMapper(myPickableActor->GetMapper());
 


@@ -1863,11 +1922,30 @@ void SMESH_ActorDef::UpdateHighlight()
       }
       myNodeActor->SetRepresentation(SMESH_DeviceActor::ePoint);
       myNodeActor->GetExtractUnstructuredGrid()->SetModeOfExtraction(VTKViewer_ExtractUnstructuredGrid::ePoints);
       }
       myNodeActor->SetRepresentation(SMESH_DeviceActor::ePoint);
       myNodeActor->GetExtractUnstructuredGrid()->SetModeOfExtraction(VTKViewer_ExtractUnstructuredGrid::ePoints);

+      myNodeActor->GetProperty()->Modified();

       break;
     }
   }
 }
 
       break;
     }
   }
 }
 

+void SMESH_ActorDef::EnableSelection( bool enable )
+{
+  // selection in the Viewer enabled/disabled
+  if ( enable && ! myBaseActor->myExtractUnstructuredGrid->GetInput() )
+  {
+    myBaseActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
+    //myHighlitableActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
+    myBaseActor->myExtractUnstructuredGrid->Update();
+    //myHighlitableActor->myExtractUnstructuredGrid->Update();
+  }
+  if ( !enable && myBaseActor->myExtractUnstructuredGrid->GetInput() )
+  {
+    myBaseActor->SetUnstructuredGrid( NULL );
+    //myHighlitableActor->SetUnstructuredGrid( NULL );
+    myBaseActor->myExtractUnstructuredGrid->Update();
+    //myHighlitableActor->myExtractUnstructuredGrid->Update();
+  }
+}

 
 void SMESH_ActorDef::highlight(bool theHighlight)
 {
 
 void SMESH_ActorDef::highlight(bool theHighlight)
 {


@@ -1891,11 +1969,11 @@ void SMESH_ActorDef::SetPreSelected(bool thePreselect)
 int SMESH_ActorDef::RenderOpaqueGeometry(vtkViewport *vp)
 {
   if (myPickableActor->GetIsOpaque())
 int SMESH_ActorDef::RenderOpaqueGeometry(vtkViewport *vp)
 {
   if (myPickableActor->GetIsOpaque())

-    {
+  {

     vtkRenderer *ren = static_cast<vtkRenderer *>(vp);
     this->Render(ren);
     return 1;
     vtkRenderer *ren = static_cast<vtkRenderer *>(vp);
     this->Render(ren);
     return 1;

-    }
+  }

   return 0;
 }
 
   return 0;
 }
 


@@ -1903,20 +1981,20 @@ int SMESH_ActorDef::RenderOpaqueGeometry(vtkViewport *vp)
 int SMESH_ActorDef::RenderTranslucentGeometry(vtkViewport *vp)
 {
   if (!myPickableActor->GetIsOpaque())
 int SMESH_ActorDef::RenderTranslucentGeometry(vtkViewport *vp)
 {
   if (!myPickableActor->GetIsOpaque())

-    {
+  {

     vtkRenderer *ren = static_cast<vtkRenderer *>(vp);
     this->Render(ren);
     return 1;
     vtkRenderer *ren = static_cast<vtkRenderer *>(vp);
     this->Render(ren);
     return 1;

-    }
+  }

   return 0;
 }
 
 
 void SMESH_ActorDef::Render(vtkRenderer *ren)
 {
   return 0;
 }
 
 
 void SMESH_ActorDef::Render(vtkRenderer *ren)
 {

-  unsigned long aTime = myTimeStamp->GetMTime();
-  unsigned long anObjTime = myVisualObj->GetUnstructuredGrid()->GetMTime();
-  unsigned long aClippingTime = myImplicitBoolean->GetMTime();
+  vtkMTimeType aTime = myTimeStamp->GetMTime();
+  vtkMTimeType anObjTime = myVisualObj->GetUnstructuredGrid()->GetMTime();
+  vtkMTimeType aClippingTime = myImplicitBoolean->GetMTime();

   if(anObjTime > aTime || aClippingTime > aTime)
     Update();
 }
   if(anObjTime > aTime || aClippingTime > aTime)
     Update();
 }


@@ -1926,6 +2004,8 @@ void SMESH_ActorDef::Update()
 {
   if(MYDEBUG) MESSAGE("SMESH_ActorDef::Update");
 
 {
   if(MYDEBUG) MESSAGE("SMESH_ActorDef::Update");
 

+  myVisualObj->Update();
+

   if(GetControlMode() != eNone) {
     unsigned long aTime = myTimeStamp->GetMTime();
     unsigned long anObjTime = myVisualObj->GetUnstructuredGrid()->GetMTime();
   if(GetControlMode() != eNone) {
     unsigned long aTime = myTimeStamp->GetMTime();
     unsigned long anObjTime = myVisualObj->GetUnstructuredGrid()->GetMTime();


@@ -1955,9 +2035,9 @@ void SMESH_ActorDef::Update()
     SetFacesOriented(myIsFacesOriented);
   }
 
     SetFacesOriented(myIsFacesOriented);
   }
 

-  if(myVisualObj->GetEntitiesFlag()) {
-    myEntityMode |= myVisualObj->GetEntitiesState();
-  }
+  // if(myVisualObj->GetEntitiesFlag()) { IPAL53915
+  //   myEntityMode |= myVisualObj->GetEntitiesState();
+  // }

 
   SetEntityMode(GetEntityMode());
   SetVisibility(GetVisibility());
 
   SetEntityMode(GetEntityMode());
   SetVisibility(GetVisibility());


@@ -2297,6 +2377,11 @@ void SMESH_ActorDef::SetOpenGLClippingPlane()
   myHighlitableActor->SetPlaneCollection( myPlaneCollection );
   myHighlitableActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
 
   myHighlitableActor->SetPlaneCollection( myPlaneCollection );
   myHighlitableActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
 

+  if ( !mySelector || !mySelector->IsSelectionEnabled() )
+  {
+    myBaseActor->SetUnstructuredGrid( NULL );
+    //myHighlitableActor->SetUnstructuredGrid( NULL );
+  }

   my1DActor->SetPlaneCollection( myPlaneCollection );
   my1DActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
 
   my1DActor->SetPlaneCollection( myPlaneCollection );
   my1DActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());