Changeset 137 in flair-src for trunk/tools/Controller/Mavlink/src

Timestamp:

02/14/17 15:06:20 (7 years ago)

Author:

Sanahuja Guillaume

Message:

singleton manager

Location:

trunk/tools/Controller/Mavlink/src

Files:

• Forwarder.cpp (modified) (1 diff)
• Forwarder.h (modified) (2 diffs)
• GuiFlair.cpp (modified) (2 diffs)
• GuiFlair.h (modified) (2 diffs)
• GuiGcs.cpp (modified) (2 diffs)
• GuiGcs.h (modified) (2 diffs)
• GuiInterface.cpp (modified) (1 diff)
• GuiInterface.h (modified) (2 diffs)
• main.cpp (modified) (2 diffs)

trunk/tools/Controller/Mavlink/src/Forwarder.cpp

@@ -28 +28 @@
 using namespace flair::core;
 
-Forwarder::Forwarder(const FrameworkManager *parent, string name, string &inputAddress,
+Forwarder::Forwarder(string name, string &inputAddress,
                                          int inputPort, string &outputAddress, int outputPort):
-                                         Thread(parent, name, 6), inputAddress(inputAddress), 
+                                         Thread(getFrameworkManager(), name, 6), inputAddress(inputAddress), 
                                          inputPort(inputPort), outputAddress(outputAddress),
                                          outputPort(outputPort) {

trunk/tools/Controller/Mavlink/src/Forwarder.h

@@ -25 +25 @@
 namespace flair {
 namespace core {
-  class FrameworkManager;
   class Socket;
 }
@@ -33 +32 @@
 public:
 
-  Forwarder(const flair::core::FrameworkManager *parent, std::string name,
+  Forwarder(std::string name,
                         std::string &inputAddress, int inputPort,
                         std::string &outputAddress, int outputPort);

trunk/tools/Controller/Mavlink/src/GuiFlair.cpp

@@ -20 +20 @@
 #include "GuiInterface.h"
 
-#include <FrameworkManager.h>
 #include <Socket.h>
 
@@ -31 +30 @@
 using namespace flair::gui;
 
-GuiFlair::GuiFlair(const FrameworkManager *parent, string name):
-                                   GuiInterface(parent, name) {
+GuiFlair::GuiFlair(string name):
+                                   GuiInterface(name) {
         cout << "MavPlanner GuiFlair constructor" << endl;
 

trunk/tools/Controller/Mavlink/src/GuiFlair.h

@@ -26 +26 @@
 namespace flair {
 namespace core {
-  class FrameworkManager;
   class Socket;
 }
@@ -34 +33 @@
 public:
 
-  GuiFlair(const flair::core::FrameworkManager *parent, std::string name);
+  GuiFlair(std::string name);
   ~GuiFlair();
 

trunk/tools/Controller/Mavlink/src/GuiGcs.cpp

@@ -21 +21 @@
 
 #include <Socket.h>
-#include <FrameworkManager.h>
 
 #include "MavlinkUDP.h"
@@ -36 +35 @@
 const std::string delimiter = "|";
 
-GuiGcs::GuiGcs(const FrameworkManager *parent, string name,
+GuiGcs::GuiGcs(string name,
                            std::string &outputAddress, int outputPort):
-                           GuiInterface(parent, name) {
+                           GuiInterface(name) {
   cout << "MavPlanner GuiGcs constructor" << endl;
   //outputSocket = new Socket((Thread *)this, "output socket", outputAddress + ":" + to_string(outputPort));

trunk/tools/Controller/Mavlink/src/GuiGcs.h

@@ -32 +32 @@
 namespace flair {
 namespace core {
-  class FrameworkManager;
   class Socket;
 }
@@ -40 +39 @@
 public:
 
-  GuiGcs(const flair::core::FrameworkManager *parent, std::string name,
+  GuiGcs(std::string name,
                  std::string &outputAddress, int outputPort);
   ~GuiGcs();

trunk/tools/Controller/Mavlink/src/GuiInterface.cpp

@@ -39 +39 @@
 using namespace std;
 
-GuiInterface::GuiInterface(const FrameworkManager *parent, string name)
-                  : Thread(parent, name, 6),
-                  mainTab(new Tab(parent->GetTabWidget(), name)) {
+GuiInterface::GuiInterface(string name)
+                  : Thread(getFrameworkManager(), name, 6),
+                  mainTab(new Tab(getFrameworkManager()->GetTabWidget(), name)) {
 
   tabWidget = new TabWidget(mainTab->NewRow(), name);

trunk/tools/Controller/Mavlink/src/GuiInterface.h

@@ -24 +24 @@
 namespace flair {
 namespace core {
-  class FrameworkManager;
   class Socket;
 }
@@ -42 +41 @@
 public:
 
-  GuiInterface(const flair::core::FrameworkManager *parent, std::string name);
+  GuiInterface(std::string name);
   ~GuiInterface();
 

trunk/tools/Controller/Mavlink/src/main.cpp

@@ -56 +56 @@
 
   if(mode == "forward") {
-    Forwarder *guiForwarder = new Forwarder(manager, "Forwarder",
+    Forwarder *guiForwarder = new Forwarder("Forwarder",
                                            inputAddress, inputPort,
                                            outputAddress, outputPort);
@@ -66 +66 @@
     GuiInterface *guiHandler;
     if(mode == "flair") {
-      guiHandler = new GuiFlair(manager, "GuiFlair");
+      guiHandler = new GuiFlair("GuiFlair");
     } else if (mode == "gcs") {
-      guiHandler = new GuiGcs(manager, "GuiGcs", outputAddress, outputPort);
+      guiHandler = new GuiGcs("GuiGcs", outputAddress, outputPort);
     } else {
       //ERROR