X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolBinarize.cxx;h=343350ce2731a40dcf2c95ecabfbeff21c2566ea;hb=ea61e98aed4316bda8b156aea5980b08eaf4302b;hp=bccf02151d761b807c9240d93e4fb2a19f8873e4;hpb=0a85e47a06c7d046d06a4645b724c4e81b19998d;p=clitk.git

diff --git a/vv/vvToolBinarize.cxx b/vv/vvToolBinarize.cxx
index bccf021..343350c 100644
--- 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/24 11:42:42 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2010/03/17 11:22:18 $
+  Version:   $Revision: 1.12 $
   Author :   David Sarrut (david.sarrut@creatis.insa-lyon.fr)
 
   Copyright (C) 2008
@@ -61,13 +61,13 @@ vvToolBinarize::vvToolBinarize(vvMainWindowBase * parent, Qt::WindowFlags f)
 {
   // GUI Initialization
   Ui_vvToolBinarize::setupUi(mToolWidget);
+  mInteractiveDisplayIsEnabled = mCheckBoxInteractiveDisplay->isChecked();
 
   // Connect signals & slots  
-  connect(mThresholdSlider1, SIGNAL(valueChanged(double)), this, SLOT(valueChangedT1(double)));
-  connect(mThresholdSlider2, SIGNAL(valueChanged(double)), this, SLOT(valueChangedT2(double)));
   connect(mRadioButtonLowerThan, SIGNAL(toggled(bool)), this, SLOT(enableLowerThan(bool)));
   connect(mCheckBoxUseFG, SIGNAL(toggled(bool)), this, SLOT(useFGBGtoggled(bool)));
   connect(mCheckBoxUseBG, SIGNAL(toggled(bool)), this, SLOT(useFGBGtoggled(bool)));
+  connect(mCheckBoxInteractiveDisplay, SIGNAL(toggled(bool)), this, SLOT(InteractiveDisplayToggled(bool)));
 
   // Initialize some widget
   mThresholdSlider1->SetText("");
@@ -76,7 +76,10 @@ vvToolBinarize::vvToolBinarize(vvMainWindowBase * parent, Qt::WindowFlags f)
   mBGSlider->SetText("Background value");
 
   // Main filter 
-  mFilter = new clitk::BinarizeImageGenericFilter<args_info_clitkBinarizeImage>; //DS PUT IN BASECLASS ?
+  mFilter = new clitk::BinarizeImageGenericFilter<args_info_clitkBinarizeImage>;
+
+  // Set how many inputs are needed for this tool
+  AddInputSelector(mFilter);
 }
 //------------------------------------------------------------------------------
 
