Changeset 318 in flair-src for trunk/lib/FlairCore


Ignore:
Timestamp:
Jul 3, 2019, 5:05:33 PM (2 years ago)
Author:
Sanahuja Guillaume
Message:
Location:
trunk/lib/FlairCore/src
Files:
4 deleted
4 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/lib/FlairCore/src/Matrix.cpp

    r252 r318  
    107107}
    108108
    109 Matrix::Matrix(const Object *parent, const cvmatrix_descriptor *descriptor,
     109Matrix::Matrix(const Object *parent, const MatrixDescriptor *descriptor,
    110110                   ScalarType const &elementDataType, string name, uint32_t n)
    111111    : io_data(parent, name, n),
  • trunk/lib/FlairCore/src/Matrix.h

    r252 r318  
    1616#include <io_data.h>
    1717#include <IODataElement.h>
    18 #include <cvmatrix_descriptor.h>
     18#include <MatrixDescriptor.h>
    1919
    2020class Matrix_impl;
     
    5252  *
    5353  * Construct an io_data representing a matrix. \n
    54   * It uses a cvmatrix_descriptor to get size and elements' names. \n
     54  * It uses a MatrixDescriptor to get size and elements' names. \n
    5555  * Names are used for graphs and logs. \n
    5656  * All values are initialized to 0.
     
    6262  * \param n number of samples
    6363  */
    64   Matrix(const Object *parent, const cvmatrix_descriptor *descriptor,
     64  Matrix(const Object *parent, const MatrixDescriptor *descriptor,
    6565           ScalarType const &elementDataType, std::string name = "",
    6666           uint32_t n = 1);
     
    145145  * \brief Element name
    146146  *
    147   * If Matrix was created without cvmatrix_descriptor, element name is empty.
     147  * If Matrix was created without MatrixDescriptor, element name is empty.
    148148  *
    149149  * \param row element row
  • trunk/lib/FlairCore/src/MatrixDescriptor.cpp

    r317 r318  
    44// %flair:license}
    55//  created:    2014/02/05
    6 //  filename:   cvmatrix_descriptor.cpp
     6//  filename:   MatrixDescriptor.cpp
    77//
    88//  author:     Guillaume Sanahuja
     
    1111//  version:    $Id: $
    1212//
    13 //  purpose:    Class describing cvmatrix elements, for log and graphs purpose
     13//  purpose:    Class describing matrix elements, for log and graphs purpose
    1414//
    1515/*********************************************************************/
    1616
    17 #include "cvmatrix_descriptor.h"
     17#include "MatrixDescriptor.h"
    1818#include "FrameworkManager.h"
    1919
     
    2323namespace core {
    2424
    25 cvmatrix_descriptor::cvmatrix_descriptor(uint32_t rows, uint32_t cols) {
     25MatrixDescriptor::MatrixDescriptor(uint32_t rows, uint32_t cols) {
    2626  this->rows = rows;
    2727  this->cols = cols;
     
    3636}
    3737
    38 cvmatrix_descriptor::~cvmatrix_descriptor() {
     38MatrixDescriptor::~MatrixDescriptor() {
    3939  for (uint32_t i = 0; i < rows * cols; i++) {
    4040    delete element_names[i];
     
    4343}
    4444
    45 void cvmatrix_descriptor::SetElementName(uint32_t row, uint32_t col,
     45void MatrixDescriptor::SetElementName(uint32_t row, uint32_t col,
    4646                                         string name) {
    4747  if (row >= rows || col >= cols) {
     
    5353}
    5454
    55 string cvmatrix_descriptor::ElementName(uint32_t row, uint32_t col) const {
     55string MatrixDescriptor::ElementName(uint32_t row, uint32_t col) const {
    5656  if (row >= rows || col >= cols) {
    5757    getFrameworkManager()->Err("index out of bound (%i,%i), max (%i,%i)\n",
     
    6262}
    6363
    64 uint32_t cvmatrix_descriptor::Rows() const { return rows; }
     64uint32_t MatrixDescriptor::Rows() const { return rows; }
    6565
    66 uint32_t cvmatrix_descriptor::Cols() const { return cols; }
     66uint32_t MatrixDescriptor::Cols() const { return cols; }
    6767
    6868} // end namespace core
  • trunk/lib/FlairCore/src/MatrixDescriptor.h

    r317 r318  
    44// %flair:license}
    55/*!
    6  * \file cvmatrix_descriptor.h
    7  * \brief Class describing cvmatrix elements, for log and graphs purpose
     6 * \file MatrixDescriptor.h
     7 * \brief Class describing matrix elements, for log and graphs purpose
    88 * \author Guillaume Sanahuja, Copyright Heudiasyc UMR UTC/CNRS 7253
    99 * \date 2014/02/05
     
    1111 */
    1212
    13 #ifndef CVMATRIX_DESCRIPTOR_H
    14 #define CVMATRIX_DESCRIPTOR_H
     13#ifndef MATRIXDESCRIPTOR_H
     14#define MATRIXDESCRIPTOR_H
    1515
    1616#include <string>
     
    1919namespace core {
    2020
    21 /*! \class cvmatrix_descriptor
     21/*! \class MatrixDescriptor
    2222*
    23 * \brief Class describing cvmatrix elements, for log and graphs purpose
     23* \brief Class describing matrix elements, for log and graphs purpose
    2424*
    2525* This class allows to give a name to matrix elements. These names
    2626* will be used in graphs and logs.
    2727*/
    28 class cvmatrix_descriptor {
     28class MatrixDescriptor {
    2929public:
    3030  /*!
     
    3636  * \param cols matrix cols
    3737  */
    38   cvmatrix_descriptor(uint32_t rows, uint32_t cols);
     38  MatrixDescriptor(uint32_t rows, uint32_t cols);
    3939
    4040  /*!
     
    4242  *
    4343  */
    44   ~cvmatrix_descriptor();
     44  ~MatrixDescriptor();
    4545
    4646  /*!
     
    8585} // end namespace flair
    8686
    87 #endif // CVMATRIX_DESCRIPTOR_H
     87#endif // MATRIXDESCRIPTOR_H
  • trunk/lib/FlairCore/src/Matrix_impl.cpp

    r214 r318  
    2727                             int n)
    2828    : elementDataType(_elementDataType) {
    29   descriptor = new cvmatrix_descriptor(rows, cols);
     29  descriptor = new MatrixDescriptor(rows, cols);
    3030  Init(self, n);
    3131}
    3232
    3333Matrix_impl::Matrix_impl(Matrix *self,
    34                              const cvmatrix_descriptor *inDescriptor,
     34                             const MatrixDescriptor *inDescriptor,
    3535                             flair::core::ScalarType const &_elementDataType,
    3636                             int n)
    3737    : elementDataType(_elementDataType) {
    38   descriptor = new cvmatrix_descriptor(inDescriptor->Rows(), inDescriptor->Cols());
     38  descriptor = new MatrixDescriptor(inDescriptor->Rows(), inDescriptor->Cols());
    3939
    4040  for (uint32_t i = 0; i < descriptor->Rows(); i++) {
  • trunk/lib/FlairCore/src/unexported/Matrix_impl.h

    r214 r318  
    2727                flair::core::ScalarType const &elementDataType, int n);
    2828  Matrix_impl(flair::core::Matrix *self,
    29                 const flair::core::cvmatrix_descriptor *descriptor,
     29                const flair::core::MatrixDescriptor *descriptor,
    3030                flair::core::ScalarType const &elementDataType, int n);
    3131  ~Matrix_impl();
    3232
    3333  flair::core::ScalarType const &elementDataType;
    34   flair::core::cvmatrix_descriptor *descriptor;
     34  flair::core::MatrixDescriptor *descriptor;
    3535  void *datas;
    3636  void SetValueNoMutex(uint32_t row, uint32_t col, float value);
Note: See TracChangeset for help on using the changeset viewer.