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

Timestamp:

05/28/18 18:23:35 (6 years ago)

Author:

Sanahuja Guillaume

Message:

improve gcs disconnections

File:

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

trunk/tools/FlairGCS/src/Manager.cpp

@@ -46 +46 @@
   // tab bar for multiple connections
   tabBar = new QTabBar();
+  //tabBar->setTabsClosable(true);
   managerLayout->addWidget(tabBar);
   connect(tabBar, SIGNAL(currentChanged(int)), this,
@@ -95 +96 @@
   }
 
+  
+  icon_ok = QIcon(":green.png");
+  icon_ko = QIcon(":red.png");
+  
+  
   QTimer *timer = new QTimer(this);
   connect(timer, SIGNAL(timeout()), this, SLOT(acceptConnections()));
@@ -101 +107 @@
 
 Manager::~Manager() {
-  for (int i = 0; i < udtSockets.count(); i++) {
-    udtSockets.at(i)->kill();
-    udtSockets.at(i)->thread()->wait();
+  for (int i = 0; i < connections.count(); i++) {
+    connections.at(i).socket->kill();
+    connections.at(i).socket->thread()->wait();
   }
 
@@ -127 +133 @@
     UdtSocket *udtSocket = new UdtSocket(socket,name);
     udtSocket->moveToThread(thread);
-    udtSockets.append(udtSocket);
-
+    
     connect(udtSocket, SIGNAL(newFileUI(UDTSOCKET)), this, SLOT(newFileUI(UDTSOCKET)));
     connect(udtSocket, SIGNAL(newConnectionLayout(QString)), this, SLOT(newConnectionLayout(QString)),Qt::BlockingQueuedConnection);
@@ -141 +146 @@
   
   ConnectionLayout *newLayout = new ConnectionLayout(udtSocket, name);
-  connectionsLayout.append(newLayout);
   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)));
@@ -147 +151 @@
   connect(newLayout, SIGNAL(destroyed(QObject *)), this, SLOT(layoutDestroyed(QObject *)));
   connect(udtSocket, SIGNAL(destroyed(QObject *)), this, SLOT(udtSocketDestroyed(QObject *)));
-  connect(udtSocket, SIGNAL(destroyed()), newLayout, SLOT(deleteLater()));
-  
-   // widget
+  
+  // widget
   QWidget *newWidget = new QWidget();
-  connectionsWidget.append(newWidget);
   newWidget->setLayout(newLayout->getQGridLayout());
   managerLayout->insertWidget(1, newWidget);
   newWidget->hide();
   
+  connections_t connection;
+  connection.layout=newLayout;
+  connection.widget=newWidget;
+  connection.socket=udtSocket;
+  connections.append(connection);
+  
   //tab: avoid having only 1 tab (0, 2 or more)
