X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Ffpa%2FBase%2FMori.h;h=d1774d708dcc3da8aca409fd4018666d691b6fbf;hb=b6babebfd77364b12d81fb18d767f484ad1a0969;hp=c2ea39cff2c729c2f786a05c8f5cf5cee76a0c7e;hpb=6c0b77c2a8e3b821ccbe9c72c705fcd561bb90c2;p=FrontAlgorithms.git

diff --git a/lib/fpa/Base/Mori.h b/lib/fpa/Base/Mori.h
index c2ea39c..d1774d7 100644
--- a/lib/fpa/Base/Mori.h
+++ b/lib/fpa/Base/Mori.h
@@ -14,6 +14,8 @@
 #include <vector>
 #include <itkConceptChecking.h>
 #include <itkFunctionBase.h>
+
+#include <fpa/Generic/PeakDetector.h>
 #include <fpa/Base/Functors/RegionGrow/BinaryThreshold.h>
 
 namespace fpa
@@ -43,6 +45,8 @@ namespace fpa
       typedef std::set< TInputValue > TThresholds;
       typedef std::pair< TInputValue, unsigned long > TSignalData;
       typedef std::vector< TSignalData >              TSignal;
+
+      typedef fpa::Generic::PeakDetector TPeakDetector;
       typedef fpa::Base::Functors::RegionGrow::BinaryThreshold< TInputValue > TPredicate;
 
     public:
@@ -52,7 +56,10 @@ namespace fpa
         );
 
       itkGetConstMacro( InsideValue, TOutputValue );
+      itkGetConstMacro( MinimumThreshold, TInputValue );
+
       itkSetMacro( InsideValue, TOutputValue );
+      itkSetMacro( MinimumThreshold, TInputValue );
 
       itkGetConstReferenceMacro( Signal, TSignal );
       itkGetConstMacro( SignalLag, unsigned long );
@@ -106,6 +113,8 @@ namespace fpa
       unsigned int m_CurrentQueue;
       unsigned long m_Count;
 
+      TPeakDetector m_PeakDetector;
+
       TSignal m_Signal;
       unsigned long m_SignalLag;
       double m_SignalThreshold;
@@ -117,6 +126,7 @@ namespace fpa
       double m_CurrentAverage;
       double m_CurrentVariance;
 
+      TInputValue  m_MinimumThreshold;
       TOutputValue m_InsideValue;
     };