Changeset 248 in flair-src for trunk

Timestamp:

06/04/18 14:45:37 (6 years ago)

Author:

Sanahuja Guillaume

Message:

add orange icon to gcs

Location:

trunk/tools/FlairGCS/src

Files:

• ConnectionLayout.h (modified) (1 diff)
• Manager.cpp (modified) (8 diffs)
• Manager.h (modified) (2 diffs)
• UdtSocket.cpp (modified) (4 diffs)
• UdtSocket.h (modified) (2 diffs)
• file_ui.cpp (modified) (1 diff)
• orange.png (added)
• ressources.qrc (modified) (1 diff)

trunk/tools/FlairGCS/src/ConnectionLayout.h

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

trunk/tools/FlairGCS/src/Manager.cpp

@@ -37 +37 @@
   qRegisterMetaType<QModelIndex>("QModelIndex"); // pour le file ui??
   this->name = name;
-//ffprintf(stderr,stderr,"Manager %x\n",thread());
+//fprintf(stderr,stderr,"Manager %x\n",thread());
   setWindowTitle(name);
 
@@ -97 +97 @@
 
   
-  icon_ok = QIcon(":green.png");
-  icon_ko = QIcon(":red.png");
+  icon_green = QIcon(":green.png");
+  icon_red = QIcon(":red.png");
+  icon_orange = QIcon(":orange.png");
   
   
@@ -108 +109 @@
 Manager::~Manager() {
   for (int i = 0; i < connections.count(); i++) {
-    connections.at(i).socket->kill();
-    connections.at(i).socket->thread()->wait();
+    if(connections.at(i).socket!=NULL) {
+      connections.at(i).socket->kill();
+      connections.at(i).socket->thread()->wait();
+    }
   }
 
@@ -146 +149 @@
   
   ConnectionLayout *newLayout = new ConnectionLayout(udtSocket, name);
-  connect(udtSocket, SIGNAL(UDTStats(QString)), newLayout, SIGNAL(UDTStats(QString)));//connection in 2 steps to get udtsocket as sender
-  connect(newLayout, SIGNAL(UDTStats(QString)), this, SLOT(printUDTStats(QString)));
+  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(dataReady(char *, int)), newLayout,SLOT(receive(char *, int)),Qt::BlockingQueuedConnection);
   connect(newLayout, SIGNAL(destroyed(QObject *)), this, SLOT(layoutDestroyed(QObject *)));
@@ -170 +173 @@
   }
   if (connections.count() == 2) {
-    tabBar->addTab(icon_ok,hiddenTabName);
+    tabBar->addTab(icon_green,hiddenTabName);
     currentTab = 0;
   }
   if (connections.count() > 1) {
-    tabBar->addTab(icon_ok,name);
+    tabBar->addTab(icon_green,name);
   }
 }
 
 void Manager::udtSocketDestroyed(QObject *obj) {
-  fprintf(stderr,"sockets -1\n");
   //mark socket as not valid, it can be a connection lost
   //in this case we keep the layout for reading, and mark it as problematic
-  fprintf(stderr,"change icon\n");
   for(int i=0;i<connections.count();i++) {
     if(connections.at(i).socket==(UdtSocket *)obj) {
       connections[i].socket=NULL;
+      tabBar->setTabIcon(i,icon_red);
       break;
     }
@@ -192 +194 @@
 
 void Manager::layoutDestroyed(QObject *obj) {
-  fprintf(stderr,"layout -1\n");
   //remove the connection, it comes from a proper close
   int index=-1;
@@ -240 +241 @@
 }
 
-void Manager::printUDTStats(QString stats) {
+void Manager::printUDTStats(QString stats,bool loosingPackets) {
   int index = -1;
   for(int i=0;i<connections.count();i++) {
@@ -250 +251 @@
   
   if(index==-1) return;
+  
+  if(!loosingPackets) {
+    tabBar->setTabIcon(index,icon_green);
+  } else {
+    tabBar->setTabIcon(index,icon_orange);
+  }
   
   if (tabBar->count() == 0) {

trunk/tools/FlairGCS/src/Manager.h

@@ -47 +47 @@
   QGridLayout *button_layout;
   QStatusBar *status;
-  QIcon icon_ok,icon_ko;
+  QIcon icon_red,icon_green,icon_orange;
 
 private slots:
@@ -56 +56 @@
   void reset(void);
   void tabBarCurrentChanged(int index);
-  void printUDTStats(QString stats);
+  void printUDTStats(QString stats,bool loosingPackets);
   void newFileUI(UDTSOCKET socket);
   void deleteFileUI(void);

trunk/tools/FlairGCS/src/UdtSocket.cpp

@@ -36 +36 @@
   socketType=unknown;
   total_received=0;
+  pktSndLossTotal=0;
  
   bool blocking = false;
@@ -54 +55 @@
   udtstats_timer->stop();
   if(destroySocket) UDT::close(socket);
-fprintf(stderr,"fin udt\n");
 }
 
@@ -95 +95 @@
       
   }*/
+  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);
-  
+  UDTStats(stats,loosingPackets);
 }
 
@@ -124 +126 @@
     return;
   }
-  //ffprintf(stderr,stderr,"receiveData %x\n",thread());
+  //fprintf(stderr,stderr,"receiveData %x\n",thread());
   
   while (!stop) {

trunk/tools/FlairGCS/src/UdtSocket.h

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

trunk/tools/FlairGCS/src/file_ui.cpp

@@ -45 +45 @@
     
   dialog = new QDialog();
-//ffprintf(stderr,stderr,"creator file ui %x\n",thread());
+
   dialog->setWindowTitle("log files");
   QGridLayout *main_layout = new QGridLayout(dialog);

trunk/tools/FlairGCS/src/ressources.qrc

@@ -6 +6 @@
   <file>cross.png</file>
   <file>green.png</file>
+  <file>orange.png</file>
   <file>red.png</file>
 </qresource>