Changeset 221 in flair-src for trunk/lib

Timestamp:

Feb 22, 2018, 3:38:55 PM (7 years ago)

Author:

Sanahuja Guillaume

Message:

add us plot

Location:

trunk/lib

Files:

• FlairCore/src/RangeFinderPlot.cpp (modified) (2 diffs)
• FlairCore/src/UsSensorPlot.cpp (added)
• FlairCore/src/UsSensorPlot.h (added)
• FlairSensorActuator/src/SimuUs.cpp (modified) (2 diffs)
• FlairSensorActuator/src/UsRangeFinder.cpp (modified) (1 diff)
• FlairSensorActuator/src/UsRangeFinder.h (modified) (1 diff)

trunk/lib/FlairCore/src/RangeFinderPlot.cpp

@@ -35 +35 @@
     : SendData(position, name, "RangeFinderPlot", 200) {
   this->datas = datas;
-Warn("RangeFinderPlot::CopyDatas needs to be written\n");
+
   SetSendSize(datas->GetDataType().GetSize());
 
@@ -58 +58 @@
 
 void RangeFinderPlot::CopyDatas(char *buf) const {
-  //datas->CopyDatas(buf);
+  datas->CopyDatas(buf);
 }
 

trunk/lib/FlairSensorActuator/src/SimuUs.cpp

@@ -32 +32 @@
 namespace sensor {
 
+//control part
 SimuUs::SimuUs(string name, uint32_t modelId,uint32_t deviceId,
                uint8_t priority)
@@ -43 +44 @@
 }
 
+//simulation part
 SimuUs::SimuUs(const IODevice *parent, string name,uint32_t modelId,uint32_t deviceId)
     : Thread(parent, name, 0), UsRangeFinder(parent,name) {

trunk/lib/FlairSensorActuator/src/UsRangeFinder.cpp

@@ -73 +73 @@
 Tab *UsRangeFinder::GetPlotTab(void) const { return plot_tab; }
 
+TabWidget *UsRangeFinder::GetTabWidget(void) const { return tab; }
+
 void UsRangeFinder::UseDefaultPlot(void) {
   if (tab == NULL) {

trunk/lib/FlairSensorActuator/src/UsRangeFinder.h

@@ -105 +105 @@
   */
   gui::Tab *GetPlotTab(void) const;
+  
+  /*!
+  * \brief Tab widget
+  *
+  * \return tab widget
+  */
+  gui::TabWidget *GetTabWidget(void) const;
 
   /*!