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

Timestamp:

Aug 24, 2021, 11:58:44 AM (3 years ago)

Author:

Sanahuja Guillaume

Message:

gcs:sync graphs

Location:

trunk/tools/FlairGCS/src

Files:

• ConnectionLayout.cpp (modified) (1 diff)
• ConnectionLayout.h (modified) (4 diffs)
• DataPlot1D.cpp (modified) (5 diffs)
• DataRemote.cpp (modified) (2 diffs)
• Manager.cpp (modified) (2 diffs)
• Manager.h (modified) (2 diffs)

trunk/tools/FlairGCS/src/ConnectionLayout.cpp

@@ -9 +9 @@
 #include "communication.h"
 
-ConnectionLayout::ConnectionLayout(UdtSocket *socket, QString name)
+ConnectionLayout::ConnectionLayout(UdtSocket *socket, QString name, QTime startTime)
     : Layout(NULL, name, "root") {
   this->socket = socket;
   this->name = name;
+  this->startTime = startTime;
 }
 
 ConnectionLayout::~ConnectionLayout() {
+}
+
+QTime ConnectionLayout::GetStartTime(void) {
+    return startTime;
 }
 

trunk/tools/FlairGCS/src/ConnectionLayout.h

@@ -7 +7 @@
 
 #include "Layout.h"
+#include <QTime>
 
 class UdtSocket;
@@ -15 +16 @@
 
 public:
-  ConnectionLayout(UdtSocket *socket, QString name);
+  ConnectionLayout(UdtSocket *socket, QString name, QTime startTime);
   ~ConnectionLayout();
   void XmlToSend(QDomDocument doc);
@@ -23 +24 @@
   QString getName();
   static QString getDocRootName(char* buf, int size);
-
+  QTime GetStartTime(void);
+  
 private:
   void drawDatas(char *buf, int buf_size, uint16_t period,
@@ -30 +32 @@
   UdtSocket *socket;
   QList<DataRemote *> dataremotes;
+  QTime startTime;
   
 private slots:

trunk/tools/FlairGCS/src/DataPlot1D.cpp

@@ -4 +4 @@
 // %flair:license}
 #include "DataPlot1D.h"
+#include "ConnectionLayout.h"
 #include "Layout.h"
 #include <QMouseEvent>
 #include <QMenu>
 #include <QGridLayout>
+#include <QTime>
 #include <qendian.h>
 
@@ -16 +18 @@
 
   setEnabled(enabled);
+  ResetElapsedTime((float)connectionLayout()->GetStartTime().msecsTo(QTime::currentTime())/1000.);
   parent->addWidget(this, row, col);
   visible_widget = this;
@@ -25 +28 @@
 
 void DataPlot1D::XmlEvent(QDomElement *dom) {
+  bool previouslyEnabled=IsEnabled();
+  
   if (dom->attribute("curve") != "") {
     QString type = dom->attribute("type");
@@ -46 +51 @@
     XmlSetup(dom);
   }
+  
+    if(previouslyEnabled!=IsEnabled() && IsEnabled()) 
+        ResetElapsedTime((float)connectionLayout()->GetStartTime().msecsTo(QTime::currentTime())/1000.);
 }
 
@@ -132 +140 @@
     if (action == clear)
       clearCurves();
-
+        
     return true;
   }

trunk/tools/FlairGCS/src/DataRemote.cpp

@@ -7 +7 @@
 #include <QInputDialog>
 #include <QtXml>
-#include "Manager.h"
 #include "ConnectionLayout.h"
 
@@ -48 +47 @@
 
   action = menu->exec(point);
-
-  // auto_refresh=b->isChecked();
 
   if (action == autoRefresh) {

trunk/tools/FlairGCS/src/Manager.cpp

@@ -104 +104 @@
   connect(timer, SIGNAL(timeout()), this, SLOT(acceptConnections()));
   timer->start(500);
+  
+  startTime=QTime::currentTime();
 }
 
@@ -147 +149 @@
   UdtSocket* udtSocket=(UdtSocket *)sender();
   
-  ConnectionLayout *newLayout = new ConnectionLayout(udtSocket, name);
+  ConnectionLayout *newLayout = new ConnectionLayout(udtSocket, name, startTime);
   connect(udtSocket, SIGNAL(UDTStats(QString,QString,bool)), newLayout, SIGNAL(UDTStats(QString,QString,bool)));//connection in 2 steps to get udtsocket as sender
   connect(newLayout, SIGNAL(UDTStats(QString,QString,bool)), this, SLOT(printUDTStats(QString,QString,bool)));

trunk/tools/FlairGCS/src/Manager.h

@@ -8 +8 @@
 #include <QWidget>
 #include <QIcon>
+#include <QTime>
 #include <udt.h>
 #include <qdom.h>
@@ -48 +49 @@
   QStatusBar *status;
   QIcon icon_red,icon_green,icon_orange;
+  QTime startTime;
 
 private slots: