Changeset 446 in flair-src for trunk/tools

Timestamp:

Sep 14, 2021, 11:04:41 AM (3 years ago)

Author:

Sanahuja Guillaume

Message:

vrpnlite: add headless mode and kill button

Location:

trunk/tools/VrpnLite/src

Files:

• VrpnLite.cpp (modified) (3 diffs)
• VrpnLite.h (modified) (2 diffs)
• main.cpp (modified) (4 diffs)

trunk/tools/VrpnLite/src/VrpnLite.cpp

@@ -17 +17 @@
 #include <Thread.h>
 #include <UdpSocket.h>
+#include <TabWidget.h>
+#include <Tab.h>
+#include <PushButton.h>
 #include <FrameworkManager.h>
 #include <Quaternion.h>
@@ -24 +27 @@
 using namespace flair::core;
 using namespace flair::sensor;
+using namespace flair::gui;
 
 VrpnLite::VrpnLite(int vrpnLitePort,string vrpnServerAddress): Thread(getFrameworkManager(),"VrpnLite",90) {
   vrpnclient=new VrpnClient("vrpn", vrpnServerAddress,80); 
+  Tab* tab=new Tab(vrpnclient->GetTabWidget(),"Main");
+  killButton=new PushButton(tab->NewRow(),"kill");
   dataSocket = new UdpSocket(this,"client socket",vrpnLitePort);
   vrpnclient->Start();
@@ -40 +46 @@
   
   while (!ToBeStopped()) {
+    if(killButton->Clicked()) SafeStop();
+    
     if(vrpnobjects.size()>0) {
       //wait for last one to be sure all are up to date

trunk/tools/VrpnLite/src/VrpnLite.h

@@ -22 +22 @@
     class UdpSocket;
   }
+  namespace gui {
+    class PushButton;
+  }
         namespace sensor {
                 class VrpnClient;
@@ -34 +37 @@
 
 private:
+      flair::gui::PushButton* killButton;
       void Run(void);
       flair::sensor::VrpnClient* vrpnclient;

trunk/tools/VrpnLite/src/main.cpp

@@ -24 +24 @@
 string vrpnServerAddress;
 int gcsPort,vrpnLitePort;
+bool headless;
 
 void parseOptions(int argc, char **argv);
@@ -32 +33 @@
   FrameworkManager *manager;
   manager = new FrameworkManager("vrpnforwarder");
-  manager->SetupConnection("127.0.0.1", gcsPort);
+  if(!headless) manager->SetupConnection("127.0.0.1", gcsPort);
   manager->SetupUserInterface(xml_file);
   
@@ -45 +46 @@
 void parseOptions(int argc, char **argv) {
   try {
-    CmdLine cmd("Command description message", ' ', "0.1");
+    CmdLine cmd("Command description message", ' ', "0.1",false);
 
-    ValueArg<int> vrpnLitePortArg("v", "vport","vrpn lite port", true,
-                                3884, "int");
+    ValueArg<int> vrpnLitePortArg("v", "vport","vrpn lite port", true,3884, "int");
     cmd.add(vrpnLitePortArg);
     
-    ValueArg<string> serveraddressArg("s", "saddress","server address", true,
-                                "127.0.0.1:3883", "string");
+    ValueArg<string> serveraddressArg("s", "saddress","server address", true,"127.0.0.1:3883", "string");
     cmd.add(serveraddressArg);
 
-    ValueArg<int> gcsPortArg("p", "port","local port used to connect to the ground station",
-                          false, 9000, "int");
+    ValueArg<int> gcsPortArg("p", "port","local port used to connect to the ground station",false, 9000, "int");
     cmd.add(gcsPortArg);
 
-
-    ValueArg<string> xmlArg("x", "xml", "xml file", true, "./settings.xml",
-                            "string");
+    ValueArg<string> xmlArg("x", "xml", "xml file", true, "./settings.xml","string");
     cmd.add(xmlArg);
+    
+    ValueArg<bool> headlessArg("h", "headless", "headless mode", false, false,"bool");
+    cmd.add(headlessArg);
 
     cmd.parse(argc, argv);
@@ -70 +69 @@
     gcsPort = gcsPortArg.getValue();
     xml_file = xmlArg.getValue();
+    headless = headlessArg.getValue();
 
   } catch (ArgException &e) { // catch any exceptions