X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolBinarize.cxx;h=113cee85d6d1262410d54e0530edfb572129c9e8;hb=HEAD;hp=afd07b12069c6b5d01dc8a8ad985c6eaa2572d9a;hpb=0d2c2b622e94b353cef04e5bd39d9f8de7b0d6a7;p=clitk.git diff --git a/vv/vvToolBinarize.cxx b/vv/vvToolBinarize.cxx index afd07b1..113cee8 100644 --- a/vv/vvToolBinarize.cxx +++ b/vv/vvToolBinarize.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,20 +14,24 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html - ======================================================================-====*/ + ===========================================================================**/ +// vv #include "vvToolBinarize.h" #include "vvSlicerManager.h" #include "vvSlicer.h" #include "vvToolInputSelectorWidget.h" +// clitk #include "clitkBinarizeImageGenericFilter.h" +// vtk #include #include #include #include + //------------------------------------------------------------------------------ // Create the tool and automagically (I like this word) insert it in // the main window menu. @@ -37,7 +41,7 @@ ADD_TOOL(vvToolBinarize); //------------------------------------------------------------------------------ void vvToolBinarize::Initialize() -{ +{ SetToolName("Binarize"); SetToolMenuName("Binarize"); SetToolIconFilename(":/common/icons/binarize.png"); @@ -51,7 +55,7 @@ vvToolBinarize::vvToolBinarize(vvMainWindowBase * parent, Qt::WindowFlags f) :vvToolWidgetBase(parent,f), vvToolBase(parent), Ui::vvToolBinarize() -{ +{ // GUI Initialization Ui_vvToolBinarize::setupUi(mToolWidget); mInteractiveDisplayIsEnabled = mCheckBoxInteractiveDisplay->isChecked(); @@ -69,7 +73,7 @@ vvToolBinarize::vvToolBinarize(vvMainWindowBase * parent, Qt::WindowFlags f) mBGSlider->SetText("Background value"); // Main filter - mFilter = new clitk::BinarizeImageGenericFilter; + mFilter = clitk::BinarizeImageGenericFilter::New(); // Set how many inputs are needed for this tool AddInputSelector("Select one image", mFilter); @@ -79,14 +83,14 @@ vvToolBinarize::vvToolBinarize(vvMainWindowBase * parent, Qt::WindowFlags f) //------------------------------------------------------------------------------ vvToolBinarize::~vvToolBinarize() -{ +{ } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ void vvToolBinarize::InteractiveDisplayToggled(bool b) -{ +{ mInteractiveDisplayIsEnabled = b; if (!mInteractiveDisplayIsEnabled) { RemoveVTKObjects(); @@ -105,7 +109,7 @@ void vvToolBinarize::InteractiveDisplayToggled(bool b) //------------------------------------------------------------------------------ void vvToolBinarize::RemoveVTKObjects() -{ +{ for(unsigned int i=0; iHideActors(); mImageContourLower[i]->HideActors(); @@ -118,16 +122,25 @@ void vvToolBinarize::RemoveVTKObjects() //------------------------------------------------------------------------------ bool vvToolBinarize::close() -{ - RemoveVTKObjects(); +{ + // RemoveVTKObjects(); return vvToolWidgetBase::close(); } //------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ +void vvToolBinarize::closeEvent(QCloseEvent *event) +{ + RemoveVTKObjects(); + event->accept(); +} +//------------------------------------------------------------------------------ + + //------------------------------------------------------------------------------ void vvToolBinarize::reject() -{ +{ // DD("vvToolBinarize::reject"); RemoveVTKObjects(); return vvToolWidgetBase::reject(); @@ -137,7 +150,7 @@ void vvToolBinarize::reject() //------------------------------------------------------------------------------ void vvToolBinarize::enableLowerThan(bool b) -{ +{ if (!b) { mThresholdSlider1->resetMaximum(); for(unsigned int i=0; iisChecked() && !mCheckBoxUseFG->isChecked()) mCheckBoxUseBG->toggle(); } @@ -171,7 +184,7 @@ void vvToolBinarize::useFGBGtoggled(bool) // DD(m.size()); // } void vvToolBinarize::InputIsSelected(vvSlicerManager * m) -{ +{ mCurrentSlicerManager = m; // Specific for this gui @@ -199,13 +212,15 @@ void vvToolBinarize::InputIsSelected(vvSlicerManager * m) mBGSlider->SetSingleStep(1); // VTK objects for interactive display - for(int i=0; iNumberOfSlicers(); i++) { - mImageContour.push_back(new vvImageContour); + for(int i=0; iGetNumberOfSlicers(); i++) { + mImageContour.push_back(vvImageContour::New()); mImageContour[i]->SetSlicer(mCurrentSlicerManager->GetSlicer(i)); mImageContour[i]->SetColor(1.0, 0.0, 0.0); - mImageContourLower.push_back(new vvImageContour); + mImageContour[i]->SetDepth(0); // to be in front of (whe used with ROI tool) + mImageContourLower.push_back(vvImageContour::New()); mImageContourLower[i]->SetSlicer(mCurrentSlicerManager->GetSlicer(i)); mImageContourLower[i]->SetColor(0.0, 0.0, 1.0); + mImageContourLower[i]->SetDepth(100); // to be in front of (whe used with ROI tool) } valueChangedT1(mThresholdSlider1->GetValue()); @@ -213,9 +228,12 @@ void vvToolBinarize::InputIsSelected(vvSlicerManager * m) 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))); + connect(mCurrentSlicerManager,SIGNAL(UpdateTSlice(int,int, int)),this,SLOT(UpdateSlice(int, int, int))); + + connect(mCurrentSlicerManager,SIGNAL(UpdateOrientation(int,int)),this,SLOT(UpdateOrientation(int, int))); // connect(mCurrentSlicerManager, SIGNAL(LeftButtonReleaseSignal(int)), SLOT(LeftButtonReleaseEvent(int))); + InteractiveDisplayToggled(mInteractiveDisplayIsEnabled); } //------------------------------------------------------------------------------ @@ -223,7 +241,7 @@ void vvToolBinarize::InputIsSelected(vvSlicerManager * m) //------------------------------------------------------------------------------ // void vvToolBinarize::LeftButtonReleaseEvent(int slicer) { // DD("LeftButtonReleaseEvent"); -// for(int i=0; iNumberOfSlicers(); i++) { +// for(int i=0; iGetNumberOfSlicers(); i++) { // if (i == slicer); // mCurrentSlicerManager->GetSlicer(i)->GetRenderWindow()->Render(); // } @@ -232,21 +250,34 @@ void vvToolBinarize::InputIsSelected(vvSlicerManager * m) //------------------------------------------------------------------------------ -void vvToolBinarize::UpdateSlice(int slicer,int slices) -{ +void vvToolBinarize::UpdateOrientation(int slicer,int orientation) +{ + Update(slicer); +} +//------------------------------------------------------------------------------ + + +//------------------------------------------------------------------------------ +void vvToolBinarize::UpdateSlice(int slicer,int slices, int code) +{ + Update(slicer); +} +//------------------------------------------------------------------------------ + +//------------------------------------------------------------------------------ +void vvToolBinarize::Update(int slicer) +{ if (!mInteractiveDisplayIsEnabled) return; if (!mCurrentSlicerManager) close(); mImageContour[slicer]->Update(mThresholdSlider1->GetValue()); if (mRadioButtonLowerThan->isChecked()) mImageContourLower[slicer]->Update(mThresholdSlider2->GetValue()); - // mCurrentSlicerManager->GetSlicer(slicer)->Render(); } //------------------------------------------------------------------------------ - //------------------------------------------------------------------------------ void vvToolBinarize::GetArgsInfoFromGUI() -{ +{ /* //KEEP THIS FOR READING GGO FROM FILE int argc=1; @@ -258,15 +289,11 @@ void vvToolBinarize::GetArgsInfoFromGUI() int good = cmdline_parser_ext(argc, argv, &args_info, &p); DD(good); */ - - mArgsInfo.imagetypes_flag = 0; - mArgsInfo.upper_given = 0; - mArgsInfo.lower_given = 0; + cmdline_parser_clitkBinarizeImage_init(&mArgsInfo); // Initialisation to default bool inverseBGandFG = false; mArgsInfo.lower_given = 1; mArgsInfo.lower_arg = mThresholdSlider1->GetValue(); - // DD(mArgsInfo.lower_arg); if (mRadioButtonLowerThan->isChecked()) { mArgsInfo.upper_given = 1; mArgsInfo.upper_arg = mThresholdSlider2->GetValue(); @@ -293,33 +320,33 @@ void vvToolBinarize::GetArgsInfoFromGUI() mArgsInfo.verbose_flag = false; - // Required (even if not used) - mArgsInfo.input_given = 0; - mArgsInfo.output_given = 0; + // // Required (even if not used) + // mArgsInfo.input_given = 0; + // mArgsInfo.output_given = 0; - mArgsInfo.input_arg = new char; - mArgsInfo.output_arg = new char; + // mArgsInfo.input_arg = new char; + // mArgsInfo.output_arg = new char; } //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ void vvToolBinarize::apply() -{ +{ if (!mCurrentSlicerManager) close(); QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); - GetArgsInfoFromGUI(); - + GetArgsInfoFromGUI(); + // Main filter - clitk::BinarizeImageGenericFilter::Pointer filter = - clitk::BinarizeImageGenericFilter::New(); + clitk::BinarizeImageGenericFilter::Pointer filter = + clitk::BinarizeImageGenericFilter::New(); filter->SetInputVVImage(mCurrentImage); filter->SetArgsInfo(mArgsInfo); - filter->EnableReadOnDisk(false); filter->Update(); + // Output - vvImage::Pointer output = filter->GetOutputVVImage(); + vvImage::Pointer output = filter->GetOutputVVImage(); std::ostringstream osstream; osstream << "Binarized_" << mCurrentSlicerManager->GetSlicer(0)->GetFileName() << ".mhd"; AddImage(output,osstream.str()); @@ -331,15 +358,15 @@ void vvToolBinarize::apply() //------------------------------------------------------------------------------ void vvToolBinarize::valueChangedT2(double v) -{ +{ // DD("valueChangedT2"); if (mRadioButtonLowerThan->isChecked()) { mThresholdSlider1->SetMaximum(v); if (!mInteractiveDisplayIsEnabled) return; - for(int i=0;iNumberOfSlicers(); i++) { + for(int i=0;iGetNumberOfSlicers(); i++) { mImageContourLower[i]->Update(v); } - // mCurrentSlicerManager->Render(); + mCurrentSlicerManager->Render(); } } //------------------------------------------------------------------------------ @@ -347,15 +374,15 @@ void vvToolBinarize::valueChangedT2(double v) //------------------------------------------------------------------------------ void vvToolBinarize::valueChangedT1(double v) -{ +{ // DD("valueChangedT1"); if (!mCurrentSlicerManager) close(); mThresholdSlider2->SetMinimum(v); // int m1 = (int)lrint(v); if (!mInteractiveDisplayIsEnabled) return; - for(int i=0;iNumberOfSlicers(); i++) { + for(int i=0;iGetNumberOfSlicers(); i++) { mImageContour[i]->Update(v); } - // mCurrentSlicerManager->Render(); + mCurrentSlicerManager->Render(); } //------------------------------------------------------------------------------