Changeset 94 in flair-dev for trunk/include/FlairSensorActuator

Timestamp:

Jan 8, 2019, 10:14:12 AM (6 years ago)

Author:

Sanahuja Guillaume

Message:

draw vrpn axis in simulator

Location:

trunk/include/FlairSensorActuator

Files:

• SimuBldc.h (deleted)
• SimuCamera.h (deleted)
• SimuGps.h (deleted)
• SimuImu.h (deleted)
• SimuLaser.h (deleted)
• SimuPressureSensor.h (deleted)
• SimuUs.h (deleted)
• SimulatedBldc.h (added)
• SimulatedCamera.h (added)
• SimulatedGps.h (added)
• SimulatedImu.h (added)
• SimulatedLaser.h (added)
• SimulatedPressureSensor.h (added)
• SimulatedUs.h (added)
• VrpnObject.h (modified) (4 diffs)

trunk/include/FlairSensorActuator/VrpnObject.h

@@ -16 +16 @@
 
 #include <IODevice.h>
+#include <VrpnClient.h>
 #include <Vector3D.h>
 #include <stdint.h>
@@ -32 +33 @@
 
 class VrpnObject_impl;
-class VrpnClient_impl;
 
 namespace flair {
@@ -45 +45 @@
 class VrpnObject : public core::IODevice {
   friend class ::VrpnObject_impl;
-  friend class ::VrpnClient_impl;
 
 public:
@@ -55 +54 @@
   * \param name VRPN object name, should be the same as defined in the server
   * \param tab Tab for the user interface
+  * \param client VrpnClient of the connection, if unspecified, use the default one
   */
   VrpnObject(std::string name,
-             const gui::TabWidget *tab);
+             const gui::TabWidget *tab,sensor::VrpnClient *client=GetVrpnClient());
 
   /*!
   * \brief Constructor
   *
-  * Construct a VrpnObject. Connection is done by IP.
+  * Construct a VrpnObject. Connection is done by xbee.
   *
   * \param name name
-  * \param id VRPN object id, should be the same as defined in the server
+  * \param id VRPN object id, should be the same as defined in the xbee bridge
   * \param tab Tab for the user interface
+  * \param client VrpnClient of the connection, if unspecified, use the default one
   */
   VrpnObject(std::string name, uint8_t id,
-             const gui::TabWidget *tab);
+             const gui::TabWidget *tab,sensor::VrpnClient *client=GetVrpnClient());
 
   /*!