@@ -87,13 +90,70 @@ vvToolBinarize::~vvToolBinarize() {
 //------------------------------------------------------------------------------
 
 
+//------------------------------------------------------------------------------
+void vvToolBinarize::InteractiveDisplayToggled(bool b) {
+  mInteractiveDisplayIsEnabled = b;
+  if (!mInteractiveDisplayIsEnabled) {
+    RemoveVTKObjects();
+  }
+  else {
+    for(unsigned int i=0; i<mImageContour.size(); i++) {
+      mImageContour[i]->showActors();
+      if (mRadioButtonLowerThan->isChecked())
+        mImageContourLower[i]->showActors();
+    }
+    if (mCurrentSlicerManager)
+      mCurrentSlicerManager->Render();
+  }
+}
+//------------------------------------------------------------------------------
+
+
+//------------------------------------------------------------------------------
+void vvToolBinarize::RemoveVTKObjects() { 
+  for(unsigned int i=0; i<mImageContour.size(); i++) {
+    mImageContour[i]->hideActors();
+    mImageContourLower[i]->hideActors();    
+  }
+  if (mCurrentSlicerManager)
+    mCurrentSlicerManager->Render();
+}
+//------------------------------------------------------------------------------
+
+
+//------------------------------------------------------------------------------
+bool vvToolBinarize::close() { 
+  RemoveVTKObjects();
+  return vvToolWidgetBase::close(); 
+}
+//------------------------------------------------------------------------------
+
+
+//------------------------------------------------------------------------------
+void vvToolBinarize::reject() { 
+  DD("vvToolBinarize::reject");
+  RemoveVTKObjects();
+  return vvToolWidgetBase::reject(); 
+}
+//------------------------------------------------------------------------------
+
+
 //------------------------------------------------------------------------------
 void vvToolBinarize::enableLowerThan(bool b) {
   if (!b) {
     mThresholdSlider1->resetMaximum();
+    for(unsigned int i=0; i<mImageContour.size(); i++) {
+      mImageContourLower[i]->hideActors();    
+    }
+    mCurrentSlicerManager->Render();
   }
   else {
     valueChangedT1(mThresholdSlider1->GetValue());
+    valueChangedT2(mThresholdSlider2->GetValue());
+    for(unsigned int i=0; i<mImageContour.size(); i++) {
+      mImageContourLower[i]->showActors();    
+    }
+    mCurrentSlicerManager->Render();
   }
 }
 //------------------------------------------------------------------------------
@@ -108,10 +168,12 @@ void vvToolBinarize::useFGBGtoggled(bool) {
 
 
 //------------------------------------------------------------------------------
+// void vvToolBinarize::InputIsSelected(std::vector<vvSlicerManager *> & m) {
+//   DD("vvToolBinarize::InputIsSelected vector in binarize");
+//   DD(m.size());
+// }
 void vvToolBinarize::InputIsSelected(vvSlicerManager * m) {
   mCurrentSlicerManager = m;
-  // Common
-  mCurrentImage = mCurrentSlicerManager->GetImage();
 
   // Specific for this gui
   mThresholdSlider1->SetValue(0);
@@ -127,13 +189,23 @@ void vvToolBinarize::InputIsSelected(vvSlicerManager * m) {
   mBGSlider->SetMinimum(mCurrentImage->GetFirstVTKImageData()->GetScalarTypeMin());
   mFGSlider->SetValue(1);
   mBGSlider->SetValue(0);
+  mFGSlider->SetSingleStep(1);
+  mBGSlider->SetSingleStep(1);
   
   // VTK objects for interactive display
   for(int i=0;i<mCurrentSlicerManager->NumberOfSlicers(); i++) {
     mImageContour.push_back(new vvImageContour);
     mImageContour[i]->setSlicer(mCurrentSlicerManager->GetSlicer(i));
+    mImageContour[i]->setColor(1.0, 0.0, 0.0);
+    mImageContourLower.push_back(new vvImageContour);
+    mImageContourLower[i]->setSlicer(mCurrentSlicerManager->GetSlicer(i));
+    mImageContourLower[i]->setColor(0.0, 0.0, 1.0);
   }
   valueChangedT1(mThresholdSlider1->GetValue());
+
+  connect(mThresholdSlider1, SIGNAL(valueChanged(double)), this, SLOT(valueChangedT1(double)));
+  connect(mThresholdSlider2, SIGNAL(valueChanged(double)), this, SLOT(valueChangedT2(double)));
+
   connect(mCurrentSlicerManager,SIGNAL(UpdateSlice(int,int)),this,SLOT(UpdateSlice(int, int)));
   connect(mCurrentSlicerManager,SIGNAL(UpdateTSlice(int,int)),this,SLOT(UpdateSlice(int, int)));
 
@@ -143,9 +215,13 @@ void vvToolBinarize::InputIsSelected(vvSlicerManager * m) {
 
 //------------------------------------------------------------------------------
 void vvToolBinarize::UpdateSlice(int slicer,int slices) {
+  if (!mInteractiveDisplayIsEnabled) return;
   if (!mCurrentSlicerManager) close();
   for(int i=0;i<mCurrentSlicerManager->NumberOfSlicers(); i++) {
     mImageContour[i]->update(mThresholdSlider1->GetValue());
+    if (mRadioButtonLowerThan->isChecked()) 
+      mImageContourLower[i]->update(mThresholdSlider2->GetValue());
+
   }
   mCurrentSlicerManager->Render(); 
 }
@@ -165,6 +241,7 @@ void vvToolBinarize::GetArgsInfoFromGUI() {
   DD(good);
   */
 
+  mArgsInfo.imagetypes_flag = 0;
   mArgsInfo.upper_given = 0;
   mArgsInfo.lower_given = 0;
   bool inverseBGandFG = false;
@@ -184,7 +261,6 @@ void vvToolBinarize::GetArgsInfoFromGUI() {
   mArgsInfo.fg_arg = mFGSlider->GetValue();
   mArgsInfo.bg_arg = mBGSlider->GetValue();
 
-  // DD(inverseBGandFG);
   if (inverseBGandFG) {
     mArgsInfo.fg_arg = mFGSlider->GetValue();
     mArgsInfo.bg_arg = mBGSlider->GetValue();
@@ -198,7 +274,7 @@ void vvToolBinarize::GetArgsInfoFromGUI() {
   }
   else mArgsInfo.mode_arg = (char*)"FG";
 
-  mArgsInfo.verbose_flag = true;
+  mArgsInfo.verbose_flag = false;
 
   // Required (even if not used)
   mArgsInfo.input_given = 0;
@@ -213,20 +289,22 @@ void vvToolBinarize::GetArgsInfoFromGUI() {
 //------------------------------------------------------------------------------
 void vvToolBinarize::apply() {
   if (!mCurrentSlicerManager) close();
+  QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
   GetArgsInfoFromGUI();
 
   // Main filter
   clitk::BinarizeImageGenericFilter<args_info_clitkBinarizeImage>::Pointer filter = 
-    clitk::BinarizeImageGenericFilter<args_info_clitkBinarizeImage>::New();
+     clitk::BinarizeImageGenericFilter<args_info_clitkBinarizeImage>::New();
   filter->SetArgsInfo(mArgsInfo);
   filter->SetInputVVImage(mCurrentImage);
   filter->Update();
 
-  // Output ???
+  // Output
   vvImage::Pointer output = filter->GetOutputVVImage();
   std::ostringstream osstream;
-  osstream << "Binarized_" << mCurrentSlicerManager->GetSlicer(0)->GetFileName();
-  CREATOR(vvToolBinarize)->GetMainWindow()->AddImage(output,osstream.str()); 
+  osstream << "Binarized_" << mCurrentSlicerManager->GetSlicer(0)->GetFileName() << ".mhd";
+  AddImage(output,osstream.str()); 
+  QApplication::restoreOverrideCursor();
   close();
 }
 //------------------------------------------------------------------------------
@@ -234,21 +312,28 @@ void vvToolBinarize::apply() {
 
 //------------------------------------------------------------------------------
 void vvToolBinarize::valueChangedT2(double v) {
-  if (mRadioButtonLowerThan->isChecked()) mThresholdSlider1->SetMaximum(v);
+  //  DD("valueChangedT2");
+  if (mRadioButtonLowerThan->isChecked()) {
+    mThresholdSlider1->SetMaximum(v);
+    if (!mInteractiveDisplayIsEnabled) return;
+    for(int i=0;i<mCurrentSlicerManager->NumberOfSlicers(); i++) {
+      mImageContourLower[i]->update(v);
+    }
+    mCurrentSlicerManager->Render();
+  }
 }
 //------------------------------------------------------------------------------
 
 
 //------------------------------------------------------------------------------
 void vvToolBinarize::valueChangedT1(double v) {
-  // DD(v);
+  //  DD("valueChangedT1");
   if (!mCurrentSlicerManager) close();
-//   DD(mCurrentSlicerManager->GetSlicer(0));
   mThresholdSlider2->SetMinimum(v);
-  int m1 = (int)lrint(v);
-
+  //  int m1 = (int)lrint(v);  
+  if (!mInteractiveDisplayIsEnabled) return;
   for(int i=0;i<mCurrentSlicerManager->NumberOfSlicers(); i++) {
-    mImageContour[i]->update(m1);
+    mImageContour[i]->update(v);
   }
   mCurrentSlicerManager->Render();
 }