X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolBinarize.cxx;h=fa22daad122e54bb2337d1feb1700f40bbd152e0;hb=b2b8c52b0db448b1ca2286b07c548be05466da0e;hp=6821ba2b4deb88590b5ef6ed49bcdb514334e6e1;hpb=1e034c70105f0926939acaaa27ddb46e904ae8bf;p=clitk.git diff --git a/vv/vvToolBinarize.cxx b/vv/vvToolBinarize.cxx index 6821ba2..fa22daa 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,15 +14,18 @@ - 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 @@ -69,7 +72,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); @@ -92,9 +95,9 @@ void vvToolBinarize::InteractiveDisplayToggled(bool b) RemoveVTKObjects(); } else { for(unsigned int i=0; ishowActors(); + mImageContour[i]->ShowActors(); if (mRadioButtonLowerThan->isChecked()) - mImageContourLower[i]->showActors(); + mImageContourLower[i]->ShowActors(); } if (mCurrentSlicerManager) mCurrentSlicerManager->Render(); @@ -107,8 +110,8 @@ void vvToolBinarize::InteractiveDisplayToggled(bool b) void vvToolBinarize::RemoveVTKObjects() { for(unsigned int i=0; ihideActors(); - mImageContourLower[i]->hideActors(); + mImageContour[i]->HideActors(); + mImageContourLower[i]->HideActors(); } if (mCurrentSlicerManager) mCurrentSlicerManager->Render(); @@ -119,12 +122,20 @@ void vvToolBinarize::RemoveVTKObjects() //------------------------------------------------------------------------------ bool vvToolBinarize::close() { - RemoveVTKObjects(); + // RemoveVTKObjects(); return vvToolWidgetBase::close(); } //------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ +void vvToolBinarize::closeEvent(QCloseEvent *event) { + RemoveVTKObjects(); + event->accept(); +} +//------------------------------------------------------------------------------ + + //------------------------------------------------------------------------------ void vvToolBinarize::reject() { @@ -141,14 +152,14 @@ void vvToolBinarize::enableLowerThan(bool b) if (!b) { mThresholdSlider1->resetMaximum(); for(unsigned int i=0; ihideActors(); + mImageContourLower[i]->HideActors(); } mCurrentSlicerManager->Render(); } else { valueChangedT1(mThresholdSlider1->GetValue()); valueChangedT2(mThresholdSlider2->GetValue()); for(unsigned int i=0; ishowActors(); + mImageContourLower[i]->ShowActors(); } mCurrentSlicerManager->Render(); } @@ -182,10 +193,10 @@ void vvToolBinarize::InputIsSelected(vvSlicerManager * m) mFGSlider->SetImage(mCurrentImage); mBGSlider->SetImage(mCurrentImage); // 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->SetMaximum(mCurrentImage->GetFirstVTKImageData()->GetScalarTypeMax()); + // mFGSlider->SetMinimum(mCurrentImage->GetFirstVTKImageData()->GetScalarTypeMin()); + // mBGSlider->SetMaximum(mCurrentImage->GetFirstVTKImageData()->GetScalarTypeMax()); + // mBGSlider->SetMinimum(mCurrentImage->GetFirstVTKImageData()->GetScalarTypeMin()); // Output is uchar ... mFGSlider->SetMaximum(255); @@ -199,13 +210,13 @@ void vvToolBinarize::InputIsSelected(vvSlicerManager * m) mBGSlider->SetSingleStep(1); // VTK objects for interactive display - for(int i=0; iNumberOfSlicers(); 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); + 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(vvImageContour::New()); + mImageContourLower[i]->SetSlicer(mCurrentSlicerManager->GetSlicer(i)); + mImageContourLower[i]->SetColor(0.0, 0.0, 1.0); } valueChangedT1(mThresholdSlider1->GetValue()); @@ -214,8 +225,12 @@ void vvToolBinarize::InputIsSelected(vvSlicerManager * m) 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(UpdateOrientation(int,int)),this,SLOT(UpdateOrientation(int, int))); // connect(mCurrentSlicerManager, SIGNAL(LeftButtonReleaseSignal(int)), SLOT(LeftButtonReleaseEvent(int))); + + InteractiveDisplayToggled(mInteractiveDisplayIsEnabled); } //------------------------------------------------------------------------------ @@ -223,7 +238,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(); // } @@ -231,42 +246,50 @@ void vvToolBinarize::InputIsSelected(vvSlicerManager * m) //------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ +void vvToolBinarize::UpdateOrientation(int slicer,int orientation) +{ + Update(slicer); +} +//------------------------------------------------------------------------------ + //------------------------------------------------------------------------------ void vvToolBinarize::UpdateSlice(int slicer,int slices) +{ + 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(); + mImageContour[slicer]->Update(mThresholdSlider1->GetValue()); + if (mRadioButtonLowerThan->isChecked()) + mImageContourLower[slicer]->Update(mThresholdSlider2->GetValue()); } //------------------------------------------------------------------------------ - //------------------------------------------------------------------------------ void vvToolBinarize::GetArgsInfoFromGUI() { /* //KEEP THIS FOR READING GGO FROM FILE - int argc=1; - std::string a = "toto"; - char * const* argv = new char*; - //a.c_str(); - struct cmdline_parser_params p; - p.check_required = 0; - int good = cmdline_parser_ext(argc, argv, &args_info, &p); - DD(good); + int argc=1; + std::string a = "toto"; + char * const* argv = new char*; + //a.c_str(); + struct cmdline_parser_params p; + p.check_required = 0; + 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,12 +316,12 @@ 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; } //------------------------------------------------------------------------------ @@ -311,11 +334,10 @@ void vvToolBinarize::apply() 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 @@ -336,10 +358,10 @@ void vvToolBinarize::valueChangedT2(double v) if (mRadioButtonLowerThan->isChecked()) { mThresholdSlider1->SetMaximum(v); if (!mInteractiveDisplayIsEnabled) return; - for(int i=0; iNumberOfSlicers(); i++) { - mImageContourLower[i]->update(v); + for(int i=0;iGetNumberOfSlicers(); i++) { + mImageContourLower[i]->Update(v); } - // mCurrentSlicerManager->Render(); + mCurrentSlicerManager->Render(); } } //------------------------------------------------------------------------------ @@ -353,9 +375,9 @@ void vvToolBinarize::valueChangedT1(double v) mThresholdSlider2->SetMinimum(v); // int m1 = (int)lrint(v); if (!mInteractiveDisplayIsEnabled) return; - for(int i=0; iNumberOfSlicers(); i++) { - mImageContour[i]->update(v); + for(int i=0;iGetNumberOfSlicers(); i++) { + mImageContour[i]->Update(v); } - // mCurrentSlicerManager->Render(); + mCurrentSlicerManager->Render(); } //------------------------------------------------------------------------------