Changeset 83365 in vbox for trunk

Timestamp:

Mar 23, 2020 10:35:27 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686. Adding IO columns

Location:

trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource

Files:

• UIResourceMonitor.cpp (modified) (13 diffs)
• UIResourceMonitor.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp

@@ -59 +59 @@
     // VMResouceMonitorColumn_RAMUsedPercentage,
     VMResouceMonitorColumn_NetworkDownUpRate,
-    // VMResouceMonitorColumn_NetworkDownUpTotal,
-    // VMResouceMonitorColumn_DiskIOWriteReadRate,
-    // VMResouceMonitorColumn_DiskIOWriteReadTotal,
+    VMResouceMonitorColumn_NetworkDownUpTotal,
+    VMResouceMonitorColumn_DiskIOWriteReadRate,
+    VMResouceMonitorColumn_DiskIOWriteReadTotal,
     VMResouceMonitorColumn_Max
 };
@@ -104 +104 @@
 
     UIResourceMonitorProxyModel(QObject *parent = 0);
+    void dataUpdate();
 
 protected:
@@ -120 +121 @@
 {
     Q_OBJECT;
+
+signals:
+
+    void sigDataUpdate();
 
 public:
@@ -208 +213 @@
 }
 
+void UIResourceMonitorProxyModel::dataUpdate()
+{
+    if (sourceModel())
+        emit dataChanged(index(0,0), index(sourceModel()->rowCount(), sourceModel()->columnCount()));
+}
+
 
 /*********************************************************************************************************************************
@@ -241 +252 @@
 QVariant UIResourceMonitorModel::data(const QModelIndex &index, int role) const
 {
+    int iDecimalCount = 2;
     if (!index.isValid() || role != Qt::DisplayRole || index.row() >= rowCount())
         return QVariant();
@@ -255 +267 @@
             break;
         case VMResouceMonitorColumn_NetworkDownUpRate:
-            return QString("%1/%2").arg(m_itemList[index.row()].m_uNetworkDownRate).arg(m_itemList[index.row()].m_uNetworkUpRate);
+            return QString("%1/%2").arg(uiCommon().formatSize(m_itemList[index.row()].m_uNetworkDownRate, iDecimalCount)).
+                arg(uiCommon().formatSize(m_itemList[index.row()].m_uNetworkUpRate, iDecimalCount));
+            break;
+        case VMResouceMonitorColumn_NetworkDownUpTotal:
+            return QString("%1/%2").arg(uiCommon().formatSize(m_itemList[index.row()].m_uNetworkDownTotal, iDecimalCount)).
+                arg(uiCommon().formatSize(m_itemList[index.row()].m_uNetworkUpTotal, iDecimalCount));
+            break;
+        case VMResouceMonitorColumn_DiskIOWriteReadRate:
+            return QString("%1/%2").arg(uiCommon().formatSize(m_itemList[index.row()].m_uDiskWriteRate, iDecimalCount)).
+                arg(uiCommon().formatSize(m_itemList[index.row()].m_uDiskReadRate, iDecimalCount));
+            break;
+        case VMResouceMonitorColumn_DiskIOWriteReadTotal:
+            return QString("%1/%2").arg(uiCommon().formatSize(m_itemList[index.row()].m_uDiskWriteTotal, iDecimalCount)).
+                arg(uiCommon().formatSize(m_itemList[index.row()].m_uDiskReadTotal, iDecimalCount));
             break;
         default:
@@ -273 +298 @@
                 break;
             case VMResouceMonitorColumn_CPUGuestLoad:
-                return tr("CPU Load (Guest)");
+                return tr("CPU Load\n(Guest)");
                 break;
             case VMResouceMonitorColumn_CPUVMMLoad:
-                return tr("CPU Load (VMM)");
+                return tr("CPU Load\n(VMM)");
                 break;
             // case VMResouceMonitorColumn_RAMUsedAndTotal:
@@ -285 +310 @@
             //     break;
             case VMResouceMonitorColumn_NetworkDownUpRate:
-                return tr("Network Up/Down Rate");
+                return tr("Network Up/Down\nRate");
+                break;
+            case VMResouceMonitorColumn_NetworkDownUpTotal:
+                return tr("Network Up/Down\nTotal");
+                break;
+            case VMResouceMonitorColumn_DiskIOWriteReadRate:
+                return tr("Disk Write/Read\nRate");
+                break;
+            case VMResouceMonitorColumn_DiskIOWriteReadTotal:
+                return tr("Disk Write/Read\nTotal");
                 break;
 
@@ -312 +346 @@
 void UIResourceMonitorModel::sltMachineStateChanged(const QUuid &uId, const KMachineState state)
 {
+    emit layoutAboutToBeChanged();
     int iIndex = m_itemList.indexOf(UIResourceMonitorItem(uId));
     /* Remove the machine in case machine is no longer working. */
     if (iIndex != -1 && state != KMachineState_Running)
-    {
         m_itemList.remove(iIndex);
-        emit layoutChanged();
-    }
 
     /* Insert the machine if it is working. */
@@ -325 +357 @@
         CMachine comMachine = uiCommon().virtualBox().FindMachine(uId.toString());
         m_itemList << UIResourceMonitorItem(uId, comMachine.GetName());
-        emit layoutChanged();
-    }
+    }
+    emit layoutChanged();
 }
 
@@ -341 +373 @@
             m_itemList[i].m_uCPUGuestLoad = aPctExecuting;
             m_itemList[i].m_uCPUVMMLoad = aPctVMM;
+            UIMonitorCommon::getNetworkLoad(m_itemList[i].m_comDebugger,
+                                            m_itemList[i].m_uNetworkDownRate, m_itemList[i].m_uNetworkUpRate);
+            m_itemList[i].m_uNetworkDownTotal += m_itemList[i].m_uNetworkDownRate;
+            m_itemList[i].m_uNetworkUpTotal += m_itemList[i].m_uNetworkUpRate;
+
+            UIMonitorCommon::getDiskLoad(m_itemList[i].m_comDebugger,
+                                         m_itemList[i].m_uDiskWriteRate, m_itemList[i].m_uDiskReadRate);
+            m_itemList[i].m_uDiskWriteTotal += m_itemList[i].m_uDiskWriteRate;
+            m_itemList[i].m_uDiskReadTotal += m_itemList[i].m_uDiskReadRate;
         }
     }
-    emit layoutChanged();
+    //emit layoutChanged();
     /* dataChanged signal result in view update when there is a proxy model in between. */
     //emit dataChanged(index(0,0), index(rowCount(), columnCount()));
+    emit sigDataUpdate();
 }
 
@@ -437 +479 @@
         m_pTableWidget->verticalHeader()->setDefaultSectionSize(m_pTableWidget->verticalHeader()->minimumSectionSize());
         m_pTableWidget->setAlternatingRowColors(true);
+        m_pTableWidget->setSortingEnabled(true);
+        m_pTableWidget->sortByColumn(0, Qt::AscendingOrder);
+        connect(m_pModel, &UIResourceMonitorModel::sigDataUpdate, this, &UIResourceMonitorWidget::sltHandleDataUpdate);
     }
 }
@@ -470 +515 @@
 }
 
+void UIResourceMonitorWidget::sltHandleDataUpdate()
+{
+    if (m_pProxyModel)
+        m_pProxyModel->dataUpdate();
+}
+
 
 /*********************************************************************************************************************************

trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.h

@@ -72 +72 @@
 private slots:
 
+    void sltHandleDataUpdate();
 
 private: