cosmetic

diff --git a/vv/qt_ui/vvMainWindow.ui b/vv/qt_ui/vvMainWindow.ui
index 496ff49b101a488d20b08cdc817eae547481d6c9..0dffe7b081f482b0c7f4f2db8932b2112e250039 100644 (file)
--- a/vv/qt_ui/vvMainWindow.ui
+++ b/vv/qt_ui/vvMainWindow.ui
@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>vvMainWindow</class>
  <widget class="QMainWindow" name="vvMainWindow">
+  <property name="enabled">
+   <bool>true</bool>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -758,7 +761,7 @@
      <x>0</x>
      <y>0</y>
      <width>1008</width>
-     <height>23</height>
+     <height>27</height>
     </rect>
    </property>
    <property name="defaultUp">

diff --git a/vv/qt_ui/vvProgressDialog.ui b/vv/qt_ui/vvProgressDialog.ui
index b1280ef964693bf952914b8def16d1f635c427b8..4b5c5f65c3ea1e574cfd603ccd3792616c5c83de 100644 (file)
--- a/vv/qt_ui/vvProgressDialog.ui
+++ b/vv/qt_ui/vvProgressDialog.ui
@@ -9,10 +9,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>264</width>
+    <width>261</width>
     <height>120</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Progress</string>
   </property>

diff --git a/vv/qt_ui/vvToolExtractLung.ui b/vv/qt_ui/vvToolExtractLung.ui
index 70609a14dcb460c348595c2f99e4ec5694b16377..f498c1b18d6dbdca9c10d27987bbf7d556180310 100644 (file)
--- a/vv/qt_ui/vvToolExtractLung.ui
+++ b/vv/qt_ui/vvToolExtractLung.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>349</width>
-    <height>378</height>
+    <width>249</width>
+    <height>97</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -46,260 +46,9 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="mOptionsBox">
-     <property name="title">
-      <string>Extract Lung Options</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_5">
-        <item>
-         <widget class="QCheckBox" name="mFullConnectivityCheckBox_2">
-          <property name="text">
-           <string>Resample before (faster)</string>
-          </property>
-          <property name="checked">
-           <bool>false</bool>
-          </property>
-          <property name="tristate">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QDoubleSpinBox" name="mSamplingSpinBox">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="dimensionStaticLabel_6">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>mm</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_5">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QGridLayout" name="gridLayout_2">
-        <item row="2" column="2">
-         <widget class="vvIntensityValueSlider" name="mThresholdSlider2" native="true">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QLabel" name="label_2">
-          <property name="text">
-           <string>Initial upper threshold for air</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="2">
-         <widget class="vvIntensityValueSlider" name="mThresholdSlider1" native="true"/>
-        </item>
-        <item row="2" column="1">
-         <widget class="QRadioButton" name="mRadioButtonLowerThan">
-          <property name="text">
-           <string>lower threshold for air</string>
-          </property>
-          <property name="autoExclusive">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_4">
-        <item>
-         <widget class="QLabel" name="dimensionStaticLabel_2">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Min size</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="mMinSizeSpinBox">
-          <property name="maximum">
-           <number>999999</number>
-          </property>
-          <property name="value">
-           <number>100</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="mFullConnectivityCheckBox">
-        <property name="text">
-         <string>Full connectivity</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-        <property name="tristate">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QLabel" name="dimensionStaticLabel_3">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Remove</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="mBackgroundValueSpinBox"/>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_4">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <item>
-         <widget class="QLabel" name="dimensionStaticLabel_4">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>First Keep</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="mBackgroundValueSpinBox_2"/>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_3">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QLabel" name="dimensionStaticLabel_5">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Last Keep</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="mBackgroundValueSpinBox_3"/>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>vvIntensityValueSlider</class>
-   <extends>QWidget</extends>
-   <header>vvIntensityValueSlider.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>vvLabelImageLoaderWidget</class>
    <extends>QWidget</extends>
