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

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

matrix

File:

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

trunk/lib/FlairFilter/src/PidThrust_impl.cpp

@@ -17 +17 @@
 #include "PidThrust_impl.h"
 #include "PidThrust.h"
-#include <cvmatrix.h>
+#include <Matrix.h>
 #include <Layout.h>
 #include <GroupBox.h>
@@ -36 +36 @@
 
   // init matrix
-  self->input = new cvmatrix(self, 2, 1, floatType, name);
+  self->input = new Matrix(self, 2, 1, floatType, name);
 
   cvmatrix_descriptor *desc = new cvmatrix_descriptor(5, 1);
@@ -44 +44 @@
   desc->SetElementName(3, 0, "p+i+d");
   desc->SetElementName(4, 0, "p+i+d+offset");
-  state = new cvmatrix(self, desc, floatType, name);
+  state = new Matrix(self, desc, floatType, name);
   delete desc;
 
@@ -76 +76 @@
   float p, d, total;
   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;
+  }
 
   if (T->Value() == 0) {