X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolBinarize.cxx;h=42154e3e27bffce3c9b76d06cb4c9abc4db69ed6;hb=34490f432219fe05c7ae19c4cf012b5529d784dc;hp=d8fb488a0235e5292b2d2edfd2e953ee39067bfd;hpb=26bbfd8756d07eb73acbfe2fcfd77b3a4f3b52a9;p=clitk.git diff --git a/vv/vvToolBinarize.cxx b/vv/vvToolBinarize.cxx index d8fb488..42154e3 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/07 12:00:59 $ - Version: $Revision: 1.7 $ + Date: $Date: 2010/03/24 10:48:18 $ + Version: $Revision: 1.13 $ Author : David Sarrut (david.sarrut@creatis.insa-lyon.fr) Copyright (C) 2008 @@ -44,32 +44,30 @@ ADD_TOOL(vvToolBinarize); //------------------------------------------------------------------------------ -vvToolBinarize::vvToolBinarize(QWidget * parent, Qt::WindowFlags f) - :QDialog(parent,f), vvToolBase(), Ui::vvToolBinarize() -{ - // Set Modality : dialog is not modal but stay always on top because - // parent is set at construction - setModal(false); - setAttribute(Qt::WA_DeleteOnClose); +void vvToolBinarize::Initialize() { + SetToolName("Binarize"); + SetToolMenuName("Binarize"); + SetToolIconFilename(":/new/prefix1/icons/binarize.png"); + SetToolTip("Image interactive binarization with thresholds."); +} +//------------------------------------------------------------------------------ + +//------------------------------------------------------------------------------ +vvToolBinarize::vvToolBinarize(vvMainWindowBase * parent, Qt::WindowFlags f) + :vvToolWidgetBase(parent,f), + vvToolBase(parent), + Ui::vvToolBinarize() +{ // GUI Initialization - setupUi(this); + Ui_vvToolBinarize::setupUi(mToolWidget); + mInteractiveDisplayIsEnabled = mCheckBoxInteractiveDisplay->isChecked(); // Connect signals & slots - connect(mToolInputSelectionWidget, SIGNAL(accepted()), this, SLOT(InputIsSelected())); - connect(mToolInputSelectionWidget, SIGNAL(rejected()), this, SLOT(close())); - connect(buttonBox, SIGNAL(accepted()), this, SLOT(apply())); - connect(buttonBox, SIGNAL(rejected()), this, SLOT(close())); - 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))); - - // VTK objects - //mImageContour = new vvImageContour; - - //new vector of contours + connect(mCheckBoxInteractiveDisplay, SIGNAL(toggled(bool)), this, SLOT(InteractiveDisplayToggled(bool))); // Initialize some widget mThresholdSlider1->SetText(""); @@ -77,21 +75,65 @@ vvToolBinarize::vvToolBinarize(QWidget * parent, Qt::WindowFlags f) mFGSlider->SetText("Foreground value"); mBGSlider->SetText("Background value"); - // Disable main widget while input image is not selected - toolMainWidget->setEnabled(false); - // Main filter - mFilter = new clitk::BinarizeImageGenericFilter; //DS PUT IN BASECLASS ? + mFilter = new clitk::BinarizeImageGenericFilter; - // Initialize the input selection (mFilter should be create before !) - InitializeListOfInputImages(mToolInputSelectionWidget, mFilter); + // Set how many inputs are needed for this tool + AddInputSelector("Select one image", mFilter); } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ vvToolBinarize::~vvToolBinarize() { - //delete mImageContour; +} +//------------------------------------------------------------------------------ + + +//------------------------------------------------------------------------------ +void vvToolBinarize::InteractiveDisplayToggled(bool b) { + mInteractiveDisplayIsEnabled = b; + if (!mInteractiveDisplayIsEnabled) { + RemoveVTKObjects(); + } + else { + for(unsigned int i=0; ishowActors(); + if (mRadioButtonLowerThan->isChecked()) + mImageContourLower[i]->showActors(); + } + if (mCurrentSlicerManager) + mCurrentSlicerManager->Render(); + } +} +//------------------------------------------------------------------------------ + + +//------------------------------------------------------------------------------ +void vvToolBinarize::RemoveVTKObjects() { + for(unsigned int i=0; ihideActors(); + mImageContourLower[i]->hideActors(); + } + if (mCurrentSlicerManager) + mCurrentSlicerManager->Render(); +} +//------------------------------------------------------------------------------ + + +//------------------------------------------------------------------------------ +bool vvToolBinarize::close() { + RemoveVTKObjects(); + return vvToolWidgetBase::close(); +} +//------------------------------------------------------------------------------ + + +//------------------------------------------------------------------------------ +void vvToolBinarize::reject() { + // DD("vvToolBinarize::reject"); + RemoveVTKObjects(); + return vvToolWidgetBase::reject(); } //------------------------------------------------------------------------------ @@ -100,9 +142,18 @@ vvToolBinarize::~vvToolBinarize() { void vvToolBinarize::enableLowerThan(bool b) { if (!b) { mThresholdSlider1->resetMaximum(); + for(unsigned int i=0; ihideActors(); + } + mCurrentSlicerManager->Render(); } else { valueChangedT1(mThresholdSlider1->GetValue()); + valueChangedT2(mThresholdSlider2->GetValue()); + for(unsigned int i=0; ishowActors(); + } + mCurrentSlicerManager->Render(); } } //------------------------------------------------------------------------------ @@ -117,13 +168,12 @@ void vvToolBinarize::useFGBGtoggled(bool) { //------------------------------------------------------------------------------ -void vvToolBinarize::InputIsSelected() { - - // Common - int index = mToolInputSelectionWidget->GetSelectedInputIndex(); - mCurrentSliceManager = mSlicerManagersCompatible[index]; - mCurrentImage = mCurrentSliceManager->GetImage(); - toolMainWidget->setEnabled(true); +// void vvToolBinarize::InputIsSelected(std::vector & m) { +// DD("vvToolBinarize::InputIsSelected vector in binarize"); +// DD(m.size()); +// } +void vvToolBinarize::InputIsSelected(vvSlicerManager * m) { + mCurrentSlicerManager = m; // Specific for this gui mThresholdSlider1->SetValue(0); @@ -132,22 +182,32 @@ void vvToolBinarize::InputIsSelected() { mThresholdSlider2->SetImage(mCurrentImage); mFGSlider->SetImage(mCurrentImage); mBGSlider->SetImage(mCurrentImage); - DD(mCurrentSliceManager->GetFileName().c_str()); + // DD(mCurrentSlicerManager->GetFileName().c_str()); mFGSlider->SetMaximum(mCurrentImage->GetFirstVTKImageData()->GetScalarTypeMax()); mFGSlider->SetMinimum(mCurrentImage->GetFirstVTKImageData()->GetScalarTypeMin()); mBGSlider->SetMaximum(mCurrentImage->GetFirstVTKImageData()->GetScalarTypeMax()); 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;iNumberOfSlicers(); i++) { + for(int i=0;iNumberOfSlicers(); i++) { mImageContour.push_back(new vvImageContour); - mImageContour[i]->setSlicer(mCurrentSliceManager->GetSlicer(i)); + 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(mCurrentSliceManager,SIGNAL(UpdateSlice(int,int)),this,SLOT(UpdateSlice(int, int))); - connect(mCurrentSliceManager,SIGNAL(UpdateTSlice(int,int)),this,SLOT(UpdateSlice(int, int))); + + 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))); } //------------------------------------------------------------------------------ @@ -155,11 +215,15 @@ void vvToolBinarize::InputIsSelected() { //------------------------------------------------------------------------------ void vvToolBinarize::UpdateSlice(int slicer,int slices) { - DD(slicer); - for(int i=0;iNumberOfSlicers(); i++) { + if (!mInteractiveDisplayIsEnabled) return; + if (!mCurrentSlicerManager) close(); + for(int i=0;iNumberOfSlicers(); i++) { mImageContour[i]->update(mThresholdSlider1->GetValue()); + if (mRadioButtonLowerThan->isChecked()) + mImageContourLower[i]->update(mThresholdSlider2->GetValue()); + } - mCurrentSliceManager->Render(); + mCurrentSlicerManager->Render(); } //------------------------------------------------------------------------------ @@ -177,13 +241,14 @@ void vvToolBinarize::GetArgsInfoFromGUI() { DD(good); */ + mArgsInfo.imagetypes_flag = 0; mArgsInfo.upper_given = 0; mArgsInfo.lower_given = 0; bool inverseBGandFG = false; mArgsInfo.lower_given = 1; mArgsInfo.lower_arg = mThresholdSlider1->GetValue(); - DD(mArgsInfo.lower_arg); + // DD(mArgsInfo.lower_arg); if (mRadioButtonLowerThan->isChecked()) { mArgsInfo.upper_given = 1; mArgsInfo.upper_arg = mThresholdSlider2->GetValue(); @@ -196,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(); @@ -210,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; @@ -224,20 +288,24 @@ void vvToolBinarize::GetArgsInfoFromGUI() { //------------------------------------------------------------------------------ void vvToolBinarize::apply() { + if (!mCurrentSlicerManager) close(); + QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); GetArgsInfoFromGUI(); // Main filter clitk::BinarizeImageGenericFilter::Pointer filter = - clitk::BinarizeImageGenericFilter::New(); - filter->SetArgsInfo(mArgsInfo); + clitk::BinarizeImageGenericFilter::New(); filter->SetInputVVImage(mCurrentImage); + filter->SetArgsInfo(mArgsInfo); + filter->EnableReadOnDisk(false); filter->Update(); - // Output ??? + // Output vvImage::Pointer output = filter->GetOutputVVImage(); std::ostringstream osstream; - osstream << "Binarized_" << mCurrentSliceManager->GetSlicer(0)->GetFileName(); - CREATOR(vvToolBinarize)->mMainWindow->AddImage(output,osstream.str()); + osstream << "Binarized_" << mCurrentSlicerManager->GetSlicer(0)->GetFileName() << ".mhd"; + AddImage(output,osstream.str()); + QApplication::restoreOverrideCursor(); close(); } //------------------------------------------------------------------------------ @@ -245,19 +313,29 @@ 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;iNumberOfSlicers(); i++) { + mImageContourLower[i]->update(v); + } + mCurrentSlicerManager->Render(); + } } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ void vvToolBinarize::valueChangedT1(double v) { + // DD("valueChangedT1"); + if (!mCurrentSlicerManager) close(); mThresholdSlider2->SetMinimum(v); - int m1 = (int)lrint(v); - - for(int i=0;iNumberOfSlicers(); i++) { - mImageContour[i]->update(m1); + // int m1 = (int)lrint(v); + if (!mInteractiveDisplayIsEnabled) return; + for(int i=0;iNumberOfSlicers(); i++) { + mImageContour[i]->update(v); } - mCurrentSliceManager->Render(); + mCurrentSlicerManager->Render(); } //------------------------------------------------------------------------------