Changeset 44 in flair-dev for trunk/include/FlairSensorActuator
- Timestamp:
- Jan 6, 2017, 1:58:28 PM (8 years ago)
- Location:
- trunk/include/FlairSensorActuator
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/FlairSensorActuator/Camera.h
r13 r44 19 19 20 20 namespace flair { 21 namespace gui {22 class GroupBox;23 class Tab;24 class TabWidget;25 class Picture;26 class GridLayout;27 }21 namespace gui { 22 class GroupBox; 23 class Tab; 24 class TabWidget; 25 class Picture; 26 class GridLayout; 27 } 28 28 } 29 29 … … 122 122 123 123 core::DataType const &GetOutputDataType() const; 124 124 125 /*! 126 \enum LogFormat 127 \brief log formats 128 */ 129 enum class LogFormat { 130 NONE, /*!< by default, no logging */ 131 RAW, /*!< raw format */ 132 JPG, /*!< jpg format */ 133 }; 134 135 /*! 136 * \brief Set log format 137 * 138 * Set the log format. \n 139 * Logging of the camera will be disabled if this method is not called. \n 140 * Calling this method enables logging of camera. 141 * 142 * \param LogFormat log format 143 */ 144 void SetLogFormat(LogFormat logFormat); 145 void ProcessUpdate(core::io_data* data); 125 146 protected: 126 147 /*! … … 138 159 gui::GroupBox *setup_groupbox; 139 160 gui::GridLayout *setup_layout; 161 LogFormat logFormat; 140 162 }; 141 163 } // end namespace sensor -
trunk/include/FlairSensorActuator/VrpnClient.h
r13 r44 18 18 19 19 namespace flair { 20 namespace core { 21 class FrameworkManager; 22 class SerialPort; 23 } 24 namespace gui { 25 class TabWidget; 26 class Layout; 27 } 20 namespace core { 21 class SerialPort; 22 } 23 namespace gui { 24 class TabWidget; 25 class Layout; 26 } 28 27 } 29 28 … … 35 34 /*! \class VrpnClient 36 35 * 37 * \brief Class to connect to a Vrpn server 36 * \brief Class to connect to a Vrpn server. The Thread is created with 37 * the FrameworkManager as parent. FrameworkManager must be created before. 38 * Only one instance of this class is allowed by program. 38 39 */ 39 40 class VrpnClient : public core::Thread { … … 46 47 * Construct a VrpnClient. Connection is done by IP. 47 48 * 48 * \param parent parent49 49 * \param name name 50 50 * \param address server address … … 52 52 * \param priority priority of the Thread 53 53 */ 54 VrpnClient( const core::FrameworkManager *parent,std::string name,54 VrpnClient(std::string name, 55 55 std::string address, uint16_t us_period, uint8_t priority); 56 56 … … 60 60 * Construct a VrpnClient. Connection is done by XBee modem. 61 61 * 62 * \param parent parent63 62 * \param name name 64 63 * \param serialport SerialPort for XBee modem … … 66 65 * \param priority priority of the Thread 67 66 */ 68 VrpnClient( const core::FrameworkManager *parent,std::string name,67 VrpnClient(std::string name, 69 68 core::SerialPort *serialport, uint16_t us_period, 70 69 uint8_t priority); … … 108 107 class VrpnClient_impl *pimpl_; 109 108 }; 109 110 /*! 111 * \brief get VrpnClient 112 * 113 * \return the VrpnClient 114 */ 115 VrpnClient *GetVrpnClient(void); 116 110 117 } // end namespace sensor 111 118 } // end namespace flair -
trunk/include/FlairSensorActuator/VrpnObject.h
r13 r44 19 19 20 20 namespace flair { 21 namespace core {22 class cvmatrix;23 class Vector3D;24 class Euler;25 class Quaternion;26 }27 namespace gui {28 class TabWidget;29 class Tab;30 class DataPlot1D;31 }21 namespace core { 22 class cvmatrix; 23 class Vector3D; 24 class Euler; 25 class Quaternion; 26 } 27 namespace gui { 28 class TabWidget; 29 class Tab; 30 class DataPlot1D; 31 } 32 32 } 33 33 … … 41 41 /*! \class VrpnObject 42 42 * 43 * \brief Class for VRPN object 43 * \brief Class for VRPN object. The IODevice is created with 44 * the VrpnClient as parent. VrpnClient must be created before. 44 45 */ 45 46 class VrpnObject : public core::IODevice { … … 53 54 * Construct a VrpnObject. Connection is done by IP. 54 55 * 55 * \param parent parent56 56 * \param name VRPN object name, should be the same as defined in the server 57 57 * \param tab Tab for the user interface 58 58 */ 59 VrpnObject( const VrpnClient *parent,std::string name,59 VrpnObject(std::string name, 60 60 const gui::TabWidget *tab); 61 61 … … 65 65 * Construct a VrpnObject. Connection is done by IP. 66 66 * 67 * \param parent parent68 67 * \param name name 69 68 * \param id VRPN object id, should be the same as defined in the server 70 69 * \param tab Tab for the user interface 71 70 */ 72 VrpnObject( const VrpnClient *parent,std::string name, uint8_t id,71 VrpnObject(std::string name, uint8_t id, 73 72 const gui::TabWidget *tab); 74 73
Note:
See TracChangeset
for help on using the changeset viewer.