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

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

matrix

File:

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

trunk/lib/FlairFilter/src/ButterworthLowPass_impl.cpp

@@ -18 +18 @@
 #include "ButterworthLowPass_impl.h"
 #include "ButterworthLowPass.h"
-#include <cvmatrix.h>
+#include <Matrix.h>
 #include <Layout.h>
 #include <GroupBox.h>
@@ -29 +29 @@
 using namespace flair::filter;
 
-ButterworthLowPass_impl::ButterworthLowPass_impl(ButterworthLowPass *self,
+ButterworthLowPass_impl::ButterworthLowPass_impl(const ButterworthLowPass *self,
                                                  const LayoutPosition *position,
                                                  string name, uint32_t order,uint32_t nbRow,uint32_t nbCol) {
@@ -41 +41 @@
   cvmatrix_descriptor *desc = new cvmatrix_descriptor(nbRow, nbCol);
   //desc->SetElementName(0, 0, "output");
-  output = new cvmatrix(self, desc, floatType, name);
+  output = new Matrix(self, desc, floatType, name);
   delete desc;
 
@@ -60 +60 @@
   this->nbRow=nbRow;
   this->nbCol=nbCol;
+  this->self=self;
 }
 
@@ -72 +73 @@
 
 void ButterworthLowPass_impl::UpdateFrom(const io_data *data) {
-  cvmatrix *input = (cvmatrix *)data;
   float delta_t;
+  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->ValueChanged() && T->Value() != 0) {