Changeset 214 in flair-src for trunk/lib/FlairFilter/src/unexported


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

matrix

Location:
trunk/lib/FlairFilter/src/unexported
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/lib/FlairFilter/src/unexported/ButterworthLowPass_impl.h

    r162 r214  
    1919namespace flair {
    2020namespace core {
    21 class cvmatrix;
     21class Matrix;
    2222}
    2323namespace gui {
    … …  
    120120class ButterworthLowPass_impl {
    121121public:
    122   ButterworthLowPass_impl(flair::filter::ButterworthLowPass *self,
     122  ButterworthLowPass_impl(const flair::filter::ButterworthLowPass *self,
    123123                          const flair::gui::LayoutPosition *position,
    124124                          std::string name, uint32_t order,uint32_t nbRow,uint32_t nbCol);
    125125  ~ButterworthLowPass_impl();
    126126  void UpdateFrom(const flair::core::io_data *data);
    127   flair::core::cvmatrix *output;
     127  flair::core::Matrix *output;
    128128
    129129private:
    … …  
    135135  uint32_t order;
    136136  uint32_t nbRow, nbCol;
     137  const flair::filter::ButterworthLowPass *self;
    137138};
    138139

  • trunk/lib/FlairFilter/src/unexported/EulerDerivative_impl.h

    r15 r214  
    1818namespace flair {
    1919namespace core {
    20 class cvmatrix;
     20class Matrix;
    2121}
    2222namespace gui {
    … …  
    3838                       const flair::gui::LayoutPosition *position,
    3939                       std::string name,
    40                        const flair::core::cvmatrix *init_value = NULL);
     40                       const flair::core::Matrix *init_value = NULL);
    4141  ~EulerDerivative_impl();
    4242  void UpdateFrom(const flair::core::io_data *data);
    43   flair::core::cvmatrix *output;
     43  flair::core::Matrix *output;
    4444
    4545private:
    … …  
    4747  flair::core::Time previous_time;
    4848  bool first_update;
    49   flair::core::cvmatrix *prev_value;
     49  flair::core::Matrix *prev_value;
     50  flair::filter::EulerDerivative *self;
    5051};
    5152

  • trunk/lib/FlairFilter/src/unexported/JoyReference_impl.h

    r15 r214  
    2525namespace flair {
    2626namespace core {
    27 class cvmatrix;
     27class Matrix;
    2828class io_data;
    2929class AhrsData;
    … …  
    6565  void Update(flair::core::Time time);
    6666  void UpdateFrom(const flair::core::io_data *data);
    67   flair::core::cvmatrix *output;
     67  flair::core::Matrix *output;
    6868  flair::core::AhrsData *ahrsData;
    6969
    7070private:
    71   flair::core::cvmatrix *input;
     71  flair::core::Matrix *input;
    7272
    7373  flair::gui::GroupBox *reglages_groupbox;

  • trunk/lib/FlairFilter/src/unexported/LowPassFilter_impl.h

    r147 r214  
    1818namespace flair {
    1919namespace core {
    20 class cvmatrix;
     20class Matrix;
    2121}
    2222namespace gui {
    … …  
    3636                     const flair::gui::LayoutPosition *position,
    3737                     std::string name,
    38                      const flair::core::cvmatrix *init_value = NULL);
     38                     const flair::core::Matrix *init_value = NULL);
    3939  ~LowPassFilter_impl();
    4040  void UpdateFrom(const flair::core::io_data *data);
    41   flair::core::cvmatrix *output;
     41  flair::core::Matrix *output;
    4242
    4343private:
    4444  flair::core::Time previous_time;
    4545  flair::gui::DoubleSpinBox *freq, *T;
     46  const flair::filter::LowPassFilter *self;
    4647};
    4748

  • trunk/lib/FlairFilter/src/unexported/PidThrust_impl.h

    r15 r214  
    1818namespace flair {
    1919namespace core {
    20 class cvmatrix;
     20class Matrix;
    2121class io_data;
    2222}
    … …  
    5050
    5151  // matrix
    52   flair::core::cvmatrix *state;
     52  flair::core::Matrix *state;
    5353
    5454  flair::gui::DoubleSpinBox *T, *kp, *ki, *kd, *sat, *sati;

  • trunk/lib/FlairFilter/src/unexported/Pid_impl.h

    r15 r214  
    1818namespace flair {
    1919namespace core {
    20 class cvmatrix;
     20class Matrix;
    2121class io_data;
    2222}
    … …  
    4949
    5050  // matrix
    51   flair::core::cvmatrix *state;
     51  flair::core::Matrix *state;
    5252
    5353  flair::gui::DoubleSpinBox *T, *kp, *ki, *kd, *sat, *sati;

  • trunk/lib/FlairFilter/src/unexported/TrajectoryGenerator1D_impl.h

    r205 r214  
    1616namespace flair {
    1717namespace core {
    18 class cvmatrix;
     18class Matrix;
    1919}
    2020namespace gui {
    … …  
    3939  void Reset(void);
    4040  float GetPercentageOfCompletion(void) const;
    41   flair::core::cvmatrix *output;
     41  flair::core::Matrix *output;
    4242  float pos_off, vel_off;
    4343  bool is_finished, is_started;

  • trunk/lib/FlairFilter/src/unexported/TrajectoryGenerator2DCircle_impl.h

    r167 r214  
    1919namespace flair {
    2020namespace core {
    21 class cvmatrix;
     21class Matrix;
    2222class io_data;
    2323}
    … …  
    4646  void FinishTraj(void);
    4747  bool is_running;
    48   flair::core::cvmatrix *output;
     48  flair::core::Matrix *output;
    4949  flair::core::Vector2Df pos_off, vel_off;
    5050

  • trunk/lib/FlairFilter/src/unexported/UavMultiplex_impl.h

    r137 r214  
    2020namespace core {
    2121class FrameworkManager;
    22 class cvmatrix;
     22class Matrix;
    2323class io_data;
    2424}
    … …  
    5656  ~UavMultiplex_impl();
    5757
    58   flair::core::cvmatrix *input;
     58  flair::core::Matrix *input;
    5959  void SetMultiplexComboBox(std::string name, int index);
    6060  int MultiplexValue(int index) const;

  • trunk/lib/FlairFilter/src/unexported/X4X8Multiplex_impl.h

    r15 r214  
    1818namespace flair {
    1919namespace core {
    20 class cvmatrix;
     20class Matrix;
    2121class io_data;
    2222}
    … …  
    4444
    4545private:
    46   flair::core::cvmatrix *output;
     46  flair::core::Matrix *output;
    4747  flair::gui::ComboBox *pas;
    4848  flair::gui::DataPlot1D *plots[4];
Note: See TracChangeset for help on using the changeset viewer.