Changeset 455 in flair-src for trunk/tools/FlairGCS/src/DataRemote.cpp

Timestamp:

10/04/21 10:03:51 (16 months ago)

Author:

Sanahuja Guillaume

Message:

gcs: add compatibility with programs without nb_buffering

File:

• trunk/tools/FlairGCS/src/DataRemote.cpp (modified) (4 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;