Changeset 147 in flair-src for trunk/lib/FlairFilter/src/ButterworthLowPass_impl.cpp

Timestamp:

02/28/17 12:45:08 (7 years ago)

Author:

Sanahuja Guillaume

Message:

modif euler/lowpass

File:

• trunk/lib/FlairFilter/src/ButterworthLowPass_impl.cpp (modified) (3 diffs)

trunk/lib/FlairFilter/src/ButterworthLowPass_impl.cpp

@@ -47 +47 @@
   f = new PoleFilter(order);
 
-  if (T->Value() != 0)
+  if (T->Value() != 0) {
     f->setup(1. / T->Value(), cutoff->Value());
+  }
+  
   f->reset();
 
   first_update = true;
+  this->order=order;
 }
 
@@ -59 +62 @@
   float result;
   cvmatrix *input = (cvmatrix *)data;
-
-  if (T->ValueChanged() || cutoff->ValueChanged()) {
+  float delta_t;
+  
+  if (T->ValueChanged()) {
     if (T->Value() != 0) {
       f->setup(1. / T->Value(), cutoff->Value());
-    } else {
-      first_update = true;
+      settingsChanged(input->Value(0, 0));
     }
   }
 
+  if (T->Value() == 0) {
+    delta_t = (float)(data->DataTime() - previous_time) / 1000000000.;
+    f->setup(1. / delta_t, cutoff->Value());
+  } else {
+    delta_t=T->Value();
+  }
+  
   // on prend une fois pour toute les mutex et on fait des accès directs
   output->GetMutex();
   input->GetMutex();
 
-  if (T->Value() == 0) {
-    float delta_t = (float)(data->DataTime() - previous_time) / 1000000000.;
+  if (cutoff->ValueChanged()) {
     f->setup(1. / delta_t, cutoff->Value());
+    settingsChanged(input->ValueNoMutex(0, 0));
   }
 
@@ -90 +100 @@
   previous_time = data->DataTime();
 }
+
+//ne gere pas les oscillations (s'arrete des qu'une valeure est bonne a 5%)
+void ButterworthLowPass_impl::settingsChanged(float inputValue) {
+  float result=f->filter(inputValue);
+  
+  while(result<inputValue*0.95 || result>inputValue*1.05) {
+      result=f->filter(inputValue);
+  }
+}