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

Timestamp:

08/24/21 17:33:19 (3 years ago)

Author:

Sanahuja Guillaume

Message:

prepare for graphs buffering

Location:

trunk/tools/FlairGCS/src

Files:

• ComboBox.cpp (modified) (1 diff)
• ComboBox.h (modified) (1 diff)
• DataPlot1D.cpp (modified) (1 diff)
• DataPlot1D.h (modified) (1 diff)
• DataPlot2D.cpp (modified) (1 diff)
• DataPlot2D.h (modified) (1 diff)
• DataRemote.cpp (modified) (7 diffs)
• DataRemote.h (modified) (2 diffs)
• DoubleSpinBox.cpp (modified) (1 diff)
• DoubleSpinBox.h (modified) (1 diff)
• Layout.cpp (modified) (9 diffs)
• Map.cpp (modified) (1 diff)
• Map.h (modified) (1 diff)
• Picture.cpp (modified) (1 diff)
• Picture.h (modified) (1 diff)
• RangeFinderPlot.cpp (modified) (1 diff)
• RangeFinderPlot.h (modified) (1 diff)
• UsSensorPlot.cpp (modified) (1 diff)
• UsSensorPlot.h (modified) (1 diff)
• Vector3DSpinBox.cpp (modified) (1 diff)
• Vector3DSpinBox.h (modified) (1 diff)

trunk/tools/FlairGCS/src/ComboBox.cpp

@@ -8 +8 @@
 #include <QFormLayout>
 
-ComboBox::ComboBox(Layout *parent, int row, int col, QString name, int value)
+ComboBox::ComboBox(Layout *parent, int row, int col, QString name, uint16_t value)
     : FormLayout(parent, row, col, name, "ComboBox") {
   combobox = new QComboBox();

trunk/tools/FlairGCS/src/ComboBox.h

@@ -15 +15 @@
 
 public:
-  ComboBox(Layout *parent, int row, int col, QString name, int value);
+  ComboBox(Layout *parent, int row, int col, QString name, uint16_t value);
   ~ComboBox();
 
 private:
   QComboBox *combobox;
-  int combobox_value;
+  uint16_t combobox_value;
   void XmlEvent(QDomElement *dom);
   void SetUptodate(void);

trunk/tools/FlairGCS/src/DataPlot1D.cpp

@@ -13 +13 @@
 
 DataPlot1D::DataPlot1D(Layout *parent, int row, int col, QString title,
-                       float ymin, float ymax, bool enabled, int period)
+                       float ymin, float ymax, bool enabled, uint16_t period, uint16_t nb_buffering)
     : ScopeFixedStep(title, ymin, ymax, period / 1000.),
