Changeset 137 in flair-src for trunk/lib/FlairFilter/src


Ignore:
Timestamp:
Feb 14, 2017, 3:06:20 PM (5 years ago)
Author:
Sanahuja Guillaume
Message:

singleton manager

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

Legend:

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

    r99 r137  
    1717
    1818#include "Gx3_25_ahrs.h"
    19 #include <FrameworkManager.h>
    2019#include <AhrsData.h>
    2120#include <OneAxisRotation.h>
     
    2827namespace filter {
    2928
    30 Gx3_25_ahrs::Gx3_25_ahrs(const FrameworkManager *parent, string name,
     29Gx3_25_ahrs::Gx3_25_ahrs(string name,
    3130                         SerialPort *serialport, Gx3_25_imu::Command_t command,
    3231                         uint8_t priority)
    33     : Ahrs(new Gx3_25_imu(parent, name, serialport, command, priority), name) {}
     32    : Ahrs(new Gx3_25_imu( name, serialport, command, priority), name) {}
    3433
    3534Gx3_25_ahrs::~Gx3_25_ahrs() {}
  • trunk/lib/FlairFilter/src/Gx3_25_ahrs.h

    r15 r137  
    3030  * \brief Constructor
    3131  *
    32   * Construct an Ahrs for 3dmgx3-25
     32  * Construct an Ahrs for 3dmgx3-25. It will be child of the FrameworkManager.
    3333  *
    34   * \param parent parent
    3534  * \param name name
    3635  * \param serialport Imu SerialPort
     
    3837  * \param priority priority of the Gx3_25_imu Thread
    3938  */
    40   Gx3_25_ahrs(const core::FrameworkManager *parent, std::string name,
     39  Gx3_25_ahrs(std::string name,
    4140              core::SerialPort *serialport,
    4241              sensor::Gx3_25_imu::Command_t command, uint8_t priority);
  • trunk/lib/FlairFilter/src/SimuAhrs.cpp

    r15 r137  
    1818#include "SimuAhrs.h"
    1919#include "SimuImu.h"
    20 #include <FrameworkManager.h>
    2120#include <AhrsData.h>
    2221
     
    2827namespace filter {
    2928
    30 SimuAhrs::SimuAhrs(const FrameworkManager *parent, string name, uint32_t dev_id,
     29SimuAhrs::SimuAhrs(string name, uint32_t dev_id,
    3130                   uint8_t priority)
    32     : Ahrs(new SimuImu(parent, name, dev_id, priority), name) {}
     31    : Ahrs(new SimuImu(name, dev_id, priority), name) {}
    3332
    3433SimuAhrs::~SimuAhrs() {}
  • trunk/lib/FlairFilter/src/SimuAhrs.h

    r15 r137  
    3030  * \brief Constructor
    3131  *
    32   * Construct a simulation Ahrs.
     32  * Construct a simulation Ahrs. It will be child of the FrameworkManager.
    3333  *
    34   * \param parent parent
    3534  * \param name name
    3635  * \param dev_id number id of the simulated Ahrs
    3736  * \param priority priority of the SimuImu Thread
    3837  */
    39   SimuAhrs(const core::FrameworkManager *parent, std::string name,
     38  SimuAhrs(std::string name,
    4039           uint32_t dev_id, uint8_t priority);
    4140
  • trunk/lib/FlairFilter/src/UavMultiplex.cpp

    r45 r137  
    3939namespace filter {
    4040
    41 UavMultiplex::UavMultiplex(const core::FrameworkManager *parent,
    42                            std::string name)
    43     : IODevice(parent, name) {
    44   pimpl_ = new UavMultiplex_impl(parent, this, name);
     41UavMultiplex::UavMultiplex(std::string name)
     42    : IODevice(getFrameworkManager(), name) {
     43  pimpl_ = new UavMultiplex_impl(this, name);
    4544}
    4645
  • trunk/lib/FlairFilter/src/UavMultiplex.h

    r15 r137  
    1919namespace flair {
    2020namespace core {
    21 class FrameworkManager;
    2221class io_data;
    2322}
     
    4140  * \brief Constructor
    4241  *
    43   * Construct a uav multiplexing
    44   *
    45   * \param parent parent
     42  * Construct a uav multiplexing. It will be child of the FrameworkManager.
     43  *
    4644  * \param name name
    4745  */
    48   UavMultiplex(const core::FrameworkManager *parent, std::string name);
     46  UavMultiplex(std::string name);
    4947
    5048  /*!
  • trunk/lib/FlairFilter/src/UavMultiplex_impl.cpp

    r15 r137  
    3333using namespace flair::filter;
    3434
    35 UavMultiplex_impl::UavMultiplex_impl(const FrameworkManager *parent,
    36                                      UavMultiplex *self, std::string name) {
     35UavMultiplex_impl::UavMultiplex_impl(UavMultiplex *self, std::string name) {
    3736  input = new cvmatrix(self, 7, 1, floatType);
    3837  multiplexcombobox = NULL;
     
    4039
    4140  // station sol
    42   main_tab = new Tab(parent->GetTabWidget(), name);
     41  main_tab = new Tab(getFrameworkManager()->GetTabWidget(), name);
    4342  tabwidget = new TabWidget(main_tab->NewRow(), "UavMultiplex");
    4443  setup_tab = new Tab(tabwidget, "Setup");
  • trunk/lib/FlairFilter/src/X4X8Multiplex.cpp

    r15 r137  
    2626namespace filter {
    2727
    28 X4X8Multiplex::X4X8Multiplex(const FrameworkManager *parent, std::string name,
    29                              UavType_t type)
    30     : UavMultiplex(parent, name) {
     28X4X8Multiplex::X4X8Multiplex(std::string name,UavType_t type)
     29    : UavMultiplex( name) {
    3130  int nb_mot;
    3231
  • trunk/lib/FlairFilter/src/X4X8Multiplex.h

    r15 r137  
    5959  * \brief Constructor
    6060  *
    61   * Construct a X4 and X8 multiplexing
     61  * Construct a X4 and X8 multiplexing. It will be child of the FrameworkManager.
    6262  *
    63   * \param parent parent
    6463  * \param name name
    6564  * \param type type
    6665  */
    67   X4X8Multiplex(const core::FrameworkManager *parent, std::string name,
    68                 UavType_t type);
     66  X4X8Multiplex(std::string name, UavType_t type);
    6967
    7068  /*!
  • trunk/lib/FlairFilter/src/unexported/UavMultiplex_impl.h

    r15 r137  
    4545  * Construct a uav multiplexing
    4646  *
    47   * \param parent parent
     47  * \param self UavMultiplex
    4848  * \param name name
    4949  */
    50   UavMultiplex_impl(const flair::core::FrameworkManager *parent,
    51                     flair::filter::UavMultiplex *self, std::string name);
     50  UavMultiplex_impl(flair::filter::UavMultiplex *self, std::string name);
    5251
    5352  /*!
Note: See TracChangeset for help on using the changeset viewer.