From 8aa9d711a5d08a9ea6e40ed43456881e67422c21 Mon Sep 17 00:00:00 2001 From: lgrezesb Date: Fri, 19 Feb 2010 14:08:57 +0000 Subject: [PATCH] modification of clitkSignal -> remove dependance to fftw3 --- tools/CMakeLists.txt | 10 +++++----- tools/clitkSignalFilter.cxx | 4 ++-- tools/clitkSignalFilter.ggo | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index fc434c9..0f1962d 100644 --- 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 0a833f3..04a6f10 100644 --- 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(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 de47d83..0ae384a 100644 --- 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 -- 2.45.1