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

Timestamp:

07/28/16 17:55:31 (8 years ago)

Author:

Sanahuja Guillaume

Message:

simu gps

Location:

trunk/lib/FlairCore/src

Files:

• FrameworkManager.cpp (modified) (2 diffs)
• FrameworkManager.h (modified) (3 diffs)
• FrameworkManager_impl.cpp (modified) (3 diffs)
• unexported/FrameworkManager_impl.h (modified) (1 diff)

trunk/lib/FlairCore/src/FrameworkManager.cpp

@@ -133 +133 @@
 }
 
-void FrameworkManager::SetupConnection(string address, uint16_t port,
+void FrameworkManager::SetupConnection(string address, uint16_t port,Time watchdogTimeout,
                                        size_t rcv_buf_size) {
   pimpl_->SetupConnection(address, port, rcv_buf_size);
@@ -143 +143 @@
 
 gui::TabWidget *FrameworkManager::GetTabWidget(void) const {
+  if(pimpl_->tabwidget==NULL) Err("SetupUserInterface must be called before\n");
   return pimpl_->tabwidget;
 }

trunk/lib/FlairCore/src/FrameworkManager.h

@@ -19 +19 @@
 
 namespace flair {
-namespace gui {
-class TabWidget;
-class SendData;
-}
+  namespace gui {
+    class TabWidget;
+    class SendData;
+  }
 }
 namespace flair {
@@ -69 +69 @@
   *
   * Call this method just after the constructor of this class. If this method is
-  *not called, the program will run headless.
+  * not called, the program will run headless.
+  * If this method is called, SetupUserInterface must also be called after this.
   *
   * \param address address of ground station
   * \param port port of ground station
+  * \param watchdogTimeout watchdog timeout for the connection, passing TIME_INFINITE will disable the watchdog
   * \param rcv_buf_size receive buffer size
   */
-  void SetupConnection(std::string address, uint16_t port,
+  void SetupConnection(std::string address, uint16_t port,Time watchdogTimeout=(Time)1000000000,
                        size_t rcv_buf_size = 10000);
 
@@ -82 +84 @@
   *
   * If this method is called after SetupConnection, Widgets will be displayed in
-  *the ground station.
-  * Otherwise, it will run headless, but default values of Widgets will be taken
-  *from the xml file.
+  * the ground station.
+  * If this method is called and SetupConnection was not called, it will run headless but default values of Widgets will be taken
+  * from the xml file.
+  * If this method is not called, Widgets will not be available. Constructing an object based on Widget class will fail.
   *
   * \param xml_file xml file for default values of Widgets

trunk/lib/FlairCore/src/FrameworkManager_impl.cpp

@@ -103 +103 @@
   gcs_watchdog = NULL;
   _this = this;
+  tabwidget=NULL;
 
   // Avoids memory swapping for this program
@@ -193 +194 @@
 }
 
-void FrameworkManager_impl::SetupConnection(string address, uint16_t port,
+void FrameworkManager_impl::SetupConnection(string address, uint16_t port,Time watchdogTimeout,
                                             size_t rcv_buf_size) {
   UDT::startup();
@@ -804 +805 @@
         if (tmp.running == true) // start logging
         {
-          filename =
-              caller->log_path + "/" + caller->FileName(tmp.device) + ".dbt";
-          printf("Creating log file %s (log size %i)\n", filename.c_str(),
-                 (int)tmp.size);
+          filename = caller->log_path + "/" + caller->FileName(tmp.device) + ".dbt";
+          printf("Creating log file %s (log size %i)\n", filename.c_str(), (int)tmp.size);
           tmp.dbtFile = inithdFile((char *)filename.c_str(), UAV, tmp.size);
           logs.push_back(tmp);

trunk/lib/FlairCore/src/unexported/FrameworkManager_impl.h

@@ -43 +43 @@
   FrameworkManager_impl(flair::core::FrameworkManager *self, std::string name);
   ~FrameworkManager_impl();
-  void SetupConnection(std::string address, uint16_t port,
+  void SetupConnection(std::string address, uint16_t port,flair::core::Time watchdogTimeout,
                        size_t rcv_buf_size = 10000);
   void SetupUserInterface(std::string xml_file);