@@ -310,38 +59,5 @@
  <resources>
   <include location="../vvIcons.qrc"/>
  </resources>
- <connections>
-  <connection>
-   <sender>mFullConnectivityCheckBox_2</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>mSamplingSpinBox</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>151</x>
-     <y>141</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>233</x>
-     <y>134</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>mFullConnectivityCheckBox_2</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>dimensionStaticLabel_6</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>73</x>
-     <y>141</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>287</x>
-     <y>143</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>

diff --git a/vv/qt_ui/vvToolWidgetBase.ui b/vv/qt_ui/vvToolWidgetBase.ui
index e4f5653c03bf2f174331bee24c5d0293c8a6fb61..944fea4a290d3255b532f947624187311cac05f9 100644 (file)
--- a/vv/qt_ui/vvToolWidgetBase.ui
+++ b/vv/qt_ui/vvToolWidgetBase.ui
@@ -31,7 +31,7 @@
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
+    <widget class="QDialogButtonBox" name="mMainButtonBox">
      <property name="enabled">
       <bool>false</bool>
      </property>

diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx
index bf56a35ca8b24be92af56b06e9b0fe1dab30249d..10dc42d012885709d621a0ded415d650d6122c10 100644 (file)
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@ -98,6 +98,7 @@ vvMainWindow::vvMainWindow():vvMainWindowBase()
 
   mInputPathName = "";
   mMenuTools = menuTools;
+  //  mMenuSegmentation = menuSegmentation;
   mContextMenu = &contextMenu;
   mMenuExperimentalTools = menuExperimental;
   mMainWidget = this;
@@ -765,18 +766,7 @@ void vvMainWindow::LoadImages(std::vector<std::string> files, LoadedImageType fi
     bool SetImageSucceed=false;
 
     // Change filename if an image with the same already exist
-    //    DD(files[i]);
-    int number=0;
-    for(unsigned int l=0; l<mSlicerManagers.size(); l++) {
-      vvSlicerManager * v = mSlicerManagers[l];
-      //      DD(v->GetBaseFileName());
-      // DD(v->GetFileName());
-      if (v->GetBaseFileName() ==
-          vtksys::SystemTools::GetFilenameName(vtksys::SystemTools::GetFilenameWithoutLastExtension(files[i]))) {
-        number = std::max(number, v->GetBaseFileNameNumber()+1);
-      }
-    }
-
+    int number = GetImageDuplicateFilenameNumber(files[i]);
 
     if (filetype == IMAGE || filetype == IMAGEWITHTIME)
       SetImageSucceed = imageManager->SetImage(files[i],filetype, number);
@@ -2715,13 +2705,36 @@ void vvMainWindow::SurfaceViewerLaunch()
   vvSurfaceViewerDialog surfaceViewer;
   surfaceViewer.exec();
 }
