modification of clitkSignal -> remove dependance to fftw3

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index fc434c937b7401c27483eb4844d3e2506ae544e1..0f1962d1b91d9b5530110e91b1f0279c0080d1dc 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -67,11 +67,11 @@ TARGET_LINK_LIBRARIES(clitkInvertVF clitkCommon ITKIO clitkFilters)
 ADD_EXECUTABLE(clitkAffineTransform clitkAffineTransform.cxx  clitkAffineTransform_ggo.c)
 TARGET_LINK_LIBRARIES(clitkAffineTransform clitkCommon ITKIO  clitkFilters)
 
-#ADD_EXECUTABLE(clitkSignalMeanPositionTracking clitkSignalMeanPositionTracking.cxx clitkSignalMeanPositionFilter.cxx clitkEllipse.cxx clitkSignalMeanPositionTracking_ggo.c)
-#TARGET_LINK_LIBRARIES(clitkSignalMeanPositionTracking clitkCommon ITKIO fftw3)
-#
-#ADD_EXECUTABLE(clitkSignalFilter clitkSignalFilter.cxx clitkSignalFilter_ggo.c)
-#TARGET_LINK_LIBRARIES(clitkSignalFilter clitkCommon ITKIO fftw3) 
+ADD_EXECUTABLE(clitkSignalMeanPositionTracking clitkSignalMeanPositionTracking.cxx clitkSignalMeanPositionFilter.cxx clitkEllipse.cxx clitkSignalMeanPositionTracking_ggo.c)
+TARGET_LINK_LIBRARIES(clitkSignalMeanPositionTracking clitkCommon ITKIO )
+
+ADD_EXECUTABLE(clitkSignalFilter clitkSignalFilter.cxx clitkSignalFilter_ggo.c)
+TARGET_LINK_LIBRARIES(clitkSignalFilter clitkCommon ITKIO ) 
 
 ADD_EXECUTABLE(clitkSetBackground clitkSetBackground.cxx
 clitkSetBackgroundGenericFilter.cxx clitkSetBackground_ggo.c)

diff --git a/tools/clitkSignalFilter.cxx b/tools/clitkSignalFilter.cxx
index 0a833f3133e8263216024bcb63f31cbcac847c90..04a6f10c8bcdcd260a737ee156426ed8d9da1996 100644 (file)
--- a/tools/clitkSignalFilter.cxx
+++ b/tools/clitkSignalFilter.cxx
@@ -50,8 +50,8 @@ int main(int argc, char * argv[]) {
   if( args_info.multiply_flag) input*=input2;
   if( args_info.divide_flag) input/=input2;
   if( args_info.norm_flag) input=input.Normalize (p1, p2);
-  if( args_info.highPass_flag) input=input.HighPassFilter(p1,p2);
-  if( args_info.lowPass_flag) input=input.LowPassFilter(p1,p2);
+  //if( args_info.highPass_flag) input=input.HighPassFilter(p1,p2);
+  //if( args_info.lowPass_flag) input=input.LowPassFilter(p1,p2);
   if( args_info.detect_flag) input=input.DetectLocalExtrema(static_cast<unsigned int >(p1));
   if( args_info.limPhase_flag) input=input.LimPhase();
   if( args_info.monPhase_flag) input=input.MonPhase();

diff --git a/tools/clitkSignalFilter.ggo b/tools/clitkSignalFilter.ggo
index de47d83d1b05ec1d5c6195001531ffce490a673b..0ae384aff17d90eb8325b0a081b150317ac0cb73 100644 (file)
--- a/tools/clitkSignalFilter.ggo
+++ b/tools/clitkSignalFilter.ggo
@@ -13,8 +13,8 @@ option "multiply"     -       "Mulitply values of input 1 with input 2 (same size)"      f
 option "divide"                -       "Divide values of input 1 with input 2 (same size, zeros are skipped)"   flag           off     
 option "norm"          n       "Normalize signal between p1=min and p2=max"              flag          off
 option "rescale"       -       "Rescale signal to p1=mean and p2=StdDev"                 flag          off
-option "highPass"      -       "High Pass Filter: p1=sampPeriod, p2= cutOffFrequecy"     flag          off
-option "lowPass"       -       "Low Pass Filter: p1=sampPeriod, p2= cutOffFrequecy"      flag          off
+#option "highPass"     -       "High Pass Filter: p1=sampPeriod, p2= cutOffFrequecy"     flag          off
+#option "lowPass"      -       "Low Pass Filter: p1=sampPeriod, p2= cutOffFrequecy"      flag          off
 option "detect"        -       "Detect Local extrema: local window= 2*p1+1, p1>=1"               flag          off
 option "limPhase"      -       "Convert extrema signal into limited phase [0, 1["                flag          off
 option "monPhase"      -       "Convert extrema signal into monotone phase [0, inf["             flag          off