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

Timestamp:

Mar 6, 2017, 8:30:06 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

modifs pb crash fin simulateur

File:

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

trunk/lib/FlairFilter/src/ButterworthLowPass_impl.cpp

@@ -31 +31 @@
 ButterworthLowPass_impl::ButterworthLowPass_impl(ButterworthLowPass *self,
                                                  const LayoutPosition *position,
-                                                 string name, int order) {
+                                                 string name, uint32_t order,uint32_t nbRow,uint32_t nbCol) {
   // init UI
   GroupBox *reglages_groupbox = new GroupBox(position, name);
@@ -39 +39 @@
                              " Hz", 0, 10000, 0.1, 2, 1);
 
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(1, 1);
-  desc->SetElementName(0, 0, "output");
+  cvmatrix_descriptor *desc = new cvmatrix_descriptor(nbRow, nbCol);
+  //desc->SetElementName(0, 0, "output");
   output = new cvmatrix(self, desc, floatType, name);
   delete desc;
 
-  f = new PoleFilter(order);
-
-  if (T->Value() != 0) {
-    f->setup(1. / T->Value(), cutoff->Value());
+  f=(PoleFilter**)malloc(sizeof(PoleFilter*)*nbRow*nbCol);
+  
+  for(uint32_t i=0;i<nbRow;i++) {
+    for(uint32_t j=0;j<nbCol;j++) {
+      f[i*nbCol+j] = new PoleFilter(order);
+      if (T->Value() != 0) {
+        f[i*nbCol+j]->setup(1. / T->Value(), cutoff->Value());
+      }
+      f[i*nbCol+j]->reset();
+    }
   }
-  
-  f->reset();
 
   first_update = true;
   this->order=order;
+  this->nbRow=nbRow;
+  this->nbCol=nbCol;
 }
 
-ButterworthLowPass_impl::~ButterworthLowPass_impl() { delete f; }
+ButterworthLowPass_impl::~ButterworthLowPass_impl() { 
+  for(uint32_t i=0;i<nbRow;i++) {
+    for(uint32_t j=0;j<nbCol;j++) {
+     delete f[i*nbCol+j];
+    }
+  }
+  free(f);
+}
 
 void ButterworthLowPass_impl::UpdateFrom(const io_data *data) {
-  float result;
   cvmatrix *input = (cvmatrix *)data;
   float delta_t;
   
-  if (T->ValueChanged()) {
-    if (T->Value() != 0) {
-      f->setup(1. / T->Value(), cutoff->Value());
-      settingsChanged(input->Value(0, 0));
+  if (T->ValueChanged() && T->Value() != 0) {
+    for(uint32_t i=0;i<nbRow;i++) {
+      for(uint32_t j=0;j<nbCol;j++) {
+        f[i*nbCol+j]->setup(1. / T->Value(), cutoff->Value());
+        settingsChanged(f[i*nbCol+j],input->Value(i, j));
+      }
     }
   }
@@ -72 +86 @@
   if (T->Value() == 0) {
     delta_t = (float)(data->DataTime() - previous_time) / 1000000000.;
-    f->setup(1. / delta_t, cutoff->Value());
+    for(uint32_t i=0;i<nbRow;i++) {
+      for(uint32_t j=0;j<nbCol;j++) {
+        f[i*nbCol+j]->setup(1. / delta_t, cutoff->Value());
+      }
+    }
   } else {
     delta_t=T->Value();
@@ -82 +100 @@
 
   if (cutoff->ValueChanged()) {
-    f->setup(1. / delta_t, cutoff->Value());
-    settingsChanged(input->ValueNoMutex(0, 0));
+    for(uint32_t i=0;i<nbRow;i++) {
+      for(uint32_t j=0;j<nbCol;j++) {
+        f[i*nbCol+j]->setup(1. / delta_t, cutoff->Value());
+        settingsChanged(f[i*nbCol+j],input->ValueNoMutex(i, j));
+      }
+    }
   }
 
@@ -89 +111 @@
     first_update = false;
   } else {
-    result = f->filter(input->ValueNoMutex(0, 0));
-    output->SetValueNoMutex(0, 0, result);
+    for(uint32_t i=0;i<nbRow;i++) {
+      for(uint32_t j=0;j<nbCol;j++) {
+        float result = f[i*nbCol+j]->filter(input->ValueNoMutex(i, j));
+        output->SetValueNoMutex(i, j, result);
+      }
+    }
   }
 
@@ -101 +127 @@
 
 //ne gere pas les oscillations (s'arrete des qu'une valeure est bonne a 5%)
-void ButterworthLowPass_impl::settingsChanged(float inputValue) {
+void ButterworthLowPass_impl::settingsChanged(PoleFilter*f,float inputValue) {
   float result=f->filter(inputValue);