yarpmanager: add 'modifiers' column for portmonitor in connection view

hu-yue · Jun 22, 2017 · 91c2112 · 91c2112
1 parent 058435f
commit 91c2112
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/yarpmanager/src-manager/applicationviewwidget.cpp b/src/yarpmanager/src-manager/applicationviewwidget.cpp
@@ -654,10 +654,18 @@ void ApplicationViewWidget::updateApplicationWindow()
         QString to = QString("%1").arg((*cnnitr).to());
         QString carrier = QString("%1").arg((*cnnitr).carrier());
         QString status = "disconnected";
+        QString modifier="";
+        size_t pos = carrier.toStdString().find("+");
+        if(pos != std::string::npos)
+        {
+            modifier = carrier.mid(pos);
+            QStringList myStringList = carrier.split('+');
+            carrier = myStringList.first();
+        }
 
 
         QStringList l;
-        l << type << sId << status << from << to << carrier;
+        l << type << sId << status << from << to << carrier << modifier;
         CustomTreeWidgetItem *it = new CustomTreeWidgetItem(ui->connectionList,l);
         ui->moduleList->addTopLevelItem(it);
 
@@ -753,7 +761,7 @@ bool ApplicationViewWidget::isEditable(QTreeWidgetItem *it,int col)
         break;
     }
     case yarp::manager::INOUTD:{
-           if (col == 3 || col == 4 || col == 5 ) {
+           if (col == 3 || col == 4 || col == 5 || col == 6) {
                if (it->text(2) == "disconnected") {
                     return true;
                }
@@ -1307,12 +1315,14 @@ bool ApplicationViewWidget::onConnect()
             {
                 carrier=it->text(5);
             }
-            scanAvailableCarriers(carrier);
+            if(!scanAvailableCarriers(carrier))
+                continue;
+            carrier = carrier + it->text(6); //adding modifier.
             MIDs.push_back(it->text(1).toInt());
             safeManager.updateConnection(it->text(1).toInt(),
                                      it->text(3).toLatin1().data(),
                                      it->text(4).toLatin1().data(),
-                                     it->text(5).toLatin1().data());
+                                     carrier.toLatin1().data());
 
             it->setText(2,"waiting");
             it->setIcon(0,QIcon(":/refresh22.svg"));

diff --git a/src/yarpmanager/src-manager/applicationviewwidget.ui b/src/yarpmanager/src-manager/applicationviewwidget.ui
@@ -178,6 +178,11 @@ background-color: rgb(255, 255, 255);*/
             <string>Carrier</string>
            </property>
           </column>
+          <column>
+           <property name="text">
+            <string>Modifiers</string>
+           </property>
+          </column>
          </widget>
          <widget class="CustomTreeWidget" name="resourcesList">
           <property name="sizePolicy">