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

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

matrix

File:

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

trunk/lib/FlairFilter/src/EulerDerivative_impl.cpp

@@ -18 +18 @@
 #include "EulerDerivative.h"
 #include "EulerDerivative_impl.h"
-#include <cvmatrix.h>
+#include <Matrix.h>
 #include <Layout.h>
 #include <GroupBox.h>
@@ -31 +31 @@
                                            const LayoutPosition *position,
                                            string name,
-                                           const cvmatrix *init_value) {
+                                           const Matrix *init_value) {
   first_update = true;
+  this->self = self;
   
   if (init_value != NULL) {
@@ -43 +44 @@
       }
     }
-    output = new cvmatrix(self, desc,init_value->GetDataType().GetElementDataType(), name);
+    output = new Matrix(self, desc,init_value->GetDataType().GetElementDataType(), name);
     delete desc;
     for (int i = 0; i < init_value->Rows(); i++) {
@@ -54 +55 @@
     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;
   }
@@ -60 +61 @@
  
   cvmatrix_descriptor *desc = new cvmatrix_descriptor(output->Rows(), output->Cols());
-  prev_value = new cvmatrix(self, desc, output->GetDataType().GetElementDataType(), name);
+  prev_value = new Matrix(self, desc, output->GetDataType().GetElementDataType(), name);
 
 
@@ -73 +74 @@
 void EulerDerivative_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