-  if (connectionsLayout.count() == 1) { // first connection
-    connectionsWidget.at(0)->show();
+  if (connections.count() == 1) { // first connection
+    newWidget->show();
     hiddenTabName = name;
   }
-  if (connectionsLayout.count() == 2) {
-    tabBar->addTab(hiddenTabName);
+  if (connections.count() == 2) {
+    tabBar->addTab(icon_ok,hiddenTabName);
     currentTab = 0;
   }
-  if (connectionsLayout.count() > 1) {
-    tabBar->addTab(name);
+  if (connections.count() > 1) {
+    tabBar->addTab(icon_ok,name);
   }
 }
 
 void Manager::udtSocketDestroyed(QObject *obj) {
-  udtSockets.removeOne((UdtSocket *)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;
+      break;
+    }
+  }
 }
 
 void Manager::layoutDestroyed(QObject *obj) {
-  int index = connectionsLayout.indexOf((ConnectionLayout *)obj);
-
-  delete connectionsWidget.at(index);
-  connectionsWidget.removeAt(index);
-  connectionsLayout.removeOne((ConnectionLayout *)obj);
-  
-  //tab: avoid having only 1 tab (0, 2 or more)
+  fprintf(stderr,"layout -1\n");
+  //remove the connection, it comes from a proper close
+  int index=-1;
+  for(int i=0;i<connections.count();i++) {
+    if(connections.at(i).layout==(ConnectionLayout *)obj) {
+      delete connections.at(i).widget;
+      //connections[i].widget=NULL;
+      //connections[i].layout=NULL;
+      connections.removeAt(i);
+      index=i;
+      break;
+    }
+  }
+  
+  if(index==-1) {
+    fprintf(stderr,"layoutDestroyed: error, layout not found!\n");
+    return;
+  }
+  
+  //tab: avoid having only 1 tab (only 0, 2 or more)
   if (tabBar->count() > 1) {
     tabBar->removeTab(index);
   }
 
-  if (connectionsLayout.count() == 1) {
+  if (connections.count() == 1) {
     hiddenTabName = tabBar->tabText(0);
     tabBar->removeTab(0);
   }
 
-  if (connectionsLayout.count() == 0) {
+  if (connections.count() == 0) {
     status->showMessage("");
   }
-  
-  
 }
 
 void Manager::newFileUI(UDTSOCKET socket) {
-  //remove udtsocket as it will be automatically destroyed
-  udtSockets.removeOne((UdtSocket *)sender());
-  
   QThread *thread = new QThread(this);
   file_ui* fileUi = new file_ui(socket,name);
@@ -216 +241 @@
 
 void Manager::printUDTStats(QString stats) {
-  int index = connectionsLayout.indexOf((ConnectionLayout *)sender());
+  int index = -1;
+  for(int i=0;i<connections.count();i++) {
+    if(connections.at(i).layout==(ConnectionLayout *)sender()) {
+      index=i;
+      break;
+    }
+  }
+  
   if(index==-1) return;
   
@@ -230 +262 @@
   if (index >= 0) {
     //if we are coming from layout destroyed
-    if(currentTab<connectionsLayout.count()) connectionsWidget.at(currentTab)->hide();
-    connectionsWidget.at(index)->show();
+    if(currentTab<connections.count()) connections.at(currentTab).widget->hide();
+    connections.at(index).widget->show();
     currentTab = index;
   } else {
     currentTab = 0;
-    connectionsWidget.at(0)->show();
-  }
+    connections.at(0).widget->show();
+  }
+  QString msg="not connected";
   if (tabBar->count() == 0) {
-    status->showMessage(connectionsLayout.at(0)->getUDTStats());
+    if(connections.at(0).socket!=NULL) msg=connections.at(0).socket->getUDTStats();
+    
   } else {
-    status->showMessage(QString("%1: %2").arg(tabBar->tabText(index)).arg(connectionsLayout.at(index)->getUDTStats()));
-  }
+    if(connections.at(index).socket!=NULL) msg=QString("%1: %2").arg(tabBar->tabText(index)).arg(connections.at(index).socket->getUDTStats());
+  }
+  status->showMessage(msg);
 }
 
@@ -249 +284 @@
 
   if (dir_name != "") {
-    for (int i = 0; i < connectionsLayout.count(); i++) {
+    for (int i = 0; i < connections.count(); i++) {
       QFile *file;
       file = new QFile(dir_name + "/" +
-                       connectionsLayout.at(i)->getName() + ".xml");
+                       connections.at(i).layout->getName() + ".xml");
       if (!file->open(QIODevice::ReadOnly | QIODevice::Text)) {
         QMessageBox::warning(this, "Warning",
                              "Enable to load " +
-                                 connectionsLayout.at(i)->getName() +
+                                 connections.at(i).layout->getName() +
                                  ".xml");
         continue;
@@ -268 +303 @@
         QMessageBox::critical(
             this, "Error",
-            "unable to read " + connectionsLayout.at(i)->getName() +
+            "unable to read " + connections.at(i).layout->getName() +
                 ".xml" + " (" + errorMsg + " at " + QString::number(errorLine) +
                 "," + QString::number(errorColumn) + ")");
       } else {
-        connectionsLayout.at(i)->LoadXml(doc);
+        connections.at(i).layout->LoadXml(doc);
       }
       delete file;
@@ -282 +317 @@
   bool isUptodate = true;
 
-  for (int i = 0; i < connectionsLayout.count(); i++) {
-    if (!connectionsLayout.at(i)->IsUptodate()) {
+  for (int i = 0; i < connections.count(); i++) {
+    if (!connections.at(i).layout->IsUptodate()) {
       isUptodate = false;
       break;
@@ -319 +354 @@
   QDir().mkdir(dir_name);
 
-  for (int i = 0; i < connectionsLayout.count(); i++) {
+  for (int i = 0; i < connections.count(); i++) {
     QDomDocument *xml = new QDomDocument("remote_ui_xml");
 
-    connectionsLayout.at(i)->GetFullXml((QDomElement *)xml);
-
-    QFile fichier(dir_name + "/" + connectionsLayout.at(i)->getName() +
+    connections.at(i).layout->GetFullXml((QDomElement *)xml);
+
+    QFile fichier(dir_name + "/" + connections.at(i).layout->getName() +
                   ".xml");
     QString write_doc = (xml->ownerDocument()).toString();
@@ -344 +379 @@
 
 void Manager::send(void) {
-  for (int i = 0; i < connectionsLayout.count(); i++) {
+  for (int i = 0; i < connections.count(); i++) {
     QDomDocument doc("remote_ui_xml");
-    connectionsLayout.at(i)->GetUpdateXml((QDomElement *)&doc);
+    connections.at(i).layout->GetUpdateXml((QDomElement *)&doc);
     // fprintf(stderr,"merge\n%s\n",doc.toString().toLocal8Bit().constData());
 
-    connectionsLayout.at(i)->XmlToSend(doc);
+    connections.at(i).layout->XmlToSend(doc);
   }
 }
 
 void Manager::reset() {
-  for (int i = 0; i < connectionsLayout.count(); i++)
-    connectionsLayout.at(i)->ResetAllChilds();
-}
+  for (int i = 0; i < connections.count(); i++)
+    connections.at(i).layout->ResetAllChilds();
+}