Changeset 437 in flair-src for trunk/lib/FlairCore/src

Timestamp:

Aug 24, 2021, 5:33:19 PM (3 years ago)

Author:

Sanahuja Guillaume

Message:

prepare for graphs buffering

Location:

trunk/lib/FlairCore/src

Files:

• DoubleSpinBox.cpp (modified) (2 diffs)
• DoubleSpinBox.h (modified) (2 diffs)
• SendData.cpp (modified) (8 diffs)
• SendData.h (modified) (3 diffs)
• Vector3DSpinBox.cpp (modified) (1 diff)
• Vector3DSpinBox.h (modified) (1 diff)
• unexported/SendData_impl.h (modified) (1 diff)

trunk/lib/FlairCore/src/DoubleSpinBox.cpp

@@ -24 +24 @@
 
 DoubleSpinBox::DoubleSpinBox(const LayoutPosition *position, string name,
-                             double min, double max, double step, int decimals,
+                             double min, double max, double step, uint16_t decimals,
                              double default_value)
     : Box(position, name, "DoubleSpinBox") {
@@ -46 +46 @@
 DoubleSpinBox::DoubleSpinBox(const LayoutPosition *position, string name,
                              string suffix, double min, double max, double step,
-                             int decimals, double default_value)
+                             uint16_t decimals, double default_value)
     : Box(position, name, "DoubleSpinBox") {
   // update value from xml file

trunk/lib/FlairCore/src/DoubleSpinBox.h

@@ -43 +43 @@
   */
   DoubleSpinBox(const LayoutPosition *position, std::string name, double min,
-                double max, double step, int decimals = 2,
+                double max, double step, uint16_t decimals = 2,
                 double default_value = 0);
 
@@ -63 +63 @@
   DoubleSpinBox(const LayoutPosition *position, std::string name,
                 std::string suffix, double min, double max, double step,
-                int decimals = 2, double default_value = 0);
+                uint16_t decimals = 2, double default_value = 0);
 
   /*!

trunk/lib/FlairCore/src/SendData.cpp

@@ -30 +30 @@
 
 SendData::SendData(const LayoutPosition *position, string name, string type,
-                   uint16_t default_periodms, bool default_enabled)
+                   uint16_t default_periodms, bool default_enabled, uint16_t default_nb_buffering)
     : Widget(position->getLayout(), name, type) {
   pimpl_ = new SendData_impl();
@@ -39 +39 @@
   pimpl_->send_period = default_periodms;
   pimpl_->is_enabled = default_enabled;
+  pimpl_->nb_buffering = default_nb_buffering;
 
   SetVolatileXmlProp("row", position->Row());
@@ -46 +47 @@
   GetPersistentXmlProp("enabled", pimpl_->is_enabled);
   SetPersistentXmlProp("enabled", pimpl_->is_enabled);
+  GetPersistentXmlProp("nb_buf", pimpl_->nb_buffering);
+  SetPersistentXmlProp("nb_buf", pimpl_->nb_buffering);
 
   delete position;
@@ -67 +70 @@
 
 void SendData::XmlEvent(void) {
-  uint16_t send_period;
+  uint16_t send_period,nb_buffering;
   bool is_enabled;
   bool something_changed = false;
 
-  if (GetPersistentXmlProp("period", send_period) &&
-      GetPersistentXmlProp("enabled", is_enabled)) {
+  if (GetPersistentXmlProp("period", send_period) && GetPersistentXmlProp("enabled", is_enabled) && GetPersistentXmlProp("nb_buf", nb_buffering)) {
     if (send_period != SendPeriod())
       something_changed = true;
     if (is_enabled != IsEnabled())
+      something_changed = true;
+  }
+  
+  if (GetPersistentXmlProp("nb_buf", nb_buffering)) {
+    if (nb_buffering != NbBuffering())
       something_changed = true;
   }
@@ -84 +91 @@
     SetSendPeriod(send_period);
     SetEnabled(is_enabled);
+    SetNbBuffering(nb_buffering);
 
     getFrameworkManager()->UpdateSendData(this);
@@ -91 +99 @@
     SetVolatileXmlProp("period", send_period);
     SetVolatileXmlProp("enabled", is_enabled);
+    SetVolatileXmlProp("nb_buf", nb_buffering);
     SendXml();
 
@@ -102 +111 @@
 
 uint16_t SendData::SendPeriod(void) const { return pimpl_->send_period; }
+
+uint16_t SendData::NbBuffering(void) const { return pimpl_->nb_buffering; }
 
 bool SendData::IsEnabled(void) const { return pimpl_->is_enabled; }
@@ -116 +127 @@
 void SendData::SetSendPeriod(uint16_t value) { pimpl_->send_period = value; }
 
+void SendData::SetNbBuffering(uint16_t value) { pimpl_->nb_buffering = value; }
+
 } // end namespace core
 } // end namespace flair

trunk/lib/FlairCore/src/SendData.h

@@ -34 +34 @@
   */
   SendData(const LayoutPosition *position, std::string name, std::string type,
-           uint16_t default_periodms = 100, bool default_enabled = false);
+           uint16_t default_periodms = 100, bool default_enabled = false, uint16_t default_nb_buffering=1);
 
   /*!
@@ -54 +54 @@
   uint16_t SendPeriod(void) const; // in ms
   bool IsEnabled(void) const;
+  uint16_t NbBuffering(void) const;
 
 protected:
@@ -88 +89 @@
 
   void SetSendPeriod(uint16_t value);
+  void SetNbBuffering(uint16_t value);
   void SetEnabled(bool value);
 

trunk/lib/FlairCore/src/Vector3DSpinBox.cpp

@@ -26 +26 @@
 Vector3DSpinBox::Vector3DSpinBox(const LayoutPosition *position, string name,
                                  double min, double max, double step,
-                                 int decimals, core::Vector3Df default_value)
+                                 uint16_t decimals, core::Vector3Df default_value)
     : Box(position, name, "Vector3DSpinBox") {
   // update value from xml file

trunk/lib/FlairCore/src/Vector3DSpinBox.h

@@ -43 +43 @@
   */
   Vector3DSpinBox(const LayoutPosition *position, std::string name, double min,
-                  double max, double step, int decimals = 2,
+                  double max, double step, uint16_t decimals = 2,
                   core::Vector3Df default_value = core::Vector3Df(0, 0, 0));
 

trunk/lib/FlairCore/src/unexported/SendData_impl.h

@@ -30 +30 @@
   size_t send_size;
   uint16_t send_period;
+  uint16_t nb_buffering;
 };