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

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

modif euler/lowpass

File:

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

trunk/lib/FlairFilter/src/EulerDerivative_impl.cpp

@@ -33 +33 @@
                                            const cvmatrix *init_value) {
   first_update = true;
+  
+  if (init_value != NULL) {
+    // init output matrix of same size as init
+    cvmatrix_descriptor *desc =new cvmatrix_descriptor(init_value->Rows(), init_value->Cols());
 
-  if (init_value != NULL) {
-    prev_value = (cvmatrix *)init_value;
+    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);
   }
+  
+ 
+  cvmatrix_descriptor *desc = new cvmatrix_descriptor(output->Rows(), output->Cols());
+  prev_value = new cvmatrix(self, desc, output->GetDataType().GetElementDataType(), name);
+
 
   // init UI
@@ -48 +66 @@
   T = new DoubleSpinBox(reglages_groupbox->NewRow(), "period, 0 for auto:",
                         " s", 0, 1, 0.01);
-
-  // 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);
 }
 
@@ -76 +81 @@
     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));
       }