Changeset 286 in flair-src for trunk/lib/FlairSensorActuator/src
- Timestamp:
- Jan 8, 2019, 10:13:03 AM (6 years ago)
- Location:
- trunk/lib/FlairSensorActuator/src
- Files:
-
- 4 edited
- 14 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/FlairSensorActuator/src/SimulatedBldc.cpp
r285 r286 4 4 // %flair:license} 5 5 // created: 2014/02/07 6 // filename: Simu Bldc.cpp6 // filename: SimulatedBldc.cpp 7 7 // 8 8 // author: Guillaume Sanahuja … … 17 17 #ifdef CORE2_64 18 18 19 #include "Simu Bldc.h"19 #include "SimulatedBldc.h" 20 20 #include <FrameworkManager.h> 21 21 #include <GridLayout.h> … … 35 35 namespace actuator { 36 36 37 Simu Bldc::SimuBldc(const IODevice *parent, Layout *layout, string name,37 SimulatedBldc::SimulatedBldc(const IODevice *parent, Layout *layout, string name, 38 38 uint8_t motors_count, uint32_t modelId,uint32_t deviceId) 39 39 : Bldc(parent, layout, name, motors_count) { … … 52 52 } 53 53 54 Simu Bldc::~SimuBldc() {54 SimulatedBldc::~SimulatedBldc() { 55 55 if(buf!=NULL) free(buf); 56 56 } 57 57 58 string Simu Bldc::ShMemName(uint32_t modelId,uint32_t deviceId) {58 string SimulatedBldc::ShMemName(uint32_t modelId,uint32_t deviceId) { 59 59 ostringstream dev_name; 60 60 dev_name << "simu" << modelId << "_bldc_" << deviceId; … … 62 62 } 63 63 64 void Simu Bldc::SetMotors(float *value) {64 void SimulatedBldc::SetMotors(float *value) { 65 65 float *values=(float*)buf; 66 66 for (int i = 0; i < MotorsCount(); i++) values[i] = k->Value() * value[i]; -
trunk/lib/FlairSensorActuator/src/SimulatedBldc.h
r285 r286 4 4 // %flair:license} 5 5 /*! 6 * \file Simu Bldc.h6 * \file SimulatedBldc.h 7 7 * \brief Class for a simulation bldc 8 8 * \author Guillaume Sanahuja, Copyright Heudiasyc UMR UTC/CNRS 7253 … … 11 11 */ 12 12 13 #ifndef SIMU BLDC_H14 #define SIMU BLDC_H13 #ifndef SIMULATEDBLDC_H 14 #define SIMULATEDBLDC_H 15 15 16 16 #include <Bldc.h> … … 30 30 namespace flair { 31 31 namespace actuator { 32 /*! \class Simu Bldc32 /*! \class SimulatedBldc 33 33 * 34 34 * \brief Class for a simulation bldc 35 35 * 36 36 */ 37 class Simu Bldc : public Bldc {37 class SimulatedBldc : public Bldc { 38 38 public: 39 39 /*! 40 40 * \brief Constructor 41 41 * 42 * Construct a Simu Bldc42 * Construct a SimulatedBldc 43 43 * 44 44 * \param parent parent … … 49 49 * \param deviceId Bldc id of the Model 50 50 */ 51 Simu Bldc(const core::IODevice *parent, gui::Layout *layout, std::string name,51 SimulatedBldc(const core::IODevice *parent, gui::Layout *layout, std::string name, 52 52 uint8_t motors_count, uint32_t modelId,uint32_t deviceId); 53 53 … … 56 56 * 57 57 */ 58 ~Simu Bldc();58 ~SimulatedBldc(); 59 59 60 60 /*! … … 95 95 } // end namespace actuator 96 96 } // end namespace flair 97 #endif // SIMU BLDC_H97 #endif // SIMULATEDBLDC_H -
trunk/lib/FlairSensorActuator/src/SimulatedCamera.cpp
r285 r286 4 4 // %flair:license} 5 5 // created: 2014/03/06 6 // filename: Simu Camera.cpp6 // filename: SimulatedCamera.cpp 7 7 // 8 8 // author: Guillaume Sanahuja … … 17 17 #ifdef CORE2_64 18 18 19 #include "Simu Camera.h"19 #include "SimulatedCamera.h" 20 20 #include <FrameworkManager.h> 21 21 #include <GroupBox.h> … … 31 31 namespace sensor { 32 32 33 Simu Camera::SimuCamera(string name,33 SimulatedCamera::SimulatedCamera(string name, 34 34 uint16_t width, uint16_t height, uint8_t channels, 35 35 uint32_t modelId,uint32_t deviceId, uint8_t priority) … … 42 42 output->img->imageData = shmemReadBuf; 43 43 44 ostringstream dev_name;45 dev_name << "simu" << modelId << "_cam_" << deviceId;46 44 shmem = new SharedMem((Thread *)this,ShMemName(modelId, deviceId), buf_size, SharedMem::Type::producerConsumer); 47 45 … … 50 48 51 49 52 Simu Camera::~SimuCamera() {50 SimulatedCamera::~SimulatedCamera() { 53 51 SafeStop(); 54 52 Join(); … … 56 54 } 57 55 58 string Simu Camera::ShMemName(uint32_t modelId,uint32_t deviceId) {56 string SimulatedCamera::ShMemName(uint32_t modelId,uint32_t deviceId) { 59 57 ostringstream dev_name; 60 58 dev_name << "simu" << modelId << "_cam_" << deviceId; … … 62 60 } 63 61 64 void Simu Camera::Run(void) {62 void SimulatedCamera::Run(void) { 65 63 Time time; 66 64 -
trunk/lib/FlairSensorActuator/src/SimulatedCamera.h
r285 r286 4 4 // %flair:license} 5 5 /*! 6 * \file Simu Camera.h6 * \file SimulatedCamera.h 7 7 * \brief Class for a simulation camera 8 8 * \author Guillaume Sanahuja, Copyright Heudiasyc UMR UTC/CNRS 7253 … … 11 11 */ 12 12 13 #ifndef SIMU CAMERA_H14 #define SIMU CAMERA_H13 #ifndef SIMULATEDCAMERA_H 14 #define SIMULATEDCAMERA_H 15 15 16 16 #include <Camera.h> … … 26 26 namespace flair { 27 27 namespace sensor { 28 /*! \class Simu Camera28 /*! \class SimulatedCamera 29 29 * 30 30 * \brief Class for a simulation camera 31 31 */ 32 class Simu Camera : public core::Thread, public Camera {32 class SimulatedCamera : public core::Thread, public Camera { 33 33 public: 34 34 /*! 35 35 * \brief Constructor 36 36 * 37 * Construct a Simu Camera.37 * Construct a SimulatedCamera. 38 38 * It will be child of the FrameworkManager. 39 39 * … … 46 46 * \param priority priority of the Thread 47 47 */ 48 Simu Camera(std::string name,48 SimulatedCamera(std::string name, 49 49 uint16_t width, uint16_t height, uint8_t channels, uint32_t modelId,uint32_t deviceId, 50 50 uint8_t priority); … … 55 55 * 56 56 */ 57 ~Simu Camera();57 ~SimulatedCamera(); 58 58 59 59 protected: … … 89 89 } // end namespace sensor 90 90 } // end namespace flair 91 #endif // SIMU CAMERA_H91 #endif // SIMULATEDCAMERA_H -
trunk/lib/FlairSensorActuator/src/SimulatedGps.cpp
r285 r286 4 4 // %flair:license} 5 5 // created: 2014/05/26 6 // filename: Simu Gps.cpp6 // filename: SimulatedGps.cpp 7 7 // 8 8 // author: Guillaume Sanahuja … … 17 17 #ifdef CORE2_64 18 18 19 #include "Simu Gps.h"19 #include "SimulatedGps.h" 20 20 #include <FrameworkManager.h> 21 21 #include <GpsData.h> … … 38 38 namespace sensor { 39 39 40 Simu Gps::SimuGps(string name,40 SimulatedGps::SimulatedGps(string name, 41 41 NmeaGps::NMEAFlags_t NMEAFlags, uint32_t modelId,uint32_t deviceId,uint8_t priority) 42 42 : NmeaGps(name, NMEAFlags),Thread(getFrameworkManager(), name, priority) { … … 57 57 58 58 59 Simu Gps::~SimuGps() {59 SimulatedGps::~SimulatedGps() { 60 60 SafeStop(); 61 61 Join(); 62 62 } 63 63 64 string Simu Gps::ShMemName(uint32_t modelId,uint32_t deviceId) {64 string SimulatedGps::ShMemName(uint32_t modelId,uint32_t deviceId) { 65 65 ostringstream dev_name; 66 66 dev_name << "simu" << modelId << "_gps_" << deviceId; … … 68 68 } 69 69 70 void Simu Gps::Run(void) {70 void SimulatedGps::Run(void) { 71 71 gps_states_t state; 72 72 char buf[512]; -
trunk/lib/FlairSensorActuator/src/SimulatedGps.h
r285 r286 4 4 // %flair:license} 5 5 /*! 6 * \file Simu Gps.h6 * \file SimulatedGps.h 7 7 * \brief Class for a simulation GPS 8 8 * \author Guillaume Sanahuja, Copyright Heudiasyc UMR UTC/CNRS 7253 … … 11 11 */ 12 12 13 #ifndef S IMUGPS_H14 #define S IMUGPS_H13 #ifndef SimulatedGPS_H 14 #define SimulatedGPS_H 15 15 16 16 #include <Thread.h> … … 29 29 namespace flair { 30 30 namespace sensor { 31 /*! \class Simu Gps31 /*! \class SimulatedGps 32 32 * 33 33 * \brief Class for a simulation GPS 34 34 */ 35 class Simu Gps : public core::Thread, public NmeaGps {35 class SimulatedGps : public core::Thread, public NmeaGps { 36 36 public: 37 37 /*! … … 47 47 * \param priority priority of the Thread 48 48 */ 49 Simu Gps(std::string name,49 SimulatedGps(std::string name, 50 50 NmeaGps::NMEAFlags_t NMEAFlags, uint32_t modelId,uint32_t deviceId,uint8_t priority); 51 51 … … 54 54 * 55 55 */ 56 ~Simu Gps();56 ~SimulatedGps(); 57 57 58 58 private: … … 90 90 } // end namespace sensor 91 91 } // end namespace flair 92 #endif // SIMU GPS_H92 #endif // SIMULATEDGPS_H -
trunk/lib/FlairSensorActuator/src/SimulatedImu.cpp
r285 r286 4 4 // %flair:license} 5 5 // created: 2014/02/07 6 // filename: Simu Imu.cpp6 // filename: SimulatedImu.cpp 7 7 // 8 8 // author: Guillaume Sanahuja … … 17 17 #ifdef CORE2_64 18 18 19 #include "Simu Imu.h"19 #include "SimulatedImu.h" 20 20 #include <FrameworkManager.h> 21 21 #include <ImuData.h> … … 35 35 namespace sensor { 36 36 37 Simu Imu::SimuImu(string name, uint32_t modelId,uint32_t deviceId,37 SimulatedImu::SimulatedImu(string name, uint32_t modelId,uint32_t deviceId, 38 38 uint8_t priority) 39 39 : Imu(name,false), Thread(getFrameworkManager(), name, priority) { … … 47 47 } 48 48 49 Simu Imu::~SimuImu() {49 SimulatedImu::~SimulatedImu() { 50 50 SafeStop(); 51 51 Join(); 52 52 } 53 53 54 string Simu Imu::ShMemName(uint32_t modelId,uint32_t deviceId) {54 string SimulatedImu::ShMemName(uint32_t modelId,uint32_t deviceId) { 55 55 ostringstream dev_name; 56 56 dev_name << "simu" << modelId << "_imu_" << deviceId; … … 58 58 } 59 59 60 void Simu Imu::Run(void) {60 void SimulatedImu::Run(void) { 61 61 imu_states_t state; 62 62 ImuData *imuData; -
trunk/lib/FlairSensorActuator/src/SimulatedImu.h
r285 r286 4 4 // %flair:license} 5 5 /*! 6 * \file Simu Imu.h6 * \file SimulatedImu.h 7 7 * \brief Class for a simulation Imu 8 8 * \author Guillaume Sanahuja, Copyright Heudiasyc UMR UTC/CNRS 7253 … … 11 11 */ 12 12 13 #ifndef SIMU IMU_H14 #define SIMU IMU_H13 #ifndef SIMULATEDIMU_H 14 #define SIMULATEDIMU_H 15 15 16 16 #include <Imu.h> … … 29 29 namespace flair { 30 30 namespace sensor { 31 /*! \class Simu Imu31 /*! \class SimulatedImu 32 32 * 33 33 * \brief Class for a simulation Imu 34 34 */ 35 class Simu Imu : public Imu, public core::Thread {35 class SimulatedImu : public Imu, public core::Thread { 36 36 public: 37 37 /*! 38 38 * \brief Constructor 39 39 * 40 * Construct a Simu Imu.40 * Construct a SimulatedImu. 41 41 * It will be child of the FrameworkManager. 42 42 * … … 46 46 * \param priority priority of the Thread 47 47 */ 48 Simu Imu(std::string name,48 SimulatedImu(std::string name, 49 49 uint32_t modelId,uint32_t deviceId, uint8_t priority); 50 50 … … 53 53 * 54 54 */ 55 ~Simu Imu();55 ~SimulatedImu(); 56 56 57 57 private: … … 97 97 } // end namespace sensor 98 98 } // end namespace flair 99 #endif // SIMU IMU_H99 #endif // SIMULATEDIMU_H -
trunk/lib/FlairSensorActuator/src/SimulatedLaser.cpp
r285 r286 4 4 // %flair:license} 5 5 // created: 2014/02/07 6 // filename: Simu Us.cpp6 // filename: SimulatedUs.cpp 7 7 // 8 8 // author: Guillaume Sanahuja … … 17 17 #ifdef CORE2_64 18 18 19 #include "Simu Laser.h"19 #include "SimulatedLaser.h" 20 20 #include <FrameworkManager.h> 21 21 #include <SpinBox.h> … … 33 33 namespace sensor { 34 34 35 Simu Laser::SimuLaser(string name,35 SimulatedLaser::SimulatedLaser(string name, 36 36 uint32_t modelId,uint32_t deviceId, uint8_t priority) 37 37 : Thread(getFrameworkManager(), name, priority), LaserRangeFinder(name) { … … 44 44 } 45 45 46 Simu Laser::~SimuLaser() {46 SimulatedLaser::~SimulatedLaser() { 47 47 SafeStop(); 48 48 Join(); 49 49 } 50 50 51 string Simu Laser::ShMemName(uint32_t modelId,uint32_t deviceId) {51 string SimulatedLaser::ShMemName(uint32_t modelId,uint32_t deviceId) { 52 52 ostringstream dev_name; 53 53 dev_name << "simu" << modelId << "_laser_" << deviceId; … … 55 55 } 56 56 57 void Simu Laser::Run(void) {57 void SimulatedLaser::Run(void) { 58 58 float z[360]; 59 59 -
trunk/lib/FlairSensorActuator/src/SimulatedLaser.h
r285 r286 4 4 // %flair:license} 5 5 /*! 6 * \file Simu Us.h6 * \file SimulatedUs.h 7 7 * \brief Class for a simulation UsRangeFinder 8 8 * \author Guillaume Sanahuja, Copyright Heudiasyc UMR UTC/CNRS 7253 … … 11 11 */ 12 12 13 #ifndef SIMULA SER_H14 #define SIMULA SER_H13 #ifndef SIMULATEDLASER_H 14 #define SIMULATEDLASER_H 15 15 16 16 #include <LaserRangeFinder.h> … … 28 28 namespace flair { 29 29 namespace sensor { 30 /*! \class Simu Us30 /*! \class SimulatedUs 31 31 * 32 32 * \brief Class for a simulation UsRangeFinder 33 33 */ 34 class Simu Laser : public core::Thread, public LaserRangeFinder {34 class SimulatedLaser : public core::Thread, public LaserRangeFinder { 35 35 public: 36 36 /*! 37 37 * \brief Constructor 38 38 * 39 * Construct a Simu Us.39 * Construct a SimulatedUs. 40 40 * 41 41 * \param name name … … 44 44 * \param priority priority of the Thread 45 45 */ 46 Simu Laser(std::string name,46 SimulatedLaser(std::string name, 47 47 uint32_t modelId,uint32_t deviceId, uint8_t priority); 48 48 … … 51 51 * 52 52 */ 53 ~Simu Laser();53 ~SimulatedLaser(); 54 54 55 55 protected: … … 83 83 } // end namespace sensor 84 84 } // end namespace flair 85 #endif // SIMULA SER_H85 #endif // SIMULATEDLASER_H -
trunk/lib/FlairSensorActuator/src/SimulatedPressureSensor.cpp
r285 r286 4 4 // %flair:license} 5 5 // created: 2018/05/24 6 // filename: Simu PressureSensor.cpp6 // filename: SimulatedPressureSensor.cpp 7 7 // 8 8 // author: Guillaume Sanahuja … … 17 17 #ifdef CORE2_64 18 18 19 #include "Simu PressureSensor.h"19 #include "SimulatedPressureSensor.h" 20 20 #include <FrameworkManager.h> 21 21 #include <SpinBox.h> … … 33 33 namespace sensor { 34 34 35 Simu PressureSensor::SimuPressureSensor(string name, uint32_t modelId,uint32_t deviceId,35 SimulatedPressureSensor::SimulatedPressureSensor(string name, uint32_t modelId,uint32_t deviceId, 36 36 uint8_t priority) 37 37 : Thread(getFrameworkManager(), name, priority), PressureSensor( name) { … … 44 44 } 45 45 46 Simu PressureSensor::~SimuPressureSensor() {46 SimulatedPressureSensor::~SimulatedPressureSensor() { 47 47 SafeStop(); 48 48 Join(); 49 49 } 50 50 51 string Simu PressureSensor::ShMemName(uint32_t modelId,uint32_t deviceId) {51 string SimulatedPressureSensor::ShMemName(uint32_t modelId,uint32_t deviceId) { 52 52 ostringstream dev_name; 53 53 dev_name << "simu" << modelId << "_pressure_" << deviceId; … … 55 55 } 56 56 57 void Simu PressureSensor::Run(void) {57 void SimulatedPressureSensor::Run(void) { 58 58 float p; 59 59 -
trunk/lib/FlairSensorActuator/src/SimulatedPressureSensor.h
r285 r286 4 4 // %flair:license} 5 5 /*! 6 * \file Simu PressureSensor.h6 * \file SimulatedPressureSensor.h 7 7 * \brief Class for a simulation PressureSensor 8 8 * \author Guillaume Sanahuja, Copyright Heudiasyc UMR UTC/CNRS 7253 … … 11 11 */ 12 12 13 #ifndef SIMU PRESSURESENSOR_H14 #define SIMU PRESSURESENSOR_H13 #ifndef SIMULATEDPRESSURESENSOR_H 14 #define SIMULATEDPRESSURESENSOR_H 15 15 16 16 #include <PressureSensor.h> … … 28 28 namespace flair { 29 29 namespace sensor { 30 /*! \class Simu PressureSensor30 /*! \class SimulatedPressureSensor 31 31 * 32 32 * \brief Class for a simulation PressureSensor 33 33 */ 34 class Simu PressureSensor : public core::Thread, public PressureSensor {34 class SimulatedPressureSensor : public core::Thread, public PressureSensor { 35 35 public: 36 36 /*! 37 37 * \brief Constructor 38 38 * 39 * Construct a Simu PressureSensor.39 * Construct a SimulatedPressureSensor. 40 40 * It will be child of the FrameworkManager. 41 41 * … … 45 45 * \param priority priority of the Thread 46 46 */ 47 Simu PressureSensor(std::string name,47 SimulatedPressureSensor(std::string name, 48 48 uint32_t modelId,uint32_t deviceId, uint8_t priority); 49 49 … … 52 52 * 53 53 */ 54 ~Simu PressureSensor();54 ~SimulatedPressureSensor(); 55 55 56 56 protected: … … 84 84 } // end namespace sensor 85 85 } // end namespace flair 86 #endif // SIMU PRESSURESENSOR_H86 #endif // SIMULATEDPRESSURESENSOR_H -
trunk/lib/FlairSensorActuator/src/SimulatedUs.cpp
r285 r286 4 4 // %flair:license} 5 5 // created: 2014/02/07 6 // filename: Simu Us.cpp6 // filename: SimulatedUs.cpp 7 7 // 8 8 // author: Guillaume Sanahuja … … 17 17 #ifdef CORE2_64 18 18 19 #include "Simu Us.h"19 #include "SimulatedUs.h" 20 20 #include <FrameworkManager.h> 21 21 #include <SpinBox.h> … … 33 33 namespace sensor { 34 34 35 Simu Us::SimuUs(string name, uint32_t modelId,uint32_t deviceId,35 SimulatedUs::SimulatedUs(string name, uint32_t modelId,uint32_t deviceId, 36 36 uint8_t priority) 37 37 : Thread(getFrameworkManager(), name, priority), UsRangeFinder( name) { … … 44 44 } 45 45 46 Simu Us::~SimuUs() {46 SimulatedUs::~SimulatedUs() { 47 47 SafeStop(); 48 48 Join(); 49 49 } 50 50 51 string Simu Us::ShMemName(uint32_t modelId,uint32_t deviceId) {51 string SimulatedUs::ShMemName(uint32_t modelId,uint32_t deviceId) { 52 52 ostringstream dev_name; 53 53 dev_name << "simu" << modelId << "_us_" << deviceId; … … 55 55 } 56 56 57 void Simu Us::Run(void) {57 void SimulatedUs::Run(void) { 58 58 float z; 59 59 -
trunk/lib/FlairSensorActuator/src/SimulatedUs.h
r285 r286 4 4 // %flair:license} 5 5 /*! 6 * \file Simu Us.h6 * \file SimulatedUs.h 7 7 * \brief Class for a simulation UsRangeFinder 8 8 * \author Guillaume Sanahuja, Copyright Heudiasyc UMR UTC/CNRS 7253 … … 11 11 */ 12 12 13 #ifndef SIMU US_H14 #define SIMU US_H13 #ifndef SIMULATEDUS_H 14 #define SIMULATEDUS_H 15 15 16 16 #include <UsRangeFinder.h> … … 28 28 namespace flair { 29 29 namespace sensor { 30 /*! \class Simu Us30 /*! \class SimulatedUs 31 31 * 32 32 * \brief Class for a simulation UsRangeFinder 33 33 */ 34 class Simu Us : public core::Thread, public UsRangeFinder {34 class SimulatedUs : public core::Thread, public UsRangeFinder { 35 35 public: 36 36 /*! 37 37 * \brief Constructor 38 38 * 39 * Construct a Simu Us.39 * Construct a SimulatedUs. 40 40 * It will be child of the FrameworkManager. 41 41 * … … 45 45 * \param priority priority of the Thread 46 46 */ 47 Simu Us(std::string name,47 SimulatedUs(std::string name, 48 48 uint32_t modelId,uint32_t deviceId, uint8_t priority); 49 49 … … 52 52 * 53 53 */ 54 ~Simu Us();54 ~SimulatedUs(); 55 55 56 56 protected: … … 84 84 } // end namespace sensor 85 85 } // end namespace flair 86 #endif // SIMU US_H86 #endif // SIMULATEDUS_H -
trunk/lib/FlairSensorActuator/src/VrpnObject.cpp
r214 r286 18 18 #include "VrpnObject.h" 19 19 #include "VrpnObject_impl.h" 20 #include "VrpnClient.h"21 20 #include <string.h> 22 21 #include <Matrix.h> … … 30 29 31 30 VrpnObject::VrpnObject(string name, 32 const TabWidget *tab )33 : IODevice( GetVrpnClient(), name) {34 pimpl_ = new VrpnObject_impl(this, name, -1, tab );31 const TabWidget *tab,VrpnClient *client) 32 : IODevice(client, name) { 33 pimpl_ = new VrpnObject_impl(this, name, -1, tab,client); 35 34 AddDataToLog(pimpl_->output); 36 35 … … 39 38 40 39 VrpnObject::VrpnObject(string name, uint8_t id, 41 const TabWidget *tab )42 : IODevice( GetVrpnClient(), name) {40 const TabWidget *tab,VrpnClient *client) 41 : IODevice(client, name) { 43 42 Warn("Creation of object %s with id %i\n", name.c_str(), id); 44 pimpl_ = new VrpnObject_impl(this, name, id, tab );43 pimpl_ = new VrpnObject_impl(this, name, id, tab,client); 45 44 AddDataToLog(pimpl_->output); 46 45 -
trunk/lib/FlairSensorActuator/src/VrpnObject.h
r214 r286 16 16 17 17 #include <IODevice.h> 18 #include <VrpnClient.h> 18 19 #include <Vector3D.h> 19 20 #include <stdint.h> … … 32 33 33 34 class VrpnObject_impl; 34 class VrpnClient_impl;35 35 36 36 namespace flair { … … 45 45 class VrpnObject : public core::IODevice { 46 46 friend class ::VrpnObject_impl; 47 friend class ::VrpnClient_impl;48 47 49 48 public: … … 55 54 * \param name VRPN object name, should be the same as defined in the server 56 55 * \param tab Tab for the user interface 56 * \param client VrpnClient of the connection, if unspecified, use the default one 57 57 */ 58 58 VrpnObject(std::string name, 59 const gui::TabWidget *tab );59 const gui::TabWidget *tab,sensor::VrpnClient *client=GetVrpnClient()); 60 60 61 61 /*! 62 62 * \brief Constructor 63 63 * 64 * Construct a VrpnObject. Connection is done by IP.64 * Construct a VrpnObject. Connection is done by xbee. 65 65 * 66 66 * \param name name 67 * \param id VRPN object id, should be the same as defined in the server67 * \param id VRPN object id, should be the same as defined in the xbee bridge 68 68 * \param tab Tab for the user interface 69 * \param client VrpnClient of the connection, if unspecified, use the default one 69 70 */ 70 71 VrpnObject(std::string name, uint8_t id, 71 const gui::TabWidget *tab );72 const gui::TabWidget *tab,sensor::VrpnClient *client=GetVrpnClient()); 72 73 73 74 /*! -
trunk/lib/FlairSensorActuator/src/VrpnObject_impl.cpp
r275 r286 40 40 41 41 VrpnObject_impl::VrpnObject_impl(VrpnObject *self, 42 string name, int id, const TabWidget *tab ) {43 parent = GetVrpnClient();42 string name, int id, const TabWidget *tab,VrpnClient *client) { 43 parent = client; 44 44 this->self = self; 45 45 -
trunk/lib/FlairSensorActuator/src/unexported/VrpnObject_impl.h
r223 r286 47 47 VrpnObject_impl(flair::sensor::VrpnObject *self, 48 48 std::string name, 49 int id, const flair::gui::TabWidget *tab );49 int id, const flair::gui::TabWidget *tab,flair::sensor::VrpnClient *client); 50 50 ~VrpnObject_impl(void); 51 51
Note:
See TracChangeset
for help on using the changeset viewer.