remove MACRO for vvTool and others minors stuffs

diff --git a/common/clitkCommon.cxx b/common/clitkCommon.cxx
index d7ca47aa7cd94dabc8965c20a48fc1a7844b1151..c80c095a06da0a295f5613cffcb206d947495029 100644 (file)
--- a/common/clitkCommon.cxx
+++ b/common/clitkCommon.cxx
@@ -25,7 +25,7 @@
    -------------------------------------------------*/
 
 #include "clitkCommon.h"
-#include "itkMacro.h"
+#include <fstream>
 
 //------------------------------------------------------------------
 // skip line which begin with a sharp '#'

diff --git a/common/clitkCommon.h b/common/clitkCommon.h
index ce70757a5496a74d2df199c7197879d34cb84e35..00a32cfea64f4d76bcd3938c4f1fedcd4360edf1 100644 (file)
--- a/common/clitkCommon.h
+++ b/common/clitkCommon.h
@@ -12,18 +12,22 @@
    -------------------------------------------------------------------*/
 
 // std include
-#include <config.h>
-#include <cstdlib>
-#include <algorithm>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <vector>
-#include <math.h>
-#include <typeinfo>
-
-#include "itkMacro.h"
+//#include <config.h>
+//#include <cstdlib>
+//#include <algorithm>
+//#include <iostream>
+//#include <string>
+//#include <fstream>
+//#include <sstream>
+//#include <vector>
+//#include <math.h>
+//#include <typeinfo>
+//#include <utility>
+//#include <algorithm>
+
+// itk include (include std)
 #include <itkContinuousIndex.h>
+#include <itkMacro.h>
 #include <itkImageRegionConstIterator.h>
 #include <itkImageRegionIterator.h>
 

diff --git a/common/clitkListOfPair.cxx b/common/clitkListOfPair.cxx
index 09cc04b81e1492d2aa7f2533f56f0c935cb59eb1..25b254da32f30bae994c8405149d94d4b2656202 100644 (file)
--- a/common/clitkListOfPair.cxx
+++ b/common/clitkListOfPair.cxx
@@ -7,11 +7,11 @@
   l'Image). All rights reserved. See Doc/License.txt or
   http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the above copyright notices for more information.
                                                                              
-------------------------------------------------------------------------=*/
+  ------------------------------------------------------------------------=*/
 
 
 #ifndef CLITKLISTOFPAIR_CXX
