Protect vtkMPEG2Writer.h which is not anymore in vtk's includes if vtk is not

[clitk.git] / vv / vvToolSimpleInputSelectorWidget.cxx

diff --git a/vv/vvToolSimpleInputSelectorWidget.cxx b/vv/vvToolSimpleInputSelectorWidget.cxx
index 9c948fcf0fbb2794af5e6314674250ea2a6a072e..94c7aba1e75e5684751568a946182510e5b23e49 100644 (file)
--- a/vv/vvToolSimpleInputSelectorWidget.cxx
+++ b/vv/vvToolSimpleInputSelectorWidget.cxx
@@ -17,8 +17,12 @@
 ======================================================================-====*/
 #ifndef VVTOOLINPUTSELECTORWIDGET_CXX
 #define VVTOOLINPUTSELECTORWIDGET_CXX
+
+// vv
 #include "vvToolSimpleInputSelectorWidget.h"
 #include "vvSlicerManager.h"
+
+// qt
 #include <QAbstractButton>
 
 //------------------------------------------------------------------------------
@@ -97,6 +101,7 @@ void vvToolSimpleInputSelectorWidget::setEnabled(bool b)
   QWidget::setEnabled(b);
   mInputSelectionButtonBox->setEnabled(b);
   mInputSequenceBox->setEnabled(b);
+  
 }
 //------------------------------------------------------------------------------
 
@@ -132,8 +137,10 @@ void vvToolSimpleInputSelectorWidget::skip(QAbstractButton* b)
 void vvToolSimpleInputSelectorWidget::changeInput(int index)
 {
   if (index<0) return;
+  if (index>=(int)mSlicerManagerList.size()) return;
   mCurrentIndex = index;
   vvImage * mCurrentImage = mSlicerManagerList[index]->GetImage();
+  if (mCurrentImage == NULL) return;
   unsigned int d = mCurrentImage->GetNumberOfDimensions();
   QString size;
   QString spacing;
@@ -145,9 +152,9 @@ void vvToolSimpleInputSelectorWidget::changeInput(int index)
   }
   size.append(QString("%1").arg(mCurrentImage->GetSize()[d-1]));
   spacing.append(QString("%1").arg(mCurrentImage->GetSpacing()[d-1]));
-  mLabelInputInfo->setText(QString("Image: %1D %2   %3    %4")
+  mLabelInputInfo->setText(QString("%1D %2\n%3\n%4")
                            .arg(d)
-                           .arg(mCurrentImage->GetScalarTypeAsString().c_str())
+                           .arg(mCurrentImage->GetScalarTypeAsITKString().c_str())
                            .arg(size)
                            .arg(spacing));
 }