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

Timestamp:

02/07/18 17:49:27 (6 years ago)

Author:

Sanahuja Guillaume

Message:

matrix

File:

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

trunk/lib/FlairFilter/src/LowPassFilter_impl.cpp

@@ -18 +18 @@
 #include "LowPassFilter_impl.h"
 #include "LowPassFilter.h"
-#include <cvmatrix.h>
+#include <Matrix.h>
 #include <Layout.h>
 #include <GroupBox.h>
 #include <SpinBox.h>
 #include <DoubleSpinBox.h>
-
+#include <typeinfo>
 #define PI ((float)3.14159265358979323846)
 
@@ -34 +34 @@
                                        const LayoutPosition *position,
                                        string name,
-                                       const cvmatrix *init_value) {
+                                       const Matrix *init_value) {
 
   if (init_value != NULL) {
@@ -45 +45 @@
       }
     }
-    output = new cvmatrix(self, desc,init_value->GetDataType().GetElementDataType(), name);
+    output = new Matrix(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++) {
@@ -56 +56 @@
     cvmatrix_descriptor *desc = new cvmatrix_descriptor(1, 1);
     desc->SetElementName(0, 0, "output");
-    output = new cvmatrix(self, desc, floatType, name);
+    output = new Matrix(self, desc, floatType, name);
     delete desc;
   }
@@ -68 +68 @@
                            
   previous_time=GetTime();
+  this->self = self;
 }
 
@@ -74 +75 @@
 void LowPassFilter_impl::UpdateFrom(const io_data *data) {
   float delta_t;
-  cvmatrix *input = (cvmatrix *)data;
+  const Matrix* input = dynamic_cast<const Matrix*>(data);
+  
+  if (!input) {
+      self->Warn("casting %s to Matrix failed\n",data->ObjectName().c_str());
+      return;
+  }
 
   // on prend une fois pour toute les mutex et on fait des accès directs