+//------------------------------------------------------------------------------
+
+
+//------------------------------------------------------------------------------
+int vvMainWindow::GetImageDuplicateFilenameNumber(std::string filename)
+{
+  int number=0;
+  for(unsigned int l=0; l<mSlicerManagers.size(); l++) {
+    vvSlicerManager * v = mSlicerManagers[l];
+    if (v->GetBaseFileName() ==
+       vtksys::SystemTools::GetFilenameName(vtksys::SystemTools::GetFilenameWithoutLastExtension(filename))) {
+      number = std::max(number, v->GetBaseFileNameNumber()+1);
+    }
+  }
+  return number;
+}
+//------------------------------------------------------------------------------
+
 
 //------------------------------------------------------------------------------
 vvSlicerManager* vvMainWindow::AddImage(vvImage::Pointer image,std::string filename)
 {
+  // Change filename if another image exist with the same name
+  int number = GetImageDuplicateFilenameNumber(filename);
+
+  // Create new SliceManager
   vvSlicerManager* slicer_manager = new vvSlicerManager(4);
-  slicer_manager->SetImage(image);
-  slicer_manager->SetFilename(filename);
+  slicer_manager->SetImage(image);//, IMAGE, number);
+  //  filename = filename+"_"+clitk::toString(number);
+  slicer_manager->SetFilename(filename, number);
   mSlicerManagers.push_back(slicer_manager);
 
   //create an item in the tree with good settings

diff --git a/vv/vvMainWindow.h b/vv/vvMainWindow.h
index 52da158a330657369604c1b5f1bad1d6c42ea483..d4f23b101702d3a1f23eb69006afa608d62559ca 100644 (file)
--- a/vv/vvMainWindow.h
+++ b/vv/vvMainWindow.h
@@ -173,6 +173,7 @@ private:
   int GetSlicerIndexFromItem(QTreeWidgetItem* item);
   QTreeWidgetItem* GetItemFromSlicerManager(vvSlicerManager* sm);
   void SaveScreenshot(vtkImageData* image);
+  int GetImageDuplicateFilenameNumber(std::string filename);
 
   QMenu contextMenu;
   //QMenu *AddSubImageMenu;

diff --git a/vv/vvMainWindowBase.cxx b/vv/vvMainWindowBase.cxx
index c94b1cd7026bbcf50cb0d4bf6cf144a805c1558a..178396255482dad3416b249f584c9c3a0ccf55fc 100644 (file)
--- a/vv/vvMainWindowBase.cxx
+++ b/vv/vvMainWindowBase.cxx
@@ -15,6 +15,17 @@
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
 ======================================================================-====*/
+
 #include "vvMainWindowBase.h"
 
+//------------------------------------------------------------------------------
+QMenu * vvMainWindowBase::GetMenu(std::string menuName) const
+{
+  if (menuName == "Tools") return mMenuTools;
+  if (menuName == "Segmentation") return mMenuSegmentation;
+  std::cerr << "Error in vvMainWindowBase::GetMenu: menu '" << menuName << "' is unknown." << std::endl;
+  exit(0);
+}
+//------------------------------------------------------------------------------
+
 

diff --git a/vv/vvMainWindowBase.h b/vv/vvMainWindowBase.h
index 77e5539a59af56cb817656176e5c297651f8830a..a2787e4fd97d3cbfc4cb617bbbc2012d6304be3a 100644 (file)
--- a/vv/vvMainWindowBase.h
+++ b/vv/vvMainWindowBase.h
@@ -40,6 +40,7 @@ public:
   virtual QTabWidget * GetTab() = 0;
   const std::vector<vvSlicerManager*> & GetSlicerManagers() const { return mSlicerManagers; }
   QMenu * GetToolMenu() const { return mMenuTools; }
+  QMenu * GetMenu(std::string menuName) const;// { return mMenuTools; }
   QMenu * GetContextMenu() const { return mContextMenu; }
   QMenu * GetExperimentalToolMenu() const { return mMenuExperimentalTools; }
   int GetSlicerManagerCurrentIndex() const { return mSlicerManagerCurrentIndex; }
@@ -53,6 +54,7 @@ signals:
 protected:
   std::vector<vvSlicerManager*> mSlicerManagers;
   QMenu * mMenuTools;
+  QMenu * mMenuSegmentation;
   QMenu * mContextMenu;
   QMenu * mMenuExperimentalTools;
   int mSlicerManagerCurrentIndex;

diff --git a/vv/vvToolCreatorBase.cxx b/vv/vvToolCreatorBase.cxx
index 3b0610c79d7e25ca5bfcddc9fcabdc7a7725ed01..bb10c0f5922f865f9428adf49f838626970dd158 100644 (file)
--- a/vv/vvToolCreatorBase.cxx
+++ b/vv/vvToolCreatorBase.cxx
@@ -26,6 +26,7 @@ vvToolCreatorBase::vvToolCreatorBase(QString name): mExperimental(false)
 {
   mUseContextMenu = false;
   mToolName = name;
+  m_MenuName = "Tools";
   vvToolManager::GetInstance()->AddTool(this);
 }
 //------------------------------------------------------------------------------
@@ -58,8 +59,9 @@ void vvToolCreatorBase::InsertToolInMenu(vvMainWindowBase * m)
   connect(mAction, SIGNAL(triggered()), this, SLOT(MenuToolSlot()));
   if (mExperimental)
     mMainWindow->GetExperimentalToolMenu()->addAction(mAction);
-  else
-    mMainWindow->GetToolMenu()->addAction(mAction);
+  else {
+    mMainWindow->GetMenu(m_MenuName)->addAction(mAction);
+  }
 }
 //------------------------------------------------------------------------------
 

