From: trillos <trillos>
Date: Fri, 16 Oct 2009 14:35:35 +0000 (+0000)
Subject: Fixed Convolution & Substraction
X-Git-Tag: CREATOOLS.2-0-3~40
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaRigidRegistration.git;a=commitdiff_plain;h=343fd15a0c86653d593aba934648218ee84de72a

Fixed Convolution & Substraction
---

diff --git a/PackRecalage/src/bbPackRecalageImageConvolution.cxx b/PackRecalage/src/bbPackRecalageImageConvolution.cxx
index e57aedc..c37aa3d 100644
--- a/PackRecalage/src/bbPackRecalageImageConvolution.cxx
+++ b/PackRecalage/src/bbPackRecalageImageConvolution.cxx
@@ -11,6 +11,7 @@ void ImageConvolution::Process()
 	{
 		convolution->setImage(bbGetInputIn());
 		convolution->setFactor(bbGetInputFactor());
+		convolution->setOn(bbGetInputOn());
 		convolution->Run();
 		bbSetOutputOut(convolution->getImage());
 	}
@@ -21,6 +22,7 @@ void ImageConvolution::bbUserSetDefaultValues()
 	bbSetInputIn(NULL);
 	bbSetOutputOut(NULL);
 	bbSetInputFactor(5.0);
+	bbSetInputOn(false);
 }
 
 void ImageConvolution::bbUserInitializeProcessing()
diff --git a/PackRecalage/src/bbPackRecalageImageConvolution.h b/PackRecalage/src/bbPackRecalageImageConvolution.h
index 8ead42a..d95c8da 100644
--- a/PackRecalage/src/bbPackRecalageImageConvolution.h
+++ b/PackRecalage/src/bbPackRecalageImageConvolution.h
@@ -17,6 +17,7 @@ class bbPackRecalage_EXPORT ImageConvolution
   BBTK_BLACK_BOX_INTERFACE(ImageConvolution,bbtk::AtomicBlackBox);
   BBTK_DECLARE_INPUT(In,vtkImageData*);
   BBTK_DECLARE_INPUT(Factor,double);
+  BBTK_DECLARE_INPUT(On,bool);
   BBTK_DECLARE_OUTPUT(Out,vtkImageData*);
   BBTK_PROCESS(Process);
   void Process();
@@ -32,6 +33,7 @@ BBTK_DESCRIPTION("Processes an image through different convolution matrix (Edge
 BBTK_CATEGORY("filter");
 BBTK_INPUT(ImageConvolution,In,"Image to be filetered",vtkImageData*,"");
 BBTK_INPUT(ImageConvolution,Factor,"Factor by how the edges will be represented",double,"");
+BBTK_INPUT(ImageConvolution,On,"Boolean that represents if the filter is turned on. True = On.",bool,"");
 BBTK_OUTPUT(ImageConvolution,Out,"Filtered Image",vtkImageData*,"");
 BBTK_END_DESCRIBE_BLACK_BOX(ImageConvolution);
 }