Changeset 104962 in vbox

Timestamp:

Jun 19, 2024 11:36:12 AM (3 months ago)

Author:

vboxsync

Message:

FE/Qt. bugref:10659. Updating cloud vm metrics.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview

Files:

• UIVMActivityOverviewModelView.cpp (modified) (9 diffs)
• UIVMActivityOverviewModelView.h (modified) (3 diffs)
• UIVMActivityOverviewWidget.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewModelView.cpp

@@ -40 +40 @@
 #include "UITranslator.h"
 #include "UIVirtualBoxEventHandler.h"
+#include "UIVirtualMachineItemCloud.h"
 #include "UIVMActivityOverviewModelView.h"
 
@@ -53 +54 @@
 #include "CMachineDebugger.h"
 #include "CSession.h"
+#include "KMetricType.h"
 
 
@@ -82 +84 @@
 private:
 
-    void updateCellText(VMActivityOverviewColumn enmColumnIndex, const QString &strText);
+
 
     KMachineState    m_enmMachineState;
@@ -289 +291 @@
 }
 
-void UIActivityOverviewAccessibleRowLocal::updateCellText(VMActivityOverviewColumn enmColumnIndex, const QString &strText)
-{
-    if (m_cells.value(enmColumnIndex, 0))
-        m_cells[enmColumnIndex]->setText(strText);
-}
-
 QString UIActivityOverviewAccessibleRowLocal::machineStateString() const
 {
@@ -356 +352 @@
 }
 
