Changeset 248 in flair-src for trunk/tools/FlairGCS/src/Manager.cpp

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

add orange icon to gcs

File:

• trunk/tools/FlairGCS/src/Manager.cpp (modified) (8 diffs)

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) {