Merge remote-tracking branch 'origin/pointeur' into landmark

diff --git a/tools/clitkAffineTransformGenericFilter.txx b/tools/clitkAffineTransformGenericFilter.txx
index 65d66dc741c6256637eefbeb5c222a25860caf87..93d43571b11d170825ad6f31e09b5646e653f086 100644 (file)
--- a/tools/clitkAffineTransformGenericFilter.txx
+++ b/tools/clitkAffineTransformGenericFilter.txx
@@ -139,7 +139,7 @@ namespace clitk
       {
         if (m_ArgsInfo.matrix_given)
           {
-            std::cerr << "You must use either rotate/translate or matrix options" << std::cout;
+            std::cerr << "You must use either rotate/translate or matrix options" << std::endl;
             return;
           }
         itk::Array<double> transformParameters(2 * Dimension);
@@ -369,7 +369,7 @@ namespace clitk
       {
         if (m_ArgsInfo.matrix_given)
           {
-            std::cerr << "You must use either rotate/translate or matrix options" << std::cout;
+            std::cerr << "You must use either rotate/translate or matrix options" << std::endl;
             return;
           }
         itk::Array<double> transformParameters(2 * Dimension);

diff --git a/vv/vvImageContour.cxx b/vv/vvImageContour.cxx
index ac43af2cc6a5467be57478aea07c69607f8b5b14..68dc72059a32d5cf02ac3424720149e6ffd9fc7f 100644 (file)
--- a/vv/vvImageContour.cxx
+++ b/vv/vvImageContour.cxx
@@ -38,6 +38,7 @@ vvImageContour::vvImageContour()
   mDisplayModeIsPreserveMemory = true;
   SetPreserveMemoryModeEnabled(true);
   mPreviousOrientation = -1;
+  mPreviousValue=0;
   mDepth = 1.0;
   mSlice = 0;
 }

diff --git a/vv/vvIntensityValueSlider.cxx b/vv/vvIntensityValueSlider.cxx
index 6d15838390d71f9aec93e3192c18decd9f4d555d..bbd31e56aac34785ce971b378b9afb7ece79e58d 100644 (file)
--- a/vv/vvIntensityValueSlider.cxx
+++ b/vv/vvIntensityValueSlider.cxx
@@ -26,6 +26,7 @@ vvIntensityValueSlider::vvIntensityValueSlider(QWidget * parent, Qt::WindowFlags
   mIsInteger = true;
   mButtonPlus->setHidden(true);
   mButtonMinus->setHidden(true);
+  mValue=0;
 
   // Connect signals & slots
   connect(mSpinBox, SIGNAL(valueChanged(double)), this, SLOT(valueChangedFromSpinBox(double)));

diff --git a/vv/vvSlicerManagerCommand.cxx b/vv/vvSlicerManagerCommand.cxx
index c645a27cc88992345b9e479d4b1409688a7a933c..9e978324b038d586b63d61420267858ed71d7f1c 100644 (file)
--- a/vv/vvSlicerManagerCommand.cxx
+++ b/vv/vvSlicerManagerCommand.cxx
@@ -73,7 +73,7 @@ void vvSlicerManagerCommand::Execute(vtkObject *caller,
   if (isi) {
     double x = isi->GetInteractor()->GetEventPosition()[0];
     double y = isi->GetInteractor()->GetEventPosition()[1];
-    double z;
+    double z(4000);
 
     int VisibleInWindow = this->FindSlicerNumber(isi->GetInteractor()->GetRenderWindow());
     vtkRenderer* renderer=NULL;

diff --git a/vv/vvToolCropImage.cxx b/vv/vvToolCropImage.cxx
index 1530341ce83456fa770bebe4e3b595cb9ed72927..736a7d696fc04549e4b24d0b0f988a457620cbbb 100644 (file)
--- a/vv/vvToolCropImage.cxx
+++ b/vv/vvToolCropImage.cxx
@@ -105,12 +105,13 @@ void vvToolCropImage::closeEvent(QCloseEvent *event)
     for(int i=0; i<mCurrentSlicerManager->GetNumberOfSlicers(); i++)
       mCurrentSlicerManager->GetSlicer(i)->EnableReducedExtent(false);
     UpdateExtent();
-  }
-  mCurrentSlicerManager->GetImage()->GetTransform()[0]->SetMatrix(mConcatenedTransform);
-  for (int i=0; i<mCurrentSlicerManager->GetNumberOfSlicers(); i++) {
-    mCurrentSlicerManager->GetSlicer(i)->ResetCamera();
-    mCurrentSlicerManager->GetSlicer(i)->Render();
-    mCurrentSlicerManager->UpdateLinkedNavigation( mCurrentSlicerManager->GetSlicer(i) );
+
+    mCurrentSlicerManager->GetImage()->GetTransform()[0]->SetMatrix(mConcatenedTransform);
+    for (int i=0; i<mCurrentSlicerManager->GetNumberOfSlicers(); i++) {
+      mCurrentSlicerManager->GetSlicer(i)->ResetCamera();
+      mCurrentSlicerManager->GetSlicer(i)->Render();
+      mCurrentSlicerManager->UpdateLinkedNavigation( mCurrentSlicerManager->GetSlicer(i) );
+    }
   }
   vvToolWidgetBase::closeEvent(event);
 }

diff --git a/vv/vvToolProfile.cxx b/vv/vvToolProfile.cxx
index 4360fee91119781a9401032d189fafed7065cdf6..e0ebdf1c14f283e7795a54e4adfbecaec5cf0ce8 100644 (file)
--- a/vv/vvToolProfile.cxx
+++ b/vv/vvToolProfile.cxx
@@ -361,18 +361,21 @@ void vvToolProfile::cancelPoints()
 //------------------------------------------------------------------------------
 void vvToolProfile::RemoveVTKObjects()
 { 
-  for(int i=0;i<mCurrentSlicerManager->GetNumberOfSlicers(); i++) {
-    mCurrentSlicerManager->GetSlicer(i)->GetRenderer()->RemoveActor(mLineActors[i]);
-  }
+  if (mCurrentSlicerManager)
+  {
+    connect(mCurrentSlicerManager, SIGNAL(callAddLandmark(float,float,float,float)), mCurrentSlicerManager, SLOT(AddLandmark(float,float,float,float)));
 
-  if (mPoint1Selected)
-    mCurrentSlicerManager->GetLandmarks()->RemoveLandmarkWithLabel("P1", mPoint1[3]);
-  if (mPoint2Selected)
-    mCurrentSlicerManager->GetLandmarks()->RemoveLandmarkWithLabel("P2", mPoint2[3]);
+    for(int i=0;i<mCurrentSlicerManager->GetNumberOfSlicers(); i++) {
+      mCurrentSlicerManager->GetSlicer(i)->GetRenderer()->RemoveActor(mLineActors[i]);
+    }
+
+    if (mPoint1Selected)
+      mCurrentSlicerManager->GetLandmarks()->RemoveLandmarkWithLabel("P1", mPoint1[3]);
+    if (mPoint2Selected)
+      mCurrentSlicerManager->GetLandmarks()->RemoveLandmarkWithLabel("P2", mPoint2[3]);
 
-    
-  if (mCurrentSlicerManager)
     mCurrentSlicerManager->Render();
+  }
 }
 //------------------------------------------------------------------------------
 
@@ -381,8 +384,7 @@ void vvToolProfile::RemoveVTKObjects()
 bool vvToolProfile::close()
 { 
   //RemoveVTKObjects();
-  
-  connect(mCurrentSlicerManager, SIGNAL(callAddLandmark(float,float,float,float)), mCurrentSlicerManager, SLOT(AddLandmark(float,float,float,float)));
+
   return vvToolWidgetBase::close();
 }
 //------------------------------------------------------------------------------

diff --git a/vv/vvToolRigidReg.cxx b/vv/vvToolRigidReg.cxx
index 8c2909e888158ce01eafe027126a32406dc8ed43..e50ab7fda50ec3a927afc399a5796d98d038f550 100644 (file)
--- a/vv/vvToolRigidReg.cxx
+++ b/vv/vvToolRigidReg.cxx
@@ -178,7 +178,8 @@ bool vvToolRigidReg::close()
   msgBox.addButton(tr("Yes"), QMessageBox::AcceptRole);
   msgBox.addButton(tr("No"), QMessageBox::RejectRole);
   if (msgBox.exec() == QMessageBox::AcceptRole) {
-    SetTransform(mInitialMatrix);
+    if (mCurrentSlicerManager)
+        SetTransform(mInitialMatrix);
     return vvToolWidgetBase::close();
   }
   return false;