Merge branch 'master' of /home/dsarrut/clitk3.server

diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx
index 8842b2d2343e0739ca204e3b7fe4435e8ff8466d..c3465c19f8a7d7276c0f51894efb304d6cc5223c 100644 (file)
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@ -1381,9 +1381,13 @@ void vvMainWindow::DisplayChanged(QTreeWidgetItem *clickedItem, int column)
       mSlicerManagers[slicerManagerIndex]->UpdateSlicer(column-1, true);
       mSlicerManagers[slicerManagerIndex]->UpdateInfoOnCursorPosition(column-1);
       DisplaySliders(slicerManagerIndex, column-1);
-      if(clickedParentItem == clickedItem) {
-        // Toggle or force visibility if it was not on this branch so far
-        vis = !draw || !vis;
+      if(!draw) {
+        // We were not on this branch so far => force visibility
+        vis = true;
+      }
+      else if(clickedParentItem == clickedItem) {
+        // Toggle
+        vis =  !vis;
       }
       clickedSlicer->SetActorVisibility("image", 0, vis);
       clickedParentItem->setData(column, Qt::CheckStateRole, vis?2:0);

diff --git a/vv/vvSlicer.cxx b/vv/vvSlicer.cxx
index 22f0eedae4f55b95b38f306ab0838aefd0114b7a..d934d264fd382d22759bab20a2d3d478c457dcf1 100644 (file)
--- a/vv/vvSlicer.cxx
+++ b/vv/vvSlicer.cxx
@@ -1052,7 +1052,12 @@ void vvSlicer::ResetCamera()
 //----------------------------------------------------------------------------
 void vvSlicer::SetDisplayMode(bool i)
 {
+  this->GetImageActor()->SetVisibility(i);
+  this->GetAnnotation()->SetVisibility(i);
   this->GetRenderer()->SetDraw(i);
+  if (mLandActor)
+    mLandActor->SetVisibility(i);
+  pdmA->SetVisibility(i);
   if (i)
     UpdateDisplayExtent();
 }