X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=tools%2FclitkSignalMeanPositionFilter.h;h=fbe214ebd96f76ab16bc1fc64a987932eaadd22c;hb=60d1997d39a0a6ddf4479c604f6148096356be7e;hp=4cbc4f0cf5c36d222b1965b6596f54bf36d8ddbc;hpb=9bcf64b7f7c5a7f0a39843df634c05b5d9e4e237;p=clitk.git

diff --git a/tools/clitkSignalMeanPositionFilter.h b/tools/clitkSignalMeanPositionFilter.h
index 4cbc4f0..fbe214e 100644
--- a/tools/clitkSignalMeanPositionFilter.h
+++ b/tools/clitkSignalMeanPositionFilter.h
@@ -1,7 +1,10 @@
 /*=========================================================================
                                                                                 
   Program:   clitk
+  Module:    $RCSfile: clitkSignalMeanPositionFilter.h,v $
   Language:  C++
+  Date:      $Date: 2010/03/03 10:47:48 $
+  Version:   $Revision: 1.6 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,6 +23,7 @@
 #include "clitkSignal.h"
 #include "clitkEllipse.h"
 #include "itkVector.h"
+#include <math.h>
 
 namespace clitk {
 
@@ -51,15 +55,28 @@ namespace clitk {
     bool mIsAdaptiveMethod;
     std::vector<double> mCurrentResidual;
     int mWindowLength;
-    std::vector<Vector2d> mCenters;
+    std::vector<clitk::Ellipse*> mListOfEllipses;
+    
+    bool mValidationWithRealPhase;
+    std::string mInputPhaseFilename;
+    clitk::Signal mInputPhase;
+    std::vector<int> mCycles;
+
+    std::vector<int> mIsoPhaseIndex;
+    std::vector<double> mIsoPhaseDelta;
+    std::vector<int> mIsoPhaseDeltaNb;
+    std::vector<double> mIsoPhaseRefAngle;
+
+    bool mUseLearnedDeltaPhase;
+    clitk::Signal mLearnIsoPhaseDelta;
+    int mNumberOfIsoPhase;
 
     void FitEllipse(clitk::Ellipse & An);
     void AdaptiveFitEllipse(clitk::Ellipse & An);
 
-    void ComputeAugmentedSpace(const clitk::Signal & input, 
-                               clitk::Signal & outputX, 
-                               clitk::Signal & outputY, 
-                               unsigned int delay);
+    void ComputeIsoPhase(std::vector<clitk::Ellipse*> & l, 
+                         std::vector<double> & phase,
+                         std::vector<int> & cycles);
   };
   //---------------------------------------------------------------------