diff --git a/vv/vvToolCreatorBase.h b/vv/vvToolCreatorBase.h
index 025588864055c566c2b4ba2e7ce61c727a798077..28610f5d6c5f7a5c50693d87a78eaf6608f94f9b 100644 (file)
--- a/vv/vvToolCreatorBase.h
+++ b/vv/vvToolCreatorBase.h
@@ -17,7 +17,11 @@
 ======================================================================-====*/
 #ifndef VVTOOLCREATORBASE_H
 #define VVTOOLCREATORBASE_H
+
+//qt
 #include <QObject>
+
+// vv
 #include "vvSlicerManager.h"
 #include "vvMainWindowBase.h"
 
@@ -37,6 +41,7 @@ class vvToolCreatorBase: public QObject {
   virtual void MenuSpecificToolSlot() = 0;
   vvMainWindowBase * GetMainWindow() const { return mMainWindow; }
   void addMenuToContextMenu(QMenu * m);
+  void SetMenuName(std::string m) { m_MenuName = m; }
 
   QString mToolName;
   QString mToolMenuName;
@@ -55,6 +60,7 @@ protected:
   vvMainWindowBase * mMainWindow;
   std::vector<vvToolBaseBase*> mListOfTool;
   QObject * mSender;
+  std::string m_MenuName;
 };
 //------------------------------------------------------------------------------
 

