Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

diff --git a/vv/vvImageContour.cxx b/vv/vvImageContour.cxx
index 2ece6c5f33a85cd20c589231bb288475df70c902..ac43af2cc6a5467be57478aea07c69607f8b5b14 100644 (file)
--- a/vv/vvImageContour.cxx
+++ b/vv/vvImageContour.cxx
@@ -234,7 +234,7 @@ void vvImageContour::UpdateWithPreserveMemoryMode()
     if (mPreviousTslice != -1) mSquaresActorList[mPreviousTslice]->VisibilityOff();
   }
 
-  mSlicer->Render();
+  //mSlicer->Render();
 }
 //------------------------------------------------------------------------------
 

diff --git a/vv/vvROIActor.cxx b/vv/vvROIActor.cxx
index cfb965d5227f9e9e2a3992373f71e4a8bdc532ac..4e1a9dc880b487c8b38969c67f567e1fb44cd5a4 100644 (file)
--- a/vv/vvROIActor.cxx
+++ b/vv/vvROIActor.cxx
@@ -121,7 +121,7 @@ void vvROIActor::SetVisible(bool b)
     for(unsigned int i= 0; i<mOverlayActors.size(); i++)
       mOverlayActors[i]->ShowActors();
   }
-  Update(); // No Render
+  //Update(); // No Render
 }
 //------------------------------------------------------------------------------
 
@@ -140,7 +140,7 @@ void vvROIActor::SetContourVisible(bool b)
       mImageContour[i]->ShowActors();
     }
   }
-  Update(); // No Render
+  //Update(); // No Render
 }
 //------------------------------------------------------------------------------
 
@@ -252,7 +252,7 @@ void vvROIActor::UpdateSlice(int slicer, int slices, int force)
   if (mIsVisible) {
     mOverlayActors[slicer]->UpdateSlice(slicer, slices, force);
   }
-  mSlicerManager->GetSlicer(slicer)->Render();
+  //mSlicerManager->GetSlicer(slicer)->Render();
 }
 //------------------------------------------------------------------------------
 

diff --git a/vv/vvToolROIManager.cxx b/vv/vvToolROIManager.cxx
index 7a2324b2eecb2d28acd726afbe58a2cd7876a15a..791db06f8922e537dc45409373bbf6884b49468d 100644 (file)
--- a/vv/vvToolROIManager.cxx
+++ b/vv/vvToolROIManager.cxx
@@ -553,7 +553,7 @@ void vvToolROIManager::UpdateAllContours()
   for(unsigned int i=0; i<mROIList.size(); i++) {
     mROIActorsList[i]->Update();
   }
-  mCurrentSlicerManager->Render();
+  //mCurrentSlicerManager->Render();
 }
 //------------------------------------------------------------------------------
 
@@ -716,6 +716,7 @@ void vvToolROIManager::OpacityChanged(int v)
 //------------------------------------------------------------------------------
 void vvToolROIManager::AllVisibleROIToggled(int b)
 { 
+  disconnect(mCheckBoxShowAll, SIGNAL(stateChanged(int)), this, SLOT(AllVisibleROIToggled(int)));
   bool status = false;
   if ((mCheckBoxShowAll->checkState() == Qt::Checked) ||
       (mCheckBoxShowAll->checkState() == Qt::PartiallyChecked))  status = true;
@@ -727,6 +728,7 @@ void vvToolROIManager::AllVisibleROIToggled(int b)
   else  mCheckBoxShowAll->setCheckState(Qt::Unchecked);
   mCheckBoxShow->setChecked(status);
   mCurrentSlicerManager->Render();
+  connect(mCheckBoxShowAll, SIGNAL(stateChanged(int)), this, SLOT(AllVisibleROIToggled(int)));
 }
 //------------------------------------------------------------------------------
 
@@ -734,6 +736,7 @@ void vvToolROIManager::AllVisibleROIToggled(int b)
 //------------------------------------------------------------------------------
 void vvToolROIManager::AllVisibleContourROIToggled(int b)
 { 
+  disconnect(mContourCheckBoxShowAll, SIGNAL(stateChanged(int)), this, SLOT(AllVisibleContourROIToggled(int)));
   bool status = false;
   if ((mContourCheckBoxShowAll->checkState() == Qt::Checked) ||
       (mContourCheckBoxShowAll->checkState() == Qt::PartiallyChecked))  status = true;
@@ -746,6 +749,7 @@ void vvToolROIManager::AllVisibleContourROIToggled(int b)
   else  mContourCheckBoxShowAll->setCheckState(Qt::Unchecked);
   mContourCheckBoxShow->setChecked(status);
   mCurrentSlicerManager->Render();
+  connect(mContourCheckBoxShowAll, SIGNAL(stateChanged(int)), this, SLOT(AllVisibleContourROIToggled(int)));
 }
 //------------------------------------------------------------------------------