Changeset 103127 in vbox for trunk

Timestamp:

Jan 31, 2024 6:40:04 AM (13 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

161375

Message:

FE/Qt: bugref:10501. Updating the cloud vm list.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• activity/overview/UIVMActivityOverviewWidget.cpp (modified) (14 diffs)
• manager/UIVirtualMachineItemCloud.h (modified) (1 diff)

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

@@ -238 +238 @@
     bool operator==(const UIActivityOverviewItem& other) const;
     int columnLength(int iColumnIndex) const;
+    const QUuid &machineId() const;
+
+
     virtual QString machineStateString() const = 0;
     virtual bool isRunning() const = 0;
@@ -245 +248 @@
     QString columnData(int iColumnIndex) const;
 
-    QUuid         m_VMuid;
-    QString       m_strVMName;
 
     ULONG  m_uCPUGuestLoad;
@@ -264 +265 @@
 
 protected:
+
+    QUuid         m_VMuid;
+    QString       m_strVMName;
 
     virtual void updateMetricData() = 0;
@@ -398 +402 @@
     void setDefaultViewFont(const QFont &font);
     void setDefaultViewFontColor(const QColor &color);
+    void setCloudMachineItems(const QList<UIVirtualMachineItemCloud*> &cloudItems);
 
 private slots:
@@ -850 +855 @@
 *********************************************************************************************************************************/
 UIActivityOverviewItem::UIActivityOverviewItem(const QUuid &uid, const QString &strVMName)
-    : m_VMuid(uid)
-    , m_strVMName(strVMName)
-    , m_uCPUGuestLoad(0)
+    : m_uCPUGuestLoad(0)
     , m_uTotalRAM(0)
     , m_uFreeRAM(0)
@@ -865 +868 @@
     , m_uDiskWriteTotal(0)
     , m_uDiskReadTotal(0)
+    , m_VMuid(uid)
+    , m_strVMName(strVMName)
 {
 }
 
 UIActivityOverviewItem::UIActivityOverviewItem()
-    : m_VMuid(QUuid())
-    , m_uCPUGuestLoad(0)
+    : m_uCPUGuestLoad(0)
     , m_uTotalRAM(0)
     , m_uUsedRAM(0)
@@ -882 +886 @@
     , m_uDiskWriteTotal(0)
     , m_uDiskReadTotal(0)
+    , m_VMuid(QUuid())
 {
 }
@@ -904 +909 @@
 {
     return m_columnData.value(iColumnIndex, QString()).length();
+}
+
+const QUuid &UIActivityOverviewItem::machineId() const
+{
+    return m_VMuid;
 }
 
@@ -959 +969 @@
 void UIActivityOverviewItemCloud::updateColumnData()
 {
+    updateMetricData();
+
+    //int iDecimalCount = 2;
+
+    m_columnData[VMActivityOverviewColumn_Name] = m_strVMName;
 }
 
@@ -1259 +1274 @@
     if (iIndex >= m_itemList.size() || !m_itemList[iIndex])
         return QUuid();
-    return m_itemList[iIndex]->m_VMuid;
+    return m_itemList[iIndex]->machineId();
 }
 
@@ -1268 +1283 @@
         if (!m_itemList[i])
             continue;
-        if (m_itemList[i]->m_VMuid == uid)
+        if (m_itemList[i]->machineId() == uid)
             return i;
     }
@@ -1289 +1304 @@
 {
     m_defaultViewFontColor = color;
+}
+
+void UIActivityOverviewModel::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;
+    }
+
+    /* Remove m_itemList items that are not in @cloudItems: */
+    QMutableVectorIterator<UIActivityOverviewItem*> iterator(m_itemList);
+    while (iterator.hasNext())
+    {
+        UIActivityOverviewItem *pItem = iterator.next();
+        if (!pItem->isCloudVM())
+            continue;
+        if (pItem && !newIds.contains(pItem->machineId()))
+            iterator.remove();
+    }
+
+    /* Add items that are not in m_itemList: */
+    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_itemList.size() && !fFound; ++i)
+        {
+            if (m_itemList[i] && m_itemList[i]->machineId() == id)
+                fFound = true;
+        }
+        if (!fFound)
+            m_itemList.append(new UIActivityOverviewItemCloud(id, comMachine.GetName(), comMachine));
+    }
 }
 
@@ -1390 +1450 @@
 void UIActivityOverviewModel::sltCloudUpdateTimeout()
 {
+    for (int i = 0; i < m_itemList.size(); ++i)
+    {
+        if (!m_itemList[i] && !m_itemList[i]->isCloudVM() && !m_itemList[i]->isRunning())
+            continue;
+        m_itemList[i]->updateColumnData();
+    }
 }
 
@@ -1600 +1666 @@
 void UIVMActivityOverviewWidget::setCloudMachineItems(const QList<UIVirtualMachineItemCloud*> &cloudItems)
 {
-    Q_UNUSED(cloudItems);
+    if (m_pModel)
+        m_pModel->setCloudMachineItems(cloudItems);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItemCloud.h

@@ -73 +73 @@
         /** Returns cached machine state. */
         KCloudMachineState machineState() const { return m_enmMachineState; }
+        QUuid machineId() const { return m_comCloudMachine.isOk() ? m_comCloudMachine.GetId() : QUuid(); }
 
         /** Defines fake cloud item @a enmState. */