X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvToolImageArithm.cxx;h=f4eb0436904621632cdfae1919eaea3c6002b9a8;hb=ff1d5b8af965e75ecdbc1b0cbff0dad6f3b3c511;hp=897e3d661a5f2aa28b581b6415037f810a8c1caf;hpb=44afe6c93f185da1ac0debc227105bf56404482e;p=clitk.git diff --git a/vv/vvToolImageArithm.cxx b/vv/vvToolImageArithm.cxx index 897e3d6..f4eb043 100644 --- a/vv/vvToolImageArithm.cxx +++ b/vv/vvToolImageArithm.cxx @@ -82,7 +82,6 @@ void vvToolImageArithm::InputIsSelected(vvSlicerManager * l) { mInput1 = l; mTwoInputs = false; - // DD("Single input"); mGroupBoxTwoInputs->setEnabled(false); mGroupBoxOneInput->setEnabled(true); } @@ -92,7 +91,6 @@ void vvToolImageArithm::InputIsSelected(vvSlicerManager * l) //------------------------------------------------------------------------------ void vvToolImageArithm::GetArgsInfoFromGUI() { - // DD("GetArgsInfoFromGUI"); mArgsInfo.input1_given = false; if (mTwoInputs) { mArgsInfo.input2_given = true; @@ -148,14 +146,22 @@ void vvToolImageArithm::apply() std::cerr << "Input1 = " << inputs[0]->GetScalarTypeAsITKString() << std::endl; std::cerr << "Input2 = " << inputs[1]->GetScalarTypeAsITKString() << std::endl; QApplication::restoreOverrideCursor(); - QMessageBox::information(this, "Wrong image type","Sorry, could not perform operation. Please select inputs with same pixe type."); + QMessageBox::information(this, "Wrong image type","Sorry, could not perform operation. Please select inputs with same pixel type."); + close(); + return; + } + + // Check size + if (!mInput1->GetImage()->HaveSameSizeAndSpacingThan(mInput2->GetImage())) { + std::cerr << "Sorry inputs should have the same size and spacing." << std::endl; + QApplication::restoreOverrideCursor(); + QMessageBox::information(this, "Wrong images size","Sorry, could not perform operation. Please select inputs with same size and spacing."); close(); return; } } else { // Input inputs.push_back(mInput1->GetImage()); - DD("Single input"); } // Main filter