-      DataRemote(title, "DataPlot1D", parent, enabled, period) {
+      DataRemote(title, "DataPlot1D", parent, enabled, period, nb_buffering) {
 
   setEnabled(enabled);

trunk/tools/FlairGCS/src/DataPlot1D.h

@@ -15 +15 @@
 public:
   DataPlot1D(Layout *parent, int row, int col, QString title, float ymin,
-             float ymax, bool enabled, int period);
+             float ymax, bool enabled, uint16_t period, uint16_t nb_buffering=1);
   ~DataPlot1D();
 

trunk/tools/FlairGCS/src/DataPlot2D.cpp

@@ -22 +22 @@
 DataPlot2D::DataPlot2D(Layout *parent, int row, int col, QString plot_name,
                        QString x_name, QString y_name, float xmin, float xmax,
-                       float ymin, float ymax, bool enabled, int period)
-    : DataRemote(plot_name, "DataPlot2D", parent, enabled, period) {
+                       float ymin, float ymax, bool enabled, uint16_t period, uint16_t nb_buffering)
+    : DataRemote(plot_name, "DataPlot2D", parent, enabled, period, nb_buffering) {
   plot = new QwtPlot(NULL);
   plot->setEnabled(enabled);

trunk/tools/FlairGCS/src/DataPlot2D.h

@@ -22 +22 @@
   DataPlot2D(Layout *parent, int row, int col, QString plot_name,
              QString x_name, QString y_name, float xmin, float xmax, float ymin,
-             float ymax, bool enabled, int period);
+             float ymax, bool enabled, uint16_t period, uint16_t nb_buffering=1);
   ~DataPlot2D();
   void addCurve(QPen pen, QString legend, QString type);

trunk/tools/FlairGCS/src/DataRemote.cpp

@@ -10 +10 @@
 
 DataRemote::DataRemote(QString name, QString type, XmlWidget *parent,
-                       bool enabled, int period)
+                       bool enabled, uint16_t period, uint16_t nb_buffering)
     : XmlWidget(name, type, parent) {
   auto_refresh = enabled;
@@ -16 +16 @@
   receivesize = 0;
   refresh_rate = (double)period / 1000.;
-
+  this->nb_buffering=nb_buffering;
+  
   connectionLayout()->addDataRemote(this);
 
@@ -28 +29 @@
   menu->addSeparator();
 
-  autoRefresh = menu->addAction("auto refresh");
-  autoRefresh->setCheckable(true);
-  autoRefresh->setChecked(auto_refresh);
+  SetAutoRefresh = menu->addAction("auto refresh");
+  SetAutoRefresh->setCheckable(true);
+  SetAutoRefresh->setChecked(auto_refresh);
 
   setRefreshRate = menu->addAction(QString("set refresh rate (%1ms)")
                           .arg((uint16_t)(qRound(refresh_rate * 1000))));
   setRefreshRate->setEnabled(auto_refresh);
+  
+  menu->addSeparator();
+  setNbBuffering = menu->addAction(QString("set nb buffering (%1)").arg(nb_buffering));
+  
 /*  menu->addSeparator();
 
@@ -48 +53 @@
   action = menu->exec(point);
 
-  if (action == autoRefresh) {
-    SendPeriod(RefreshRate_ms(), autoRefresh->isChecked());
+  if (action == SetAutoRefresh) {
+    SendPeriod(RefreshRate_ms(), SetAutoRefresh->isChecked());
   }
 
@@ -58 +63 @@
         parent, "Set refresh rate ", "Value (ms):",
         (uint16_t)(qRound(refresh_rate * 1000)), 1, 65535, 10, &ok);
-    if (ok == true && time != qRound(refresh_rate * 1000)) {
+    if (ok  && time != qRound(refresh_rate * 1000)) {
       // refresh_rate=time/1000.;
-      SendPeriod(time, autoRefresh->isChecked());
+      SendPeriod(time, SetAutoRefresh->isChecked());
+    }
+  }
+  
+  if (action == setNbBuffering) {
+    bool ok;
+  
+    uint16_t nb_buffering = QInputDialog::getInt(
+        parent, "Set nb buffering ", "Value :",
+        this->nb_buffering, 1, 65535, 10, &ok);
+    if (ok  && nb_buffering !=this->nb_buffering) {
+      SendNbBuffering(nb_buffering);
     }
   }
@@ -73 +89 @@
 bool DataRemote::IsEnabled(void) { return auto_refresh; }
 
-void DataRemote::SendPeriod(int period, bool auto_refresh) {
+void DataRemote::SendPeriod(uint16_t period, bool auto_refresh) {
   RemoveAllAttributes();
 
@@ -83 +99 @@
 }
 
+void DataRemote::SendNbBuffering(uint16_t nb_buffering) {
+    RemoveAllAttributes();
+
+    SetAttribute("nb_buf", nb_buffering);
+    connectionLayout()->XmlToSend(XmlDoc());
+    RemoveAttribute("nb_buf");
+}
+
 int DataRemote::ReceiveSize(void) { return receivesize; }
 
 void DataRemote::XmlSetup(QDomElement *dom) {
-  refresh_rate = dom->attribute("period").toInt() / 1000.;
+  refresh_rate = dom->attribute("period").toUShort() / 1000.;
+  nb_buffering = dom->attribute("nb_buf").toUShort();
   if (dom->attribute("enabled") == "1")
     auto_refresh = true;

trunk/tools/FlairGCS/src/DataRemote.h

@@ -16 +16 @@
 public:
   DataRemote(QString name, QString type, XmlWidget *parent, bool enabled,
-             int period);
+             uint16_t period, uint16_t nb_buffering=1);
   ~DataRemote();
   uint16_t RefreshRate_ms(void);
@@ -31 +31 @@
   double refresh_rate; // en s
   int receivesize;
+  uint16_t nb_buffering;
 
   void XmlSetup(QDomElement *dom);
 
 private:
-  void SendPeriod(int period, bool auto_refresh);
-  QAction *autoRefresh, *setRefreshRate;
+  void SendPeriod(uint16_t period, bool auto_refresh);
+  void SendNbBuffering(uint16_t nb_buffering);
+  QAction *SetAutoRefresh, *setRefreshRate,*setNbBuffering;
   //QAction **log;//todo implement this feature (log directly in gcs, in case of uav program crash)
 };

trunk/tools/FlairGCS/src/DoubleSpinBox.cpp

@@ -13 +13 @@
 DoubleSpinBox::DoubleSpinBox(Layout *parent, int row, int col, QString name,
                              QString suffix, QString value, float min,
-                             float max, float step, int decimals)
+                             float max, float step, uint16_t decimals)
     : FormLayout(parent, row, col, name, "DoubleSpinBox") {
   doublespinbox = new QDoubleSpinBox();

trunk/tools/FlairGCS/src/DoubleSpinBox.h

@@ -17 +17 @@
   // handle value as string, becouse double value are not exact
   DoubleSpinBox(Layout *parent, int row, int col, QString name, QString suffix,
-                QString value, float min, float max, float step, int decimals);
+                QString value, float min, float max, float step, uint16_t decimals);
   ~DoubleSpinBox();
 

trunk/tools/FlairGCS/src/Layout.cpp

@@ -127 +127 @@
     double max = dom->attribute("max").toDouble();
     double step = dom->attribute("step").toDouble();
-    int decimals = dom->attribute("decimals").toInt();
+    uint16_t decimals = dom->attribute("decimals").toUShort();
     widget = new DoubleSpinBox(this, row, col, name, suffix, value, min, max,
                                step, decimals);
@@ -139 +139 @@
     double max = dom->attribute("max").toDouble();
     double step = dom->attribute("step").toDouble();
-    int decimals = dom->attribute("decimals").toInt();
+    uint16_t decimals = dom->attribute("decimals").toUShort();
     widget = new Vector3DSpinBox(this, row, col, name, value, min, max, step,
                                  decimals);
@@ -148 +148 @@
   }
   if (type == "ComboBox") {
-    int value = dom->attribute("value").toInt();
+    uint16_t value = dom->attribute("value").toUShort();
     widget = new ComboBox(this, row, col, name, value);
   }
@@ -158 +158 @@
     float ymax = dom->attribute("max").toFloat();
     int enabled = dom->attribute("enabled").toInt();
-    int period = dom->attribute("period").toInt();
-    if (enabled == 1) {
-      widget = new DataPlot1D(this, row, col, name, ymin, ymax, true, period);
-    } else {
-      widget = new DataPlot1D(this, row, col, name, ymin, ymax, false, 100);
+    uint16_t period = dom->attribute("period").toUShort();
+    uint16_t nb_buffering = dom->attribute("nb_buf").toUShort();
+    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);
     }
   }
@@ -173 +174 @@
     QString y_name = dom->attribute("y_name");
     int enabled = dom->attribute("enabled").toInt();
-    int period = dom->attribute("period").toInt();
+    uint16_t period = dom->attribute("period").toUShort();
+    uint16_t nb_buffering = dom->attribute("nb_buf").toUShort();
     if (enabled == 1) {
       widget = new DataPlot2D(this, row, col, name, x_name, y_name, xmin, xmax,
-                              ymin, ymax, true, period);
+                              ymin, ymax, true, period,nb_buffering);
     } else {
       widget = new DataPlot2D(this, row, col, name, x_name, y_name, xmin, xmax,
-                              ymin, ymax, false, 100);
+                              ymin, ymax, false, 100,nb_buffering);
     }
   }
@@ -187 +189 @@
     QString y_name = dom->attribute("y_name");
     int enabled = dom->attribute("enabled").toInt();
-    int period = dom->attribute("period").toInt();
+    uint16_t period = dom->attribute("period").toUShort();
     QString type = dom->attribute("type");
     int samples = dom->attribute("samples").toInt();
@@ -210 +212 @@
     uint32_t nb_samples = dom->attribute("nb_samples").toUInt();
     int enabled = dom->attribute("enabled").toInt();
-    int period = dom->attribute("period").toInt();
+    uint16_t period = dom->attribute("period").toUShort();
     int invert_axis = dom->attribute("invert_axis").toInt();
     bool invert_axis_bool;
@@ -234 +236 @@
     int height = dom->attribute("height").toInt();
     int enabled = dom->attribute("enabled").toInt();
-    int period = dom->attribute("period").toInt();
+    uint16_t period = dom->attribute("period").toUShort();
     if (enabled == 1) {
       widget = new Picture(this, row, col, name, width, height, true, period);
@@ -242 +244 @@
   }
   if (type == "Map") {
-    int period = dom->attribute("period").toInt();
+    uint16_t period = dom->attribute("period").toUShort();
     int enabled = dom->attribute("enabled").toInt();
     int i = 0;

trunk/tools/FlairGCS/src/Map.cpp

@@ -24 +24 @@
 
 Map::Map(Layout *parent, int row, int col, QString name,
-         QList<QGeoCoordinate> coordinates, bool enabled, int period)
+         QList<QGeoCoordinate> coordinates, bool enabled, uint16_t period)
     : DataRemote(name, "Map", parent, enabled, period) {
   visible_widget = new QWidget();

trunk/tools/FlairGCS/src/Map.h

@@ -30 +30 @@
 public:
   Map(Layout *parent, int row, int col, QString name,
-      QList<QtMobility::QGeoCoordinate> coordinates, bool enabled, int period);
+      QList<QtMobility::QGeoCoordinate> coordinates, bool enabled, uint16_t period);
   ~Map();
   void setCenteredPoint(int i);

trunk/tools/FlairGCS/src/Picture.cpp

@@ -13 +13 @@
 
 Picture::Picture(Layout *parent, int row, int col, QString name, uint16_t width,
-                 uint16_t height, bool enabled, int period)
+                 uint16_t height, bool enabled, uint16_t period)
     : DataRemote(name, "Picture", parent, enabled, period) {
   box = new QGroupBox(name);

trunk/tools/FlairGCS/src/Picture.h

@@ -22 +22 @@
 public:
   Picture(Layout *parent, int row, int col, QString name, uint16_t width,
-          uint16_t height, bool enabled, int period);
+          uint16_t height, bool enabled, uint16_t period);
   ~Picture();
 

trunk/tools/FlairGCS/src/RangeFinderPlot.cpp

@@ -23 +23 @@
                                  float start_angle, float end_angle,
                                  uint32_t nb_samples, QString data_type,
-                                 bool invert_axis, bool enabled, int period)
+                                 bool invert_axis, bool enabled, uint16_t period)
     : DataRemote(name, "RangeFinderPlot", parent, enabled, period) {
   invert_axis = true;

trunk/tools/FlairGCS/src/RangeFinderPlot.h

@@ -22 +22 @@
                   float ymin, float ymax, float start_angle, float end_angle,
                   uint32_t nb_samples, QString data_type, bool invert_axis,
-                  bool enabled, int period);
+                  bool enabled, uint16_t period);
   ~RangeFinderPlot();
 

trunk/tools/FlairGCS/src/UsSensorPlot.cpp

@@ -24 +24 @@
 
 UsSensorPlot::UsSensorPlot(Layout *parent, int row, int col, QString plot_name,
-                       QString y_name, float ymin, float ymax, uint32_t nbSamples,QString datasType,bool enabled, int period)
+                       QString y_name, float ymin, float ymax, uint32_t nbSamples,QString datasType,bool enabled, uint16_t period)
     : DataRemote(plot_name, "UsSensorPlot", parent, enabled, period) {
   visible_widget = new QWidget();

trunk/tools/FlairGCS/src/UsSensorPlot.h

@@ -23 +23 @@
 public:
   UsSensorPlot(Layout *parent, int row, int col, QString plot_name,
-             QString y_name, float ymin,float ymax, uint32_t nbSamples,QString datasType,bool enabled, int period);
+             QString y_name, float ymin,float ymax, uint32_t nbSamples,QString datasType,bool enabled, uint16_t period);
   ~UsSensorPlot();
 

trunk/tools/FlairGCS/src/Vector3DSpinBox.cpp

@@ -13 +13 @@
 Vector3DSpinBox::Vector3DSpinBox(Layout *parent, int row, int col, QString name,
                                  QString value[3], float min, float max,
-                                 float step, int decimals)
+                                 float step, uint16_t decimals)
     : XmlWidget(name, "Vector3DSpinBox", parent) {
   for (int i = 0; i < 3; i++) {

trunk/tools/FlairGCS/src/Vector3DSpinBox.h

@@ -20 +20 @@
   Vector3DSpinBox(Layout *parent, int row, int col, QString name,
                   QString value[3], float min, float max, float step,
-                  int decimals);
+                  uint16_t decimals);
   ~Vector3DSpinBox();