Join modifications from branch OCC_development_for_3_2_0a2

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

diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx
index e29785b0d0f4b77246a50fba0902da7c9e554184..8c06e2fce6ed73812e25a33f489fec60d8726887 100644 (file)
--- a/src/OBJECT/VISU_GaussPtsAct.cxx
+++ b/src/OBJECT/VISU_GaussPtsAct.cxx
@@ -556,7 +556,7 @@ VISU_GaussPtsAct
     case 'M' :
     case 'm' :
     {
-      if( myWidgetCtrl->GetEnabled() )
+      if( IsSegmentationEnabled() )
       {
        this->ChangeMagnification( myInteractor->GetShiftKey() );
        return;
@@ -568,7 +568,7 @@ VISU_GaussPtsAct
     case 'D' :
     case 'd' :
     {
-      if( myWidgetCtrl->GetEnabled() && myWidgetCtrl->IsSphereActive() )
+      if( IsSegmentationEnabled() && myWidgetCtrl->IsSphereActive() )
       {
        VISU_SphereWidget* aSphereWidget = myWidgetCtrl->GetSphereWidget();
        aSphereWidget->ChangeRadius( myInteractor->GetShiftKey() );
@@ -839,13 +839,16 @@ VISU_GaussPtsAct
     return;
 
   myOutlineActor->SetVisibility(false);
-  myTextActor->SetVisibility(0);
-  myCursorPyramidSelected->SetVisibility(0);
-  myCursorPyramid->SetVisibility(0);
-  myCellActor->SetVisibility(0);
+  myTextActor->SetVisibility(false);
+  myCursorPyramidSelected->SetVisibility(false);
+  myCursorPyramid->SetVisibility(false);
+  myCellActor->SetVisibility(false);
   GetScalarBarCtrl()->SetIsMarked(false);
   GetScalarBarCtrl()->Update();
 
+  if(!theIsHighlight)
+    return;
+
   bool anIsVisible = GetVisibility();
 
   Selection_Mode aSelectionMode = mySelector->SelectionMode();