Changeset 399 in flair-src for trunk

Timestamp:

Mar 16, 2021, 5:50:25 PM (4 years ago)

Author:

Sanahuja Guillaume

Message:

change color of status bar in gcs if high bandwidth usage is detected

Location:

trunk

Files:

• ReleaseNotes (modified) (1 diff)
• tools/FlairGCS/src/ConnectionLayout.h (modified) (1 diff)
• tools/FlairGCS/src/Manager.cpp (modified) (5 diffs)
• tools/FlairGCS/src/Manager.h (modified) (1 diff)
• tools/FlairGCS/src/UdtSocket.cpp (modified) (3 diffs)
• tools/FlairGCS/src/UdtSocket.h (modified) (2 diffs)

trunk/ReleaseNotes

@@ -1 +1 @@
 * Actual Version:
 
+- added indicator of high communication usage in gcs
 - resolved bug with UdpSocket broadcast
+- resolved bug with altitude in UavStateMachine (https://devel.hds.utc.fr/projects/igep/ticket/71)
+- preliminary support of ipc to comunicate between ros, ardupilot, simulink, etc
 
 -----------------------------------------------------------

trunk/tools/FlairGCS/src/ConnectionLayout.h

@@ -36 +36 @@
 
 signals:
-  void UDTStats(QString stats,bool loosingPackets);  
+  void UDTStats(QString stats,QString stylesheet,bool loosingPackets);  
 };
 

trunk/tools/FlairGCS/src/Manager.cpp

@@ -73 +73 @@
   status=new QStatusBar();
   status->setSizeGripEnabled(false);
-  button_layout->addWidget(status, 1,0);
+  managerLayout->addWidget(status);
 
   UDT::startup();
@@ -100 +100 @@
   icon_red = QIcon(":red.png");
   icon_orange = QIcon(":orange.png");
-  
   
   QTimer *timer = new QTimer(this);
@@ -149 +148 @@
   
   ConnectionLayout *newLayout = new ConnectionLayout(udtSocket, name);
-  connect(udtSocket, SIGNAL(UDTStats(QString,bool)), newLayout, SIGNAL(UDTStats(QString,bool)));//connection in 2 steps to get udtsocket as sender
-  connect(newLayout, SIGNAL(UDTStats(QString,bool)), this, SLOT(printUDTStats(QString,bool)));
+  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)));
   connect(udtSocket, SIGNAL(dataReady(char *, int)), newLayout,SLOT(receive(char *, int)),Qt::BlockingQueuedConnection);
   connect(newLayout, SIGNAL(destroyed(QObject *)), this, SLOT(layoutDestroyed(QObject *)));
@@ -246 +245 @@
 }
 
-void Manager::printUDTStats(QString stats,bool loosingPackets) {
+void Manager::printUDTStats(QString stats,QString stylesheet,bool loosingPackets) {
   int index = -1;
   for(int i=0;i<connections.count();i++) {
@@ -264 +263 @@
   
   if (tabBar->count() == 0) {
+    status->setStyleSheet(stylesheet);
     status->showMessage(stats);
   } else if (index==tabBar->currentIndex()) {
+    status->setStyleSheet(stylesheet);
     status->showMessage(QString("%1: %2").arg(tabBar->tabText(index)).arg(stats));
   }

trunk/tools/FlairGCS/src/Manager.h

@@ -56 +56 @@
   void reset(void);
   void tabBarCurrentChanged(int index);
-  void printUDTStats(QString stats,bool loosingPackets);
+  void printUDTStats(QString stats,QString stylesheet,bool loosingPackets);
   void newFileUI(UDTSOCKET socket);
   void deleteFileUI(void);

trunk/tools/FlairGCS/src/UdtSocket.cpp

@@ -15 +15 @@
 #include <assert.h>
 #include <QThread>
+
 #define COMPRESS_CHUNK 1024*100
 
@@ -37 +38 @@
   total_received=0;
   pktSndLossTotal=0;
- 
+  lastpktRecvTotal=0;
+  
   bool blocking = false;
   if (UDT::setsockopt(socket, 0, UDT_RCVSYN, &blocking, sizeof(bool)) != 0)
@@ -94 +96 @@
     fprintf(stderr,"total number of received NAK packets: %i\n",perf.pktRecvNAKTotal);
     fprintf(stderr,"round trip time: %fms\n",perf.msRTT);
-      
   }*/
   bool loosingPackets=false;
   if(perf.pktSndLossTotal>pktSndLossTotal) loosingPackets=true;
   pktSndLossTotal=perf.pktSndLossTotal;
-  stats=QString("rx rate %1kB/s, round trip %2ms, lost packets %3").arg(rxRate,0,'f',3).arg(perf.msRTT,0,'f',3).arg(perf.pktSndLossTotal);
-  UDTStats(stats,loosingPackets);
+  unsigned int pktPerSec=(perf.pktRecvTotal-lastpktRecvTotal)*1000/COMPUTE_UDT_STATS_TIMER;
+  QString stylesheet="color: black";
+  if(pktPerSec>=100) {
+    stylesheet="color: red";
+  }
+  else if(pktPerSec>=50) {
+    stylesheet="color: orange";
+  }
+  stats=QString("rx rate %1kB/s, %2 rx packets/s, round trip %3ms, lost packets %4").arg(rxRate,0,'f',3).arg(pktPerSec).arg(perf.msRTT,0,'f',3).arg(perf.pktSndLossTotal);
+  lastpktRecvTotal=perf.pktRecvTotal;
+  UDTStats(stats,stylesheet,loosingPackets);
 }
 

trunk/tools/FlairGCS/src/UdtSocket.h

@@ -31 +31 @@
   unsigned int total_received;
   QString stats;
-  int pktSndLossTotal;
+  unsigned int pktSndLossTotal;
+  unsigned int lastpktRecvTotal;
+ 
 
 signals:
@@ -37 +39 @@
   void newFileUI(UDTSOCKET socket);
   void newConnectionLayout(QString name);
-  void UDTStats(QString stats,bool loosingPackets);
+  void UDTStats(QString stats,QString stylesheet,bool loosingPackets);
 
 public slots: