Changeset 221 in flair-src for trunk/tools/FlairGCS

Timestamp:

02/22/18 15:38:55 (6 years ago)

Author:

Sanahuja Guillaume

Message:

add us plot

Location:

trunk/tools/FlairGCS

Files:

• CMakeLists.txt (modified) (1 diff)
• src/DataPlot2D.cpp (modified) (1 diff)
• src/Layout.cpp (modified) (2 diffs)
• src/UsSensorPlot.cpp (added)
• src/UsSensorPlot.h (added)

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();