Changeset 221 in flair-src for trunk

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

add us plot

Location:

trunk

Files:

• lib/FlairCore/src/RangeFinderPlot.cpp (modified) (2 diffs)
• lib/FlairCore/src/UsSensorPlot.cpp (added)
• lib/FlairCore/src/UsSensorPlot.h (added)
• lib/FlairSensorActuator/src/SimuUs.cpp (modified) (2 diffs)
• lib/FlairSensorActuator/src/UsRangeFinder.cpp (modified) (1 diff)
• lib/FlairSensorActuator/src/UsRangeFinder.h (modified) (1 diff)
• tools/FlairGCS/CMakeLists.txt (modified) (1 diff)
• tools/FlairGCS/src/DataPlot2D.cpp (modified) (1 diff)
• tools/FlairGCS/src/Layout.cpp (modified) (2 diffs)
• tools/FlairGCS/src/UsSensorPlot.cpp (added)
• tools/FlairGCS/src/UsSensorPlot.h (added)

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;
 
   /*!

trunk/tools/FlairGCS/CMakeLists.txt

@@ -23 +23 @@
         src/UdtSocket.h
         src/RangeFinderPlot.h
+    src/UsSensorPlot.h
         src/DataPlot2D.h
         src/Picture.h

trunk/tools/FlairGCS/src/DataPlot2D.cpp

@@ -272 +272 @@
       plot_data(data1, data2, i);
     } else {
-      printf("DataPlot1D::DrawDatas type non connu\n");
+      printf("DataPlot2D::DrawDatas type non connu\n");
     }
   }

trunk/tools/FlairGCS/src/Layout.cpp

@@ -18 +18 @@
 #include "DataPlot2D.h"
 #include "RangeFinderPlot.h"
+#include "UsSensorPlot.h"
 #include "Picture.h"
 #include "Map.h"
@@ -180 +181 @@
     }
   }
+  if (type == "UsSensorPlot") {
+    float ymin = dom.attribute("ymin").toFloat();
+    float ymax = dom.attribute("ymax").toFloat();
+    QString y_name = dom.attribute("y_name");
+    int enabled = dom.attribute("enabled").toInt();
+    int period = dom.attribute("period").toInt();
+    QString type = dom.attribute("type");
+    int samples = dom.attribute("samples").toInt();
+    if (enabled == 1) {
+      widget = new UsSensorPlot(this, row, col, name, y_name,
+                              ymin, ymax, samples,type,true, period);
+    } else {
+      widget = new UsSensorPlot(this, row, col, name,  y_name,
+                              ymin, ymax, samples,type,false, 100);
+    }
+  }
   if (type == "RangeFinderPlot") {
     float xmin = dom.attribute("xmin").toFloat();