X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolSimpleInputSelectorWidget.cxx;h=9ecadb40872fd7ddbcbae817f60357f42489760a;hb=73f0ab806cbb168db4d09908a714f8b7a662ee21;hp=9c948fcf0fbb2794af5e6314674250ea2a6a072e;hpb=1e034c70105f0926939acaaa27ddb46e904ae8bf;p=clitk.git

diff --git a/vv/vvToolSimpleInputSelectorWidget.cxx b/vv/vvToolSimpleInputSelectorWidget.cxx
index 9c948fc..9ecadb4 100644
--- a/vv/vvToolSimpleInputSelectorWidget.cxx
+++ b/vv/vvToolSimpleInputSelectorWidget.cxx
@@ -3,7 +3,7 @@
 
   Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,11 +14,15 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #ifndef VVTOOLINPUTSELECTORWIDGET_CXX
 #define VVTOOLINPUTSELECTORWIDGET_CXX
+
+// vv
 #include "vvToolSimpleInputSelectorWidget.h"
 #include "vvSlicerManager.h"
+
+// qt
 #include <QAbstractButton>
 
 //------------------------------------------------------------------------------
@@ -62,7 +66,7 @@ void vvToolSimpleInputSelectorWidget::EnableAllowSkip(bool b)
 {
   mAllowSkip = b;
   if (mAllowSkip) {
-    mInputSelectionButtonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Discard);
+    mInputSelectionButtonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Ignore);
     connect(mInputSelectionButtonBox, SIGNAL(clicked(QAbstractButton*)), this, SLOT(skip(QAbstractButton*)));
   } else
     mInputSelectionButtonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
@@ -97,6 +101,7 @@ void vvToolSimpleInputSelectorWidget::setEnabled(bool b)
   QWidget::setEnabled(b);
   mInputSelectionButtonBox->setEnabled(b);
   mInputSequenceBox->setEnabled(b);
+  
 }
 //------------------------------------------------------------------------------
 
@@ -123,7 +128,7 @@ void vvToolSimpleInputSelectorWidget::reject()
 //------------------------------------------------------------------------------
 void vvToolSimpleInputSelectorWidget::skip(QAbstractButton* b)
 {
-  if (b->text() == "Discard") emit sigskip();
+  if (b->text() == "Ignore") emit sigskip();
 }
 //------------------------------------------------------------------------------
 
@@ -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));
 }