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

Timestamp:

Feb 14, 2017, 3:06:20 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

singleton manager

Location:

trunk/lib/FlairFilter/src

Files:

• Gx3_25_ahrs.cpp (modified) (2 diffs)
• Gx3_25_ahrs.h (modified) (2 diffs)
• SimuAhrs.cpp (modified) (2 diffs)
• SimuAhrs.h (modified) (1 diff)
• UavMultiplex.cpp (modified) (1 diff)
• UavMultiplex.h (modified) (2 diffs)
• UavMultiplex_impl.cpp (modified) (2 diffs)
• X4X8Multiplex.cpp (modified) (1 diff)
• X4X8Multiplex.h (modified) (1 diff)
• unexported/UavMultiplex_impl.h (modified) (1 diff)

trunk/lib/FlairFilter/src/Gx3_25_ahrs.cpp

@@ -17 +17 @@
 
 #include "Gx3_25_ahrs.h"
-#include <FrameworkManager.h>
 #include <AhrsData.h>
 #include <OneAxisRotation.h>
@@ -28 +27 @@
 namespace filter {
 
-Gx3_25_ahrs::Gx3_25_ahrs(const FrameworkManager *parent, string name,
+Gx3_25_ahrs::Gx3_25_ahrs(string name,
                          SerialPort *serialport, Gx3_25_imu::Command_t command,
                          uint8_t priority)
-    : Ahrs(new Gx3_25_imu(parent, name, serialport, command, priority), name) {}
+    : Ahrs(new Gx3_25_imu( name, serialport, command, priority), name) {}
 
 Gx3_25_ahrs::~Gx3_25_ahrs() {}

trunk/lib/FlairFilter/src/Gx3_25_ahrs.h

@@ -30 +30 @@
   * \brief Constructor
   *
-  * Construct an Ahrs for 3dmgx3-25
+  * Construct an Ahrs for 3dmgx3-25. It will be child of the FrameworkManager.
   *
-  * \param parent parent
   * \param name name
   * \param serialport Imu SerialPort
@@ -38 +37 @@
   * \param priority priority of the Gx3_25_imu Thread
   */
-  Gx3_25_ahrs(const core::FrameworkManager *parent, std::string name,
+  Gx3_25_ahrs(std::string name,
               core::SerialPort *serialport,
               sensor::Gx3_25_imu::Command_t command, uint8_t priority);

trunk/lib/FlairFilter/src/SimuAhrs.cpp

@@ -18 +18 @@
 #include "SimuAhrs.h"
 #include "SimuImu.h"
-#include <FrameworkManager.h>
 #include <AhrsData.h>
 
@@ -28 +27 @@
 namespace filter {
 
-SimuAhrs::SimuAhrs(const FrameworkManager *parent, string name, uint32_t dev_id,
+SimuAhrs::SimuAhrs(string name, uint32_t dev_id,
                    uint8_t priority)
-    : Ahrs(new SimuImu(parent, name, dev_id, priority), name) {}
+    : Ahrs(new SimuImu(name, dev_id, priority), name) {}
 
 SimuAhrs::~SimuAhrs() {}

trunk/lib/FlairFilter/src/SimuAhrs.h

@@ -30 +30 @@
   * \brief Constructor
   *
-  * Construct a simulation Ahrs.
+  * Construct a simulation Ahrs. It will be child of the FrameworkManager.
   *
-  * \param parent parent
   * \param name name
   * \param dev_id number id of the simulated Ahrs
   * \param priority priority of the SimuImu Thread
   */
-  SimuAhrs(const core::FrameworkManager *parent, std::string name,
+  SimuAhrs(std::string name,
            uint32_t dev_id, uint8_t priority);
 

trunk/lib/FlairFilter/src/UavMultiplex.cpp

@@ -39 +39 @@
 namespace filter {
 
-UavMultiplex::UavMultiplex(const core::FrameworkManager *parent,
-                           std::string name)
-    : IODevice(parent, name) {
-  pimpl_ = new UavMultiplex_impl(parent, this, name);
+UavMultiplex::UavMultiplex(std::string name)
+    : IODevice(getFrameworkManager(), name) {
+  pimpl_ = new UavMultiplex_impl(this, name);
 }
 

trunk/lib/FlairFilter/src/UavMultiplex.h

@@ -19 +19 @@
 namespace flair {
 namespace core {
-class FrameworkManager;
 class io_data;
 }
@@ -41 +40 @@
   * \brief Constructor
   *
-  * Construct a uav multiplexing
-  *
-  * \param parent parent
+  * Construct a uav multiplexing. It will be child of the FrameworkManager.
+  *
   * \param name name
   */
-  UavMultiplex(const core::FrameworkManager *parent, std::string name);
+  UavMultiplex(std::string name);
 
   /*!

trunk/lib/FlairFilter/src/UavMultiplex_impl.cpp

@@ -33 +33 @@
 using namespace flair::filter;
 
-UavMultiplex_impl::UavMultiplex_impl(const FrameworkManager *parent,
-                                     UavMultiplex *self, std::string name) {
+UavMultiplex_impl::UavMultiplex_impl(UavMultiplex *self, std::string name) {
   input = new cvmatrix(self, 7, 1, floatType);
   multiplexcombobox = NULL;
@@ -40 +39 @@
 
   // station sol
-  main_tab = new Tab(parent->GetTabWidget(), name);
+  main_tab = new Tab(getFrameworkManager()->GetTabWidget(), name);
   tabwidget = new TabWidget(main_tab->NewRow(), "UavMultiplex");
   setup_tab = new Tab(tabwidget, "Setup");

trunk/lib/FlairFilter/src/X4X8Multiplex.cpp

@@ -26 +26 @@
 namespace filter {
 
-X4X8Multiplex::X4X8Multiplex(const FrameworkManager *parent, std::string name,
-                             UavType_t type)
-    : UavMultiplex(parent, name) {
+X4X8Multiplex::X4X8Multiplex(std::string name,UavType_t type)
+    : UavMultiplex( name) {
   int nb_mot;
 

trunk/lib/FlairFilter/src/X4X8Multiplex.h

@@ -59 +59 @@
   * \brief Constructor
   *
-  * Construct a X4 and X8 multiplexing
+  * Construct a X4 and X8 multiplexing. It will be child of the FrameworkManager.
   *
-  * \param parent parent
   * \param name name
   * \param type type
   */
-  X4X8Multiplex(const core::FrameworkManager *parent, std::string name,
-                UavType_t type);
+  X4X8Multiplex(std::string name, UavType_t type);
 
   /*!

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

@@ -45 +45 @@
   * Construct a uav multiplexing
   *
-  * \param parent parent
+  * \param self UavMultiplex
   * \param name name
   */
-  UavMultiplex_impl(const flair::core::FrameworkManager *parent,
-                    flair::filter::UavMultiplex *self, std::string name);
+  UavMultiplex_impl(flair::filter::UavMultiplex *self, std::string name);
 
   /*!