Changeset 455 in flair-src for trunk

Timestamp:

Oct 4, 2021, 10:03:51 AM (3 years ago)

Author:

Sanahuja Guillaume

Message:

gcs: add compatibility with programs without nb_buffering

Location:

trunk/tools/FlairGCS/src

Files:

• DataRemote.cpp (modified) (4 diffs)
• DataRemote.h (modified) (1 diff)
• Layout.cpp (modified) (9 diffs)

trunk/tools/FlairGCS/src/DataRemote.cpp

@@ -16 +16 @@
   receivesize = 0;
   refresh_rate = (double)period / 1000.;
-  this->nb_buffering=nb_buffering;
+   
+   //flair programs without nb buffering have nb_buffering=0, set it to 1 for compatibility
+    if(nb_buffering==0) {
+        this->nb_buffering=1;
+        nbBufferingCompatible=false;
+    } else {
+        this->nb_buffering=nb_buffering;
+        nbBufferingCompatible=true;
+    }
+ 
   
   connectionLayout()->addDataRemote(this);
@@ -37 +46 @@
   setRefreshRate->setEnabled(auto_refresh);
   
-  menu->addSeparator();
-  setNbBuffering = menu->addAction(QString("set nb buffering (%1)").arg(nb_buffering));
+  //flair programs without nb buffering have nb_buffering=0
+  if(nbBufferingCompatible) {
+      menu->addSeparator();
+      setNbBuffering = menu->addAction(QString("set nb buffering (%1)").arg(nb_buffering));
+  }
   
 /*  menu->addSeparator();
@@ -52 +64 @@
 
   action = menu->exec(point);
-
+    if(action==NULL) return action;//setNbBuffering can also be null if in compatibility mode
+    
   if (action == SetAutoRefresh) {
     SendPeriod(RefreshRate_ms(), SetAutoRefresh->isChecked());
@@ -113 +126 @@
 void DataRemote::XmlSetup(QDomElement *dom) {
   refresh_rate = dom->attribute("period").toUShort() / 1000.;
-  nb_buffering = dom->attribute("nb_buf").toUShort();
+  if(nbBufferingCompatible) nb_buffering = dom->attribute("nb_buf").toUShort();
+  
   if (dom->attribute("enabled") == "1")
     auto_refresh = true;

trunk/tools/FlairGCS/src/DataRemote.h

@@ -38 +38 @@
   uint16_t nb_buffering;
   QAction *SetAutoRefresh, *setRefreshRate,*setNbBuffering;
+  bool nbBufferingCompatible;
   //QAction **log;//todo implement this feature (log directly in gcs, in case of uav program crash)
 };

trunk/tools/FlairGCS/src/Layout.cpp

@@ -160 +160 @@
     uint16_t period = dom->attribute("period").toUShort();
     uint16_t nb_buffering = dom->attribute("nb_buf").toUShort();
+    if(period==0) period=100;
     if (enabled == 1) {
       widget = new DataPlot1D(this, row, col, name, ymin, ymax, true, period,nb_buffering);
     } else {
-      widget = new DataPlot1D(this, row, col, name, ymin, ymax, false, 100,nb_buffering);
+      widget = new DataPlot1D(this, row, col, name, ymin, ymax, false, period,nb_buffering);
     }
   }
@@ -176 +177 @@
     uint16_t period = dom->attribute("period").toUShort();
     uint16_t nb_buffering = dom->attribute("nb_buf").toUShort();
+    if(period==0) period=100;
     if (enabled == 1) {
       widget = new DataPlot2D(this, row, col, name, x_name, y_name, xmin, xmax,
@@ -181 +183 @@
     } else {
       widget = new DataPlot2D(this, row, col, name, x_name, y_name, xmin, xmax,
-                              ymin, ymax, false, 100,nb_buffering);
+                              ymin, ymax, false, period,nb_buffering);
     }
   }
@@ -192 +194 @@
     QString type = dom->attribute("type");
     int samples = dom->attribute("samples").toInt();
+    if(period==0) period=100;
     if (enabled == 1) {
       widget = new UsSensorPlot(this, row, col, name, y_name,
@@ -197 +200 @@
     } else {
       widget = new UsSensorPlot(this, row, col, name,  y_name,
-                              ymin, ymax, samples,type,false, 100);
+                              ymin, ymax, samples,type,false, period);
     }
   }
@@ -220 +223 @@
       invert_axis_bool = true;
     }
+    if(period==0) period=100;
     if (enabled == 1) {
       widget =
@@ -229 +233 @@
           new RangeFinderPlot(this, row, col, name, x_name, y_name, xmin, xmax,
                               ymin, ymax, start_angle, end_angle, nb_samples,
-                              data_type, invert_axis, false, 100);
+                              data_type, invert_axis, false, period);
     }
   }
@@ -237 +241 @@
     int enabled = dom->attribute("enabled").toInt();
     uint16_t period = dom->attribute("period").toUShort();
+    if(period==0) period=100;
     if (enabled == 1) {
       widget = new Picture(this, row, col, name, width, height, true, period);
@@ -257 +262 @@
       i++;
     }
-
+    if(period==0) period=100;
     if (enabled == 1) {
       widget = new Map(this, row, col, name, coordinates, true, period);