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

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

modif euler/lowpass

File:

• trunk/lib/FlairFilter/src/LowPassFilter_impl.cpp (modified) (4 diffs)

trunk/lib/FlairFilter/src/LowPassFilter_impl.cpp

@@ -35 +35 @@
                                        string name,
                                        const cvmatrix *init_value) {
-  first_update = true;
 
   if (init_value != NULL) {
-    prev_value = (cvmatrix *)init_value;
+    // init output matrix of same size as init
+    cvmatrix_descriptor *desc =new cvmatrix_descriptor(init_value->Rows(), init_value->Cols());
+
+    for (int i = 0; i < init_value->Rows(); i++) {
+      for (int j = 0; j < init_value->Cols(); j++) {
+        desc->SetElementName(i, j, init_value->Name(i, j));
+      }
+    }
+    output = new cvmatrix(self, desc,init_value->GetDataType().GetElementDataType(), name);
+    for (int i = 0; i < init_value->Rows(); i++) {
+      for (int j = 0; j < init_value->Cols(); j++) {
+        output->SetValue(i, j, init_value->Value(i,j));
+      }
+    }
   } else {
     // if NULL, assume dimension 1, and init=0
     cvmatrix_descriptor *desc = new cvmatrix_descriptor(1, 1);
     desc->SetElementName(0, 0, "output");
-    prev_value = new cvmatrix(self, desc, floatType, name);
-    prev_value->SetValue(0, 0, 0);
+    output = new cvmatrix(self, desc, floatType, name);
+    output->SetValue(0, 0, 0);
   }
 
@@ -53 +65 @@
   freq = new DoubleSpinBox(reglages_groupbox->NewRow(), "cutoff frequency",
                            " Hz", 0, 10000, 0.1, 2, 1);
-
-  // init output matrix of same size as init
-  cvmatrix_descriptor *desc =
-      new cvmatrix_descriptor(prev_value->Rows(), prev_value->Cols());
-
-  for (int i = 0; i < prev_value->Rows(); i++) {
-    for (int j = 0; j < prev_value->Cols(); j++) {
-      desc->SetElementName(i, j, prev_value->Name(i, j));
-    }
-  }
-
-  output = new cvmatrix(self, desc,
-                        prev_value->GetDataType().GetElementDataType(), name);
-
-  output->SetValue(0, 0, 0);
+                           
+  previous_time=GetTime();
 }
 
@@ -74 +73 @@
 void LowPassFilter_impl::UpdateFrom(const io_data *data) {
   float delta_t;
-  float result;
   cvmatrix *input = (cvmatrix *)data;
 
@@ -81 +79 @@
   input->GetMutex();
 
-  if (first_update == true) {
-    for (int i = 0; i < input->Rows(); i++) {
-      for (int j = 0; j < input->Cols(); j++) {
-        output->SetValueNoMutex(i, j, prev_value->ValueNoMutex(i, j));
-        prev_value->SetValueNoMutex(i, j, input->ValueNoMutex(i, j));
-      }
-    }
-    first_update = false;
+  if (T->Value() == 0) {
+    delta_t = (float)(data->DataTime() - previous_time) / 1000000000.;
   } else {
-    if (T->Value() == 0) {
-      delta_t = (float)(data->DataTime() - previous_time) / 1000000000.;
-    } else {
-      delta_t = T->Value();
-    }
-    for (int i = 0; i < input->Rows(); i++) {
-      for (int j = 0; j < input->Cols(); j++) {
-
-        if (freq->Value() != 0) {
-          output->SetValueNoMutex(i, j, (1 - 2 * PI * freq->Value() * delta_t) *
-                                                prev_value->ValueNoMutex(i, j) +
-                                            2 * PI * freq->Value() * delta_t *
-                                                input->ValueNoMutex(i, j));
-        } else {
-          output->SetValueNoMutex(i, j, input->ValueNoMutex(i, j));
-        }
-        prev_value->SetValueNoMutex(i, j, output->ValueNoMutex(i, j));
+    delta_t = T->Value();
+  }
+  for (int i = 0; i < input->Rows(); i++) {
+    for (int j = 0; j < input->Cols(); j++) {
+      float cutoff=freq->Value();
+      if (cutoff == 0 || freq->ValueChanged()) {
+        output->SetValueNoMutex(i, j, input->ValueNoMutex(i, j));
+      } else {
+        output->SetValueNoMutex(i, j, (1 - 2 * PI * cutoff * delta_t) *
+                                              output->ValueNoMutex(i, j) +
+                                          2 * PI * cutoff * delta_t *
+                                              input->ValueNoMutex(i, j));
       }
     }
   }
+ 
   input->ReleaseMutex();
   output->ReleaseMutex();