@@ -32,13 +32,13 @@
 
 //--------------------------------------------------------------------
 double clitk::convertValue(double v, 
-                                       const std::multimap<double, double> & conversionTable, 
-                                       bool linear) {
+                           const std::multimap<double, double> & conversionTable, 
+                           bool linear) {
   std::map<double, double>::const_iterator i;
   i = conversionTable.lower_bound(v);  
   if (i == conversionTable.end()) {
-       std::cerr << "The value " << v << " is out of the table" << std::endl;
-       exit(0);
+    std::cerr << "The value " << v << " is out of the table" << std::endl;
+    exit(0);
   }
   
   double v2 = i->first;
@@ -49,12 +49,12 @@ double clitk::convertValue(double v,
 
   // interpol
   if (!linear) {
-       if ((v-v1) > (v2-v)) return p2;
-       else return p1;
+    if ((v-v1) > (v2-v)) return p2;
+    else return p1;
   }
   else {
-       double w = (v-v1)/(v2-v1);
-       return p1*(1.0-w)+w*p2;
+    double w = (v-v1)/(v2-v1);
+    return p1*(1.0-w)+w*p2;
   }
 }
 //--------------------------------------------------------------------

diff --git a/common/clitkListOfPair.h b/common/clitkListOfPair.h
index 4e9502f5534adc47d8a8a0f07fa2090351da6df1..12a207f0855c3bc7c3dd3aa2ed50158f9dacfd95 100644 (file)
--- a/common/clitkListOfPair.h
+++ b/common/clitkListOfPair.h
@@ -2,17 +2,19 @@
 #define CLITKLISTOFPAIR_H
 
 /**
- ===================================================================
- * @file   clitkListOfPair.h
- * @author David Sarrut <David.Sarrut@creatis.insa-lyon.fr>
- * @date   27 Feb 2007 09:44:18
+   ===================================================================
+   * @file   clitkListOfPair.h
+   * @author David Sarrut <David.Sarrut@creatis.insa-lyon.fr>
+   * @date   27 Feb 2007 09:44:18
 
- * @brief  
+   * @brief  
 
- ===================================================================*/
+   ===================================================================*/
 
 #include "clitkCommon.h"
 
+#include <fstream>
+
 namespace clitk {
   
   //====================================================================
@@ -21,8 +23,8 @@ namespace clitk {
   
   //====================================================================
   double convertValue(double v, 
-                                         const std::multimap<double, double> & conversionTable, 
-                                         bool linear);
+                      const std::multimap<double, double> & conversionTable, 
+                      bool linear);
   
 #include "clitkListOfPair.txx"
 

diff --git a/common/clitkTimer.h b/common/clitkTimer.h
index 5f16a8eb2ee9e0eae1c67282674eda08a0e8939b..5f651c341f265cc23afcfda806b6332e14b54b90 100644 (file)
--- a/common/clitkTimer.h
+++ b/common/clitkTimer.h
@@ -18,6 +18,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <iostream>
+#include <utility>
 
 namespace clitk {
 

diff --git a/common/clitkVfImageIO.h b/common/clitkVfImageIO.h
index e26d7a907fab519169f709e91a316ce424674cf2..23e73e934c49c8f1b26483cad510ee1c37421295 100644 (file)
--- a/common/clitkVfImageIO.h
+++ b/common/clitkVfImageIO.h
@@ -18,6 +18,9 @@
 // itk include
 #include "itkImageIOBase.h"
 
+// std include 
+#include <fstream>
+
 namespace clitk {
   
   //====================================================================

diff --git a/common/clitkVoxImageIO.h b/common/clitkVoxImageIO.h
index d4ffb6a6dff7099cf7156fbe88ff34ea38f72f2e..dede8a2d17a885c812571be61f60f08989fd8153 100644 (file)
--- a/common/clitkVoxImageIO.h
+++ b/common/clitkVoxImageIO.h
@@ -17,6 +17,9 @@
 // itk include
 #include "itkImageIOBase.h"
 
+// std include
+#include <fstream>
+
 namespace clitk {
   
   //====================================================================

diff --git a/common/clitkVoxImageIOFactory.cxx b/common/clitkVoxImageIOFactory.cxx
index b1789db40d72e5feae621e9329cd67dc73503d93..94e73b6e5d9a9bedc7e1a7c5c24c4af269537bc6 100644 (file)
--- a/common/clitkVoxImageIOFactory.cxx
+++ b/common/clitkVoxImageIOFactory.cxx
@@ -30,6 +30,8 @@
 
 #include "clitkVoxImageIOFactory.h"
 
+#include <fstream>
+
 //====================================================================
 clitk::VoxImageIOFactory::VoxImageIOFactory() 
 {

diff --git a/vv/qt_ui/vvToolBinarize.ui b/vv/qt_ui/vvToolBinarize.ui
index 154f977de672b75b25eeddbca86613da910050ee..3b9a1f0f2675d8b9bdcf320444a832d4e70ac8e2 100644 (file)
--- a/vv/qt_ui/vvToolBinarize.ui
+++ b/vv/qt_ui/vvToolBinarize.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>388</width>
-    <height>318</height>
+    <width>320</width>
+    <height>298</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -116,12 +116,36 @@
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_4">
            <item>
-            <widget class="vvIntensityValueSlider" name="mFGSlider" native="true"/>
+            <widget class="QCheckBox" name="mCheckBoxUseFG">
+             <property name="text">
+              <string>Use FG</string>
+             </property>
+             <property name="checked">
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="vvIntensityValueSlider" name="mFGSlider" native="true">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
+            </widget>
            </item>
           </layout>
          </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_5">
+           <item>
+            <widget class="QCheckBox" name="mCheckBoxUseBG">
+             <property name="text">
+              <string>Use BG</string>
+             </property>
+             <property name="checked">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="vvIntensityValueSlider" name="mBGSlider" native="true"/>
            </item>
@@ -138,6 +162,9 @@
        </item>
        <item>
         <widget class="QCheckBox" name="checkBox_2">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
          <property name="text">
           <string>Interactive (unchek to disable on the fly contours drawing)</string>
          </property>
@@ -180,11 +207,11 @@
    <hints>
     <hint type="sourcelabel">
      <x>85</x>
-     <y>191</y>
+     <y>129</y>
     </hint>
     <hint type="destinationlabel">
-     <x>601</x>
-     <y>203</y>
+     <x>305</x>
+     <y>129</y>
     </hint>
    </hints>
   </connection>
@@ -196,11 +223,11 @@
    <hints>
     <hint type="sourcelabel">
      <x>82</x>
-     <y>121</y>
+     <y>70</y>
     </hint>
     <hint type="destinationlabel">
      <x>88</x>
-     <y>191</y>
+     <y>129</y>
     </hint>
    </hints>
   </connection>
@@ -212,11 +239,43 @@
    <hints>
     <hint type="sourcelabel">
      <x>73</x>
-     <y>141</y>
+     <y>90</y>
     </hint>
     <hint type="destinationlabel">
      <x>137</x>
-     <y>191</y>
+     <y>129</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>mCheckBoxUseBG</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>mBGSlider</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>79</x>
+     <y>203</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>202</x>
+     <y>204</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>mCheckBoxUseFG</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>mFGSlider</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>63</x>
+     <y>177</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>242</x>
+     <y>177</y>
     </hint>
    </hints>
   </connection>

diff --git a/vv/vv.cxx b/vv/vv.cxx
index fde6e992627cdebfa2759319011039ae57c13a44..908429574b8ee4e05123a1b41179153aaa9d32c0 100644 (file)
--- a/vv/vv.cxx
+++ b/vv/vv.cxx
@@ -34,10 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "vvInit.h"
 #include "vvConstants.h"
 
-//------------------------------------------------------------------------------
-// (*NEEDED HERE*) Static instances initialization for ToolManager
-TOOL_MANAGER_INITIALIZATION;
-
 //------------------------------------------------------------------------------
 int main( int argc, char** argv )
 {

diff --git a/vv/vvToolBinarize.cxx b/vv/vvToolBinarize.cxx
index 05af4958d9002f3d2ba3f78c034e65a0e38e6669..22b356d3e014ef7f24a08a77b6cd52b2d4fe20b7 100644 (file)
--- a/vv/vvToolBinarize.cxx
+++ b/vv/vvToolBinarize.cxx
@@ -3,8 +3,8 @@
   Program:   vv
   Module:    $RCSfile: vvToolBinarize.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/02/01 15:54:25 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2010/02/03 10:54:08 $
+  Version:   $Revision: 1.3 $
   Author :   David Sarrut (david.sarrut@creatis.insa-lyon.fr)
 
   Copyright (C) 2008
@@ -269,14 +269,20 @@ void vvToolBinarize::GetArgsInfoFromGUI() {
 
   mArgsInfo.fg_arg = mFGSlider->GetValue();
   mArgsInfo.bg_arg = mBGSlider->GetValue();
+
+  DD(inverseBGandFG);
   if (inverseBGandFG) {
-    mArgsInfo.fg_arg = mBGSlider->GetValue();
-    mArgsInfo.bg_arg = mFGSlider->GetValue();
+    mArgsInfo.fg_arg = mFGSlider->GetValue();
+    mArgsInfo.bg_arg = mBGSlider->GetValue();
   }
   mArgsInfo.fg_given = 1;
   mArgsInfo.bg_given = 1;
 
-  mArgsInfo.setBG_flag = true;
+  mArgsInfo.useBG_flag = mCheckBoxUseBG->isChecked();
+  mArgsInfo.useFG_flag = mCheckBoxUseFG->isChecked();
+
+  DD(mArgsInfo.useBG_flag);
+  DD(mArgsInfo.useFG_flag);
 
   mArgsInfo.verbose_flag = true;
 

diff --git a/vv/vvToolManager.cxx b/vv/vvToolManager.cxx
index 0a80a4783fae56c9262c43e3f2ec31d53dcf08df..e66fa065e9428952f6f43cc9c9357ad4f1287c9d 100644 (file)
--- a/vv/vvToolManager.cxx
+++ b/vv/vvToolManager.cxx
@@ -3,8 +3,8 @@
   Program:   vv
   Module:    $RCSfile: vvToolManager.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/01/29 13:54:37 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2010/02/03 10:54:08 $
+  Version:   $Revision: 1.2 $
   Author :   David Sarrut (david.sarrut@creatis.insa-lyon.fr)
 
   Copyright (C) 2008
@@ -28,6 +28,8 @@
 #include "vvToolManager.h"
 #include "vvMainWindow.h"
 
+vvToolManager* vvToolManager::mSingleton=0; 
+
 //------------------------------------------------------------------------------
 vvToolManager * vvToolManager::GetInstance() {
   if (mSingleton == 0) {
@@ -41,15 +43,15 @@ vvToolManager * vvToolManager::GetInstance() {
 //------------------------------------------------------------------------------
 void vvToolManager::AddTool(vvToolCreatorBase * v)  {
   std::cout << "Adding the tool <" << v->mToolName.toStdString() << ">." << std::endl;
-  mListOfTools.push_back(v);
+  GetInstance()->mListOfTools.push_back(v);
 }  
 //------------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------------
 void vvToolManager::Initialize(vvMainWindow * m) {
-  for(unsigned int i=0; i<mListOfTools.size(); i++) {
-    mListOfTools[i]->Initialize(m);
+  for(unsigned int i=0; i<GetInstance()->mListOfTools.size(); i++) {
+    GetInstance()->mListOfTools[i]->Initialize(m);
   }
 }
 //------------------------------------------------------------------------------
@@ -57,8 +59,8 @@ void vvToolManager::Initialize(vvMainWindow * m) {
 
 //------------------------------------------------------------------------------
 void vvToolManager::UpdateEnabledTool() {
-  for(unsigned int i=0; i<mListOfTools.size(); i++) {
-    mListOfTools[i]->UpdateEnabledTool();
+  for(unsigned int i=0; i<GetInstance()->mListOfTools.size(); i++) {
+    GetInstance()->mListOfTools[i]->UpdateEnabledTool();
   }
 }
 //------------------------------------------------------------------------------

diff --git a/vv/vvToolManager.h b/vv/vvToolManager.h
index afd5936a484319702103ca5c04b3a958bf8749a8..8d8c1da9a50bf05812044520bf783ee9b5901e08 100644 (file)
--- a/vv/vvToolManager.h
+++ b/vv/vvToolManager.h
@@ -3,8 +3,8 @@
   Program:   vv
   Module:    $RCSfile: vvToolManager.h,v $
   Language:  C++
-  Date:      $Date: 2010/01/29 13:54:37 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2010/02/03 10:54:08 $
+  Version:   $Revision: 1.2 $
   Author :   David Sarrut (david.sarrut@creatis.insa-lyon.fr)
 
   Copyright (C) 2008
@@ -47,18 +47,10 @@ public:
   static void Initialize(vvMainWindow * m);
   static void UpdateEnabledTool();
   // Variables
-  static std::vector<vvToolCreatorBase *> mListOfTools;
+   std::vector<vvToolCreatorBase *> mListOfTools;
   static vvToolManager * mSingleton;
 };
 //------------------------------------------------------------------------------
 
-//------------------------------------------------------------------------------
-// Static instances initialization (to put in main)
-#define TOOL_MANAGER_INITIALIZATION                                     \
-  vvToolManager* vvToolManager::mSingleton=0;                           \
-  std::vector<vvToolCreatorBase *> vvToolManager::mListOfTools;
-//------------------------------------------------------------------------------
-
-
 #endif