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/PidThrust_impl.cpp

    r148 r214  
    1717#include "PidThrust_impl.h"
    1818#include "PidThrust.h"
    19 #include <cvmatrix.h>
     19#include <Matrix.h>
    2020#include <Layout.h>
    2121#include <GroupBox.h>
     
    3636
    3737  // init matrix
    38   self->input = new cvmatrix(self, 2, 1, floatType, name);
     38  self->input = new Matrix(self, 2, 1, floatType, name);
    3939
    4040  cvmatrix_descriptor *desc = new cvmatrix_descriptor(5, 1);
     
    4444  desc->SetElementName(3, 0, "p+i+d");
    4545  desc->SetElementName(4, 0, "p+i+d+offset");
    46   state = new cvmatrix(self, desc, floatType, name);
     46  state = new Matrix(self, desc, floatType, name);
    4747  delete desc;
    4848
     
    7676  float p, d, total;
    7777  float delta_t;
    78   cvmatrix *input = (cvmatrix *)data;
     78  const Matrix* input = dynamic_cast<const Matrix*>(data);
     79 
     80  if (!input) {
     81      self->Warn("casting %s to Matrix failed\n",data->ObjectName().c_str());
     82      return;
     83  }
    7984
    8085  if (T->Value() == 0) {
Note: See TracChangeset for help on using the changeset viewer.