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


Ignore:
Timestamp:
02/07/18 17:49:27 (4 years ago)
Author:
Sanahuja Guillaume
Message:

matrix

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/FlairFilter/src/Pid_impl.cpp

    r148 r214  
    1717#include "Pid_impl.h"
    1818#include "Pid.h"
    19 #include <cvmatrix.h>
     19#include <Matrix.h>
    2020#include <Layout.h>
    2121#include <GroupBox.h>
     
    3434
    3535  // init matrix
    36   self->input = new cvmatrix(self, 2, 1, floatType, name);
     36  self->input = new Matrix(self, 2, 1, floatType, name);
    3737
    3838  cvmatrix_descriptor *desc = new cvmatrix_descriptor(4, 1);
     
    4141  desc->SetElementName(2, 0, "d");
    4242  desc->SetElementName(3, 0, "p+i+d");
    43   state = new cvmatrix(self, desc, floatType, name);
     43  state = new Matrix(self, desc, floatType, name);
    4444  delete desc;
    4545
     
    7171  float p, d, total;
    7272  float delta_t;
    73   cvmatrix *input = (cvmatrix *)data;
     73  const Matrix* input = dynamic_cast<const Matrix*>(data);
     74 
     75  if (!input) {
     76      self->Warn("casting %s to Matrix failed\n",data->ObjectName().c_str());
     77      return;
     78  }
    7479
    7580  if (T->Value() == 0) {
Note: See TracChangeset for help on using the changeset viewer.