Changeset 214 in flair-src for trunk/lib/FlairVisionFilter


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

matrix

Location:
trunk/lib/FlairVisionFilter/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/FlairVisionFilter/src/HoughLines.cpp

    r157 r214  
    1414#include "HoughLines.h"
    1515#include <cvimage.h>
    16 #include <cvmatrix.h>
     16#include <Matrix.h>
    1717#include <Layout.h>
    1818#include <GroupBox.h>
     
    4949    desc->SetElementName(2,0,"orientation deg");
    5050    desc->SetElementName(3,0,"line_detected");
    51     output=new cvmatrix(this,desc,floatType,name);
     51    output=new Matrix(this,desc,floatType,name);
    5252    delete desc;
    5353
     
    9090}
    9191
    92 cvmatrix *HoughLines::Output(void) const {
     92Matrix *HoughLines::Output(void) const {
    9393    return output;
    9494}
  • trunk/lib/FlairVisionFilter/src/HoughLines.h

    r122 r214  
    1717    namespace core {
    1818        class cvimage;
    19         class cvmatrix;
     19        class Matrix;
    2020    }
    2121    namespace gui {
     
    5656            float GetOrientation(void) const;
    5757            float GetDistance(void) const;
    58             core::cvmatrix *Output(void) const;
     58            core::Matrix *Output(void) const;
    5959
    6060        private:
     
    6969            float distance,orientation;
    7070            CvMat* linesStorage;
    71             core::cvmatrix *output;
     71            core::Matrix *output;
    7272    };
    7373} // end namespace filter
  • trunk/lib/FlairVisionFilter/src/OpticalFlowSpeed.cpp

    r157 r214  
    1414#include "OpticalFlowSpeed.h"
    1515#include "OpticalFlowData.h"
    16 #include <cvmatrix.h>
     16#include <Matrix.h>
    1717#include <Object.h>
    1818
     
    3030  desc->SetElementName(0,0,"vx");
    3131  desc->SetElementName(1,0,"vy");
    32   output=new cvmatrix(this,desc,floatType,name);
     32  output=new Matrix(this,desc,floatType,name);
    3333  delete desc;
    3434
     
    8181}
    8282
    83 core::cvmatrix *OpticalFlowSpeed::Output() const
     83core::Matrix *OpticalFlowSpeed::Output() const
    8484{
    8585    return output;
  • trunk/lib/FlairVisionFilter/src/OpticalFlowSpeed.h

    r143 r214  
    1717    namespace core
    1818    {
    19         class cvmatrix;
     19        class Matrix;
    2020    }
    2121}
     
    7171            * Second line is speed along y axis. \n
    7272            */
    73             core::cvmatrix *Output() const;
     73            core::Matrix *Output() const;
    7474
    7575        private:
     
    8383            void UpdateFrom(const core::io_data *data);
    8484
    85             core::cvmatrix *output;
     85            core::Matrix *output;
    8686    };
    8787} // end namespace filter
Note: See TracChangeset for help on using the changeset viewer.