diff --git a/vv/vvToolInputSelectorWidget.cxx b/vv/vvToolInputSelectorWidget.cxx
index 94957050c5e64f7ac6bd2b05a990728e4999fae3..25ef5e53905aba45993d981e45b44a9763498357 100644 (file)
--- a/vv/vvToolInputSelectorWidget.cxx
+++ b/vv/vvToolInputSelectorWidget.cxx
@@ -42,34 +42,29 @@ int vvToolInputSelectorWidget::GetNumberOfInput()
 
 //------------------------------------------------------------------------------
 void vvToolInputSelectorWidget::AddInputSelector(QString & s,
-    const std::vector<vvSlicerManager*> & l,
-    int index,
-    bool allowSkip)
+                                                const std::vector<vvSlicerManager*> & l,
+                                                int index,
+                                                bool allowSkip)
 {
-  //  DD("ICICICICICICICIC AddInputSelector ADD layout");
-  //  DD(index);
-  //DD(l.size());
+  // Create a input selector widget 
   vvToolSimpleInputSelectorWidget * input = new vvToolSimpleInputSelectorWidget;
   mListOfSimpleInputWidget.push_back(input);
   mSkipInput.push_back(false);
-
   input->SetText(s);
   input->EnableAllowSkip(allowSkip);
 
-  // copy list
+  // Copy the list of slicermanager
   std::vector<vvSlicerManager*> * ll = new std::vector<vvSlicerManager*>;
   for(unsigned int i=0; i<l.size(); i++)
     ll->push_back(l[i]);
 
-  // add
+  // Add
   input->SetInputList(*ll, index);
-  // input->setObjectName(QString::fromUtf8("TOTO"));
   mVerticalLayout->addWidget(input);
 
   // Enable or disable
   if (GetNumberOfInput() == 1) input->setEnabled(true);
   else input->setEnabled(false);
-  //DD(GetNumberOfInput());
 
   // Connect signals & slots
   connect(input, SIGNAL(accepted()), this, SLOT(accept()));
@@ -82,7 +77,6 @@ void vvToolInputSelectorWidget::AddInputSelector(QString & s,
 //------------------------------------------------------------------------------
 void vvToolInputSelectorWidget::Initialize()
 {
-  // setWindowModality(Qt::WindowModal);
   for(unsigned int i=0; i<mListOfSimpleInputWidget.size(); i++)
     mListOfSimpleInputWidget[i]->Initialize();
 }
@@ -92,19 +86,12 @@ void vvToolInputSelectorWidget::Initialize()
 //------------------------------------------------------------------------------
 void vvToolInputSelectorWidget::accept()
 {
-  // setWindowModality(Qt::NonModal);
-  //  DD("vvToolInputSelectorWidget::accept");
-  //DD(mNumberOfAcceptedInputs);
   mNumberOfAcceptedInputs++;
   if (mNumberOfAcceptedInputs == GetNumberOfInput()) {
     setEnabled(false);
     emit accepted();
   } else {
-    //DD("accepted");
-    //    for(unsigned int i=mNumberOfAcceptedInputs; i<mListOfSimpleInputWidget.size(); i++) {
-    //      mListOfSimpleInputWidget[i]->Initialize();
     mListOfSimpleInputWidget[mNumberOfAcceptedInputs]->setEnabled(true);
-    //}
   }
 }
 //------------------------------------------------------------------------------
@@ -113,15 +100,10 @@ void vvToolInputSelectorWidget::accept()
 //------------------------------------------------------------------------------
 void vvToolInputSelectorWidget::reject()
 {
-  //  DD("vvToolInputSelectorWidget::reject");
   if (mNumberOfAcceptedInputs != 0)  {
-    //    for(unsigned int i=mNumberOfAcceptedInputs; i<mListOfSimpleInputWidget.size(); i++) {
-    //      mListOfSimpleInputWidget[i]->Initialize();
-    //    DD(mNumberOfAcceptedInputs);
     mListOfSimpleInputWidget[mNumberOfAcceptedInputs]->setEnabled(false);
     mListOfSimpleInputWidget[mNumberOfAcceptedInputs-1]->setEnabled(true);
     mNumberOfAcceptedInputs--;
-    //}
   } else {
     emit rejected();
   }
@@ -132,9 +114,8 @@ void vvToolInputSelectorWidget::reject()
 //------------------------------------------------------------------------------
 void vvToolInputSelectorWidget::skip()
 {
-  //  DD("SKIP");
   mSkipInput[mNumberOfAcceptedInputs] = true;
-  accept();//mNumberOfAcceptedInputs++;
+  accept();
 }
 //------------------------------------------------------------------------------
 

diff --git a/vv/vvToolInputSelectorWidget.h b/vv/vvToolInputSelectorWidget.h
index b965f53b7622022a295df887e00940f6c05b2210..8755c0f2bcf82a8229e6da56f88ce03a3c3f1691 100644 (file)
--- a/vv/vvToolInputSelectorWidget.h
+++ b/vv/vvToolInputSelectorWidget.h
@@ -17,8 +17,12 @@
 ======================================================================-====*/
 #ifndef VVTOOLINPUTSELECTORWIDGET_H
 #define VVTOOLINPUTSELECTORWIDGET_H
+
+// qt
 #include <QtDesigner/QDesignerExportWidget>
 #include <QDialog>
+
+// vv
 #include "ui_vvToolInputSelectorWidget.h"
 
 class vvSlicerManager;

diff --git a/vv/vvToolSimpleInputSelectorWidget.cxx b/vv/vvToolSimpleInputSelectorWidget.cxx
index 0f0860a86f8701b97437822787cdb3680d5e6542..94c7aba1e75e5684751568a946182510e5b23e49 100644 (file)
--- a/vv/vvToolSimpleInputSelectorWidget.cxx
+++ b/vv/vvToolSimpleInputSelectorWidget.cxx
@@ -136,15 +136,12 @@ void vvToolSimpleInputSelectorWidget::skip(QAbstractButton* b)
 //------------------------------------------------------------------------------
 void vvToolSimpleInputSelectorWidget::changeInput(int index)
 {
- //  DD(index);
   if (index<0) return;
   if (index>=(int)mSlicerManagerList.size()) return;
   mCurrentIndex = index;
   vvImage * mCurrentImage = mSlicerManagerList[index]->GetImage();
   if (mCurrentImage == NULL) return;
- //  DD("la");
   unsigned int d = mCurrentImage->GetNumberOfDimensions();
- //  DD(d);
   QString size;
   QString spacing;
   for(unsigned int i=0; i<d-1; i++) {
@@ -160,7 +157,6 @@ void vvToolSimpleInputSelectorWidget::changeInput(int index)
                            .arg(mCurrentImage->GetScalarTypeAsITKString().c_str())
                            .arg(size)
                            .arg(spacing));
- //  DD("fin");
 }
 //------------------------------------------------------------------------------
 

diff --git a/vv/vvToolStructureSetManager.cxx b/vv/vvToolStructureSetManager.cxx
index a755369a3a0208479bebf97b13ffa98db5dcac2f..52a4f66820d075ffa4581b46cd8be1e52bab6443 100644 (file)
--- a/vv/vvToolStructureSetManager.cxx
+++ b/vv/vvToolStructureSetManager.cxx
@@ -86,7 +86,7 @@ vvToolStructureSetManager::vvToolStructureSetManager(vvMainWindowBase * parent,
   }
   else {
     MustOpenDialogWhenCreated = false;
-    buttonBox->setEnabled(true);
+    mMainButtonBox->setEnabled(true);
     mCurrentSlicerManager = current;
     mCurrentImage = mCurrentSlicerManager->GetImage();
     mToolWidget->setEnabled(true);
@@ -585,7 +585,7 @@ void vvToolStructureSetManager::ReloadCurrentROI() {
   }
   //  delete mCurrentROI->GetImage();
   // DD(mCurrentROI->GetImage()->GetFirstVTKImageData()->GetDataReleased());
-//   DD(mCurrentROI->GetImage()->GetFirstVTKImageData()->GetReferenceCount());
+  //   DD(mCurrentROI->GetImage()->GetFirstVTKImageData()->GetReferenceCount());
   mCurrentROI->GetImage()->GetFirstVTKImageData()->ReleaseData();
   // DD(mCurrentROI->GetImage()->GetFirstVTKImageData()->GetDataReleased());
   mCurrentROI->SetImage(mReader->GetOutput());
@@ -600,8 +600,6 @@ void vvToolStructureSetManager::ReloadCurrentROI() {
 //------------------------------------------------------------------------------
 void vvToolStructureSetManager::CheckInputList(std::vector<vvSlicerManager*> & l, int & index) 
 {
-  DD("TODO CheckInputList");
-
   for(unsigned int i=0; i<l.size(); i++) {
     std::vector<vvSlicerManager*>::iterator iter = std::find(mListOfInputs.begin(), mListOfInputs.end(), l[i]);
     if (iter != mListOfInputs.end()) {
@@ -619,9 +617,6 @@ void vvToolStructureSetManager::CheckInputList(std::vector<vvSlicerManager*> & l
 // STATIC
 vvToolStructureSetManager * vvToolStructureSetManager::AddImage(vvSlicerManager * m, std::string name, vvImage::Pointer image, double BG, bool m_modeBG)
 {
-  DD("static AddImage");
-  DD(mListOfInputs.size());
-  
   // If the tool is open for this vvSlicerManager, use it and return
   if (mListOfOpenTool[m]) {
     vvToolStructureSetManager * tool = mListOfOpenTool[m];