-void UIActivityOverviewAccessibleRowCloud::sltMetricDataReceived(KMetricType /*enmMetricType*/,
+void UIActivityOverviewAccessibleRowCloud::sltMetricDataReceived(KMetricType enmMetricType,
                                                         const QVector<QString> &data, const QVector<QString> &timeStamps)
 {
@@ -366 +362 @@
         return;
 
-    // int iDecimalCount = 2;
-    // QLocale locale;
-    // if (enmMetricType == KMetricType_CpuUtilization)
-    // {
-    //     //QString QLocale::toString(double i, char f = 'g', int prec = 6) const
-
-    //     // m_columnData[VMActivityOverviewColumn_CPUGuestLoad] =
-    //     //     QString("%1%").arg(QString::number(data[0].toFloat(), 'f', iDecimalCount));
-
-    //     m_columnData[VMActivityOverviewColumn_CPUGuestLoad] =
-    //         QString("%1%").arg(locale.toString(data[0].toFloat(), 'f', iDecimalCount));
-    // }
-    // else if (enmMetricType == KMetricType_MemoryUtilization)
-    // {
-    //      if (m_uTotalRAM != 0)
-    //      {
-    //          quint64 uUsedRAM = (quint64)data[0].toFloat() * (m_uTotalRAM / 100.f);
-    //          m_columnData[VMActivityOverviewColumn_RAMUsedAndTotal] =
-    //              QString("%1/%2").arg(UITranslator::formatSize(_1K * uUsedRAM, iDecimalCount)).
-    //              arg(UITranslator::formatSize(_1K * m_uTotalRAM, iDecimalCount));
-    //      }
-    //      m_columnData[VMActivityOverviewColumn_RAMUsedPercentage] =
-    //          QString("%1%").arg(QString::number(data[0].toFloat(), 'f', iDecimalCount));
-    // }
-    // else if (enmMetricType == KMetricType_NetworksBytesOut)
-    //     m_columnData[VMActivityOverviewColumn_NetworkUpRate] =
-    //         UITranslator::formatSize((quint64)data[0].toFloat(), iDecimalCount);
-    // else if (enmMetricType == KMetricType_NetworksBytesIn)
-    //     m_columnData[VMActivityOverviewColumn_NetworkDownRate] =
-    //         UITranslator::formatSize((quint64)data[0].toFloat(), iDecimalCount);
-    // else if (enmMetricType == KMetricType_DiskBytesRead)
-    //     m_columnData[VMActivityOverviewColumn_DiskIOReadRate] =
-    //         UITranslator::formatSize((quint64)data[0].toFloat(), iDecimalCount);
-    // else if (enmMetricType == KMetricType_DiskBytesWritten)
-    //     m_columnData[VMActivityOverviewColumn_DiskIOWriteRate] =
-    //         UITranslator::formatSize((quint64)data[0].toFloat(), iDecimalCount);
+    int iDecimalCount = 2;
+    QLocale locale;
+    if (enmMetricType == KMetricType_CpuUtilization)
+    {
+        updateCellText(VMActivityOverviewColumn_CPUGuestLoad, QString("%1%").arg(locale.toString(data[0].toFloat(), 'f', iDecimalCount)));
+    }
+    else if (enmMetricType == KMetricType_MemoryUtilization)
+    {
+         if (m_uTotalRAM != 0)
+         {
+             quint64 uUsedRAM = (quint64)data[0].toFloat() * (m_uTotalRAM / 100.f);
+             updateCellText(VMActivityOverviewColumn_RAMUsedAndTotal,
+                            QString("%1/%2").arg(UITranslator::formatSize(_1K * uUsedRAM, iDecimalCount)).
+                            arg(UITranslator::formatSize(_1K * m_uTotalRAM, iDecimalCount)));
+         }
+         updateCellText(VMActivityOverviewColumn_RAMUsedPercentage,
+                        QString("%1%").arg(QString::number(data[0].toFloat(), 'f', iDecimalCount)));
+    }
+    else if (enmMetricType == KMetricType_NetworksBytesOut)
+        updateCellText(VMActivityOverviewColumn_NetworkUpRate,
+                       UITranslator::formatSize((quint64)data[0].toFloat(), iDecimalCount));
+    else if (enmMetricType == KMetricType_NetworksBytesIn)
+        updateCellText(VMActivityOverviewColumn_NetworkDownRate,
+                       UITranslator::formatSize((quint64)data[0].toFloat(), iDecimalCount));
+    else if (enmMetricType == KMetricType_DiskBytesRead)
+        updateCellText(VMActivityOverviewColumn_DiskIOReadRate,
+                       UITranslator::formatSize((quint64)data[0].toFloat(), iDecimalCount));
+    else if (enmMetricType == KMetricType_DiskBytesWritten)
+        updateCellText(VMActivityOverviewColumn_DiskIOWriteRate,
+                       UITranslator::formatSize((quint64)data[0].toFloat(), iDecimalCount));
 
     sender()->deleteLater();
@@ -429 +419 @@
 void UIActivityOverviewAccessibleRowCloud::resetColumData()
 {
-    // for (int i = (int) VMActivityOverviewColumn_CPUGuestLoad;
-    //      i < (int)VMActivityOverviewColumn_Max; ++i)
-    //     m_columnData[i] = UIVMActivityOverviewWidget::tr("N/A");
+    for (int i = (int) VMActivityOverviewColumn_CPUGuestLoad;
+         i < (int)VMActivityOverviewColumn_Max; ++i)
+        updateCellText(i,  QApplication::translate("UIVMActivityOverviewWidget", "N/A"));
 }
 
@@ -581 +571 @@
 {
     initialize();
+}
+
+void UIActivityOverviewAccessibleModel::setCloudMachineItems(const QList<UIVirtualMachineItemCloud*> &cloudItems)
+{
+    QVector<QUuid> newIds;
+    foreach (const UIVirtualMachineItemCloud* pItem, cloudItems)
+    {
+        if (!pItem)
+            continue;
+        QUuid id = pItem->machineId();
+        if (id.isNull())
+            continue;
+        newIds << id;
+    }
+    QVector<UIActivityOverviewAccessibleRow*> originalItemList = m_rows;
+
+    /* Remove m_rows items that are not in @cloudItems: */
+    QMutableVectorIterator<UIActivityOverviewAccessibleRow*> iterator(m_rows);
+    while (iterator.hasNext())
+    {
+        UIActivityOverviewAccessibleRow *pItem = iterator.next();
+        if (!pItem->isCloudVM())
+            continue;
+        if (pItem && !newIds.contains(pItem->machineId()))
+            iterator.remove();
+    }
+
+    /* Add items that are not in m_rows: */
+    foreach (const UIVirtualMachineItemCloud* pItem, cloudItems)
+    {
+        if (!pItem)
+            continue;
+        CCloudMachine comMachine = pItem->machine();
+        if (!comMachine.isOk())
+            continue;
+        QUuid id = comMachine.GetId();
+        /* Linearly search for the vm with th same id. I cannot make QVector::contain work since we store pointers: */
+        bool fFound = false;
+        for (int i = 0; i < m_rows.size() && !fFound; ++i)
+        {
+            if (m_rows[i] && m_rows[i]->machineId() == id)
+                fFound = true;
+        }
+        if (!fFound)
+            m_rows.append(new UIActivityOverviewAccessibleRowCloud(m_pTableView, id, comMachine.GetName(), comMachine));
+    }
+
+    /* Update cloud machine states: */
+    for (int i = 0; i < m_rows.size(); ++i)
+    {
+        if (!m_rows[i] || !m_rows[i]->isCloudVM())
+            continue;
+        UIActivityOverviewAccessibleRowCloud *pItem = qobject_cast<UIActivityOverviewAccessibleRowCloud*>(m_rows[i]);
+        if (!pItem)
+            continue;
+        pItem->updateMachineState();
+    }
 }
 
@@ -998 +1045 @@
 }
 
+void UIActivityOverviewAccessibleRow::updateCellText(int /*VMActivityOverviewColumn*/ enmColumnIndex, const QString &strText)
+{
+    if (m_cells.value(enmColumnIndex, 0))
+        m_cells[enmColumnIndex]->setText(strText);
+}
+
 
 /*********************************************************************************************************************************

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewModelView.h

@@ -49 +49 @@
 class UIActivityOverviewAccessibleCell;
 class UIActivityOverviewAccessibleRow;
+class UIActivityOverviewAccessibleRowCloud;
+class UIVirtualMachineItemCloud;
 
 class UIVMActivityOverviewAccessibleTableView : public QITableView
@@ -149 +151 @@
 
 protected:
-
+    void updateCellText(int /*VMActivityOverviewColumn*/ iColumnIndex, const QString &strText);
     QUuid m_uMachineId;
     /* Key is VMActivityOverviewColumn enum item. */
@@ -189 +191 @@
     void setColumnVisible(const QMap<int, bool>& columnVisible);
     bool columnVisible(int iColumnId) const;
+    void setCloudMachineItems(const QList<UIVirtualMachineItemCloud*> &cloudItems);
 
 private slots:

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.cpp

@@ -1789 +1789 @@
     if (m_pModel)
         m_pModel->setCloudMachineItems(cloudItems);
+    if (m_pAccessibleModel)
+        m_pAccessibleModel->setCloudMachineItems(cloudItems);
 }