Show VTKButtons on interaction

* msvVTKButtons::Update() must be called to refresh their visibility and
positions.
* Don't trigger a rendering each time 1 button is modified, refreshes
should be triggered by the application.
* Factorize the ShowButtons()/HideButtons()

Author: finetjul

Applications/ButtonClusters/msvQButtonClustersMainWindow.cxx

@@ -260,15 +260,7 @@ void msvQButtonClustersMainWindowPrivate::showData(int idx, bool value)
 void msvQButtonClustersMainWindowPrivate::enableClustering(bool value)
 {
   this->ButtonsManager->SetClustering(value);
-  if(value)
-    {
-    
-    this->ButtonsManager->HideButtons();
-    }
-  else
-    {
-    this->ButtonsManager->ShowButtons();
-    }
+  this->ButtonsManager->SetCustersButtonsVisibility(value);
   this->ButtonsManager->UpdateWidgets();
   this->updateView();
 }

Libs/VTK/Widgets/msvVTKButtons.cxx

@@ -202,18 +202,14 @@ vtkImageData* msvVTKButtons::GetPreview(int width, int height)
 }
 
 //------------------------------------------------------------------------------
-void msvVTKButtons::Update()
+void msvVTKButtons::Update(bool render)
 {
-  Superclass::Update();
   this->CalculatePosition();
-  if (ButtonCallback)
+  if (this->ButtonCallback)
     {
-    vtkButtonCallback::SafeDownCast(ButtonCallback)->FlyTo = FlyTo;
-    if (vtkButtonCallback::SafeDownCast(ButtonCallback)->Renderer)
-      {
-      Renderer->GetRenderWindow()->Render();
-      }
+    vtkButtonCallback::SafeDownCast(this->ButtonCallback)->FlyTo = FlyTo;
     }
+  this->Superclass::Update(render);
 }
 
 //------------------------------------------------------------------------------

Libs/VTK/Widgets/msvVTKButtons.h

@@ -93,8 +93,8 @@ class MSV_VTK_WIDGETS_EXPORT msvVTKButtons : public msvVTKButtonsInterface
   void SetCurrentRenderer(vtkRenderer *renderer);
 
   // Description:
-  // Perform update
-  void Update();
+  // Recalculate its position and request a rendering if \a render is true.
+  void Update(bool render = true);
 
   // Description:
   // Calculate position (center or corner)

Libs/VTK/Widgets/msvVTKButtonsGroup.cxx

@@ -483,10 +483,10 @@ void msvVTKButtonsGroup::SetCurrentRenderer(vtkRenderer *renderer)
 }
 
 //----------------------------------------------------------------------
-void msvVTKButtonsGroup::Update()
+void msvVTKButtonsGroup::Update(bool render)
 {
-  Superclass::Update();
   this->CalculatePosition();
+  this->Superclass::Update(render);
 }
 
 //----------------------------------------------------------------------

Libs/VTK/Widgets/msvVTKButtonsGroup.h

@@ -117,7 +117,7 @@ class MSV_VTK_WIDGETS_EXPORT msvVTKButtonsGroup : public msvVTKButtonsInterface
 
   // Description:
   // Perform update
-  void Update();
+  virtual void Update(bool render = true);
 
   // Description:
   // Calculate position (center or corner)

Libs/VTK/Widgets/msvVTKButtonsInterface.cxx

@@ -100,7 +100,7 @@ void msvVTKButtonsInterface::SetCurrentRenderer(vtkRenderer* renderer)
 }
 
 //----------------------------------------------------------------------
-void msvVTKButtonsInterface::Update()
+void msvVTKButtonsInterface::Update(bool render)
 {
   vtkTexturedButtonRepresentation2D *rep =
     vtkTexturedButtonRepresentation2D::SafeDownCast(
@@ -143,6 +143,10 @@ void msvVTKButtonsInterface::Update()
     this->GetButton()->GetRepresentation()->SetVisibility(false);
     this->GetButton()->EnabledOff();
     }
+  if (this->Renderer && render)
+    {
+    this->Renderer->GetRenderWindow()->Render();
+    }
 }
 
 //----------------------------------------------------------------------
@@ -155,7 +159,6 @@ void msvVTKButtonsInterface::SetImage(vtkImageData* image)
   rep->SetButtonTexture(0,Image);
   int size[2]; size[0] = 16; size[1] = 16;
   rep->GetBalloon()->SetImageSize(size);
-  //this->Update();
 }
 
 //----------------------------------------------------------------------
@@ -164,20 +167,22 @@ void msvVTKButtonsInterface::SetOpacity(double opacity)
   if (opacity > 1) opacity=1;
   if (opacity < 0) opacity=0;
 
-  Opacity = opacity;
-
-  this->Update();
+  this->Opacity = opacity;
 }
 
 //----------------------------------------------------------------------
 void msvVTKButtonsInterface::RestorePreviousOpacity()
 {
-  this->SetOpacity(PreviousOpacity);
+  this->SetOpacity(this->PreviousOpacity);
 }
 
 //----------------------------------------------------------------------
 void msvVTKButtonsInterface::SetShowButton(bool show)
 {
+  if (this->ShowButton == show)
+    {
+    return;
+    }
   this->ShowButton = show;
   if (this->Renderer)
     {

Libs/VTK/Widgets/msvVTKButtonsInterface.h

@@ -107,11 +107,11 @@ class MSV_VTK_WIDGETS_EXPORT msvVTKButtonsInterface : public vtkObject
 
   // Description:
   // Add vtk button to Renderer
-  void SetCurrentRenderer(vtkRenderer *renderer);
+  virtual void SetCurrentRenderer(vtkRenderer *renderer);
 
   // Description:
-  // update graphic objects
-  void Update();
+  // Update graphic objects and render the view if requested.
+  virtual void Update(bool render = true);
 
   // Description:
   // Get the current renderer

Libs/VTK/Widgets/msvVTKButtonsManager.cxx

@@ -114,6 +114,7 @@ class vtkCameraCallback : public vtkCommand
             this->MoveOverlappingButtons();
             }
           toolButton->SetOpacity(1-opacity);
+          toolButton->Update(false);
           }
         }
       }