Changeset 102973 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jan 19, 2024 2:46:08 PM (15 months ago)

Author:

vboxsync

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

161201

Message:

FE/Qt: bugref:10501. Getting cached cloud machine list at each tick of the timer.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.cpp (modified) (13 diffs)

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

@@ -135 +135 @@
 };
 
-/** A container QWidget to layout host stats. related widgets. */
-
 
 /*********************************************************************************************************************************
 *   Class UIVMActivityOverviewHostStatsWidget definition.                                                                        *
 *********************************************************************************************************************************/
-
+/** A container QWidget to layout host stats. related widgets. */
 class UIVMActivityOverviewHostStatsWidget : public QIWithRetranslateUI<QWidget>
 {
@@ -233 +231 @@
 public:
 
-    UIActivityOverviewItem(const QUuid &uid, const QString &strVMName, KMachineState enmState);
-    //yUIActivityOverviewItem(const QUuid &uid);
+    UIActivityOverviewItem(const QUuid &uid, const QString &strVMName);
+
     UIActivityOverviewItem();
     ~UIActivityOverviewItem();
@@ -356 +354 @@
     void removeItem(const QUuid& uMachineId);
     void getHostRAMStats();
-    void obtainCloudClientList();
+    QVector<CCloudClient> obtainCloudClientList();
+    QVector<CCloudMachine> obtainCloudMachineList();
 
     QVector<UIActivityOverviewItem> m_itemList;
@@ -369 +368 @@
     CPerformanceCollector m_performanceCollector;
     QMap<int, bool> m_columnVisible;
-    /** If true the table data and corresponding view is updated. Possibly set by host widget to true only
-     *  when the widget is visible in the main UI. */
-    bool m_fShouldUpdate;
     UIVMActivityOverviewHostStats m_hostStats;
     QFont m_defaultViewFont;
@@ -377 +373 @@
     /** Maximum length of string length of data displayed in column. Updated in UIActivityOverviewModel::data(..). */
     mutable QMap<int, int> m_columnDataMaxLength;
-    QVector<CCloudClient> m_comCloudClients;
 };
 
@@ -795 +790 @@
 *   Class UIVMActivityOverviewItem implementation.                                                                               *
 *********************************************************************************************************************************/
-UIActivityOverviewItem::UIActivityOverviewItem(const QUuid &uid, const QString &strVMName, KMachineState enmState)
+UIActivityOverviewItem::UIActivityOverviewItem(const QUuid &uid, const QString &strVMName)
     : m_VMuid(uid)
     , m_strVMName(strVMName)
-    , m_enmMachineState(enmState)
     , m_uCPUGuestLoad(0)
     , m_uCPUVMMLoad(0)
@@ -969 +963 @@
     , m_pTimer(new QTimer(this))
     , m_pCloudUpdateTimer(new QTimer(this))
-    , m_fShouldUpdate(true)
 {
     initialize();
@@ -995 +988 @@
         m_pCloudUpdateTimer->start(10 * 1000);
     }
-    obtainCloudClientList();
 }
 
@@ -1012 +1004 @@
 void UIActivityOverviewModel::setShouldUpdate(bool fShouldUpdate)
 {
-    m_fShouldUpdate = fShouldUpdate;
+    if (m_pTimer)
+    {
+        if (fShouldUpdate)
+            m_pTimer->start();
+        else
+            m_pTimer->stop();
+    }
+    if (m_pCloudUpdateTimer)
+    {
+        if (fShouldUpdate)
+            m_pCloudUpdateTimer->start();
+        else
+            m_pCloudUpdateTimer->stop();
+    }
 }
 
@@ -1142 +1147 @@
 void UIActivityOverviewModel::sltTimeout()
 {
-    if (!m_fShouldUpdate)
-        return;
     ULONG aPctExecuting;
     ULONG aPctHalted;
@@ -1266 +1269 @@
 }
 
-void UIActivityOverviewModel::obtainCloudClientList()
-{
+QVector<CCloudMachine> UIActivityOverviewModel::obtainCloudMachineList()
+{
+    QVector<CCloudMachine> cloudMachineList;
+    QVector<CCloudClient> cloudClientList = obtainCloudClientList();
+    foreach (const CCloudClient &comClient, cloudClientList)
+    {
+        cloudMachineList << comClient.GetCloudMachineList();
+    }
+    return cloudMachineList;
+}
+
+QVector<CCloudClient> UIActivityOverviewModel::obtainCloudClientList()
+{
+    QVector<CCloudClient> comCloudClients;
     /* Acquire Cloud Profile Manager restrictions: */
     const QStringList restrictions = gEDataManager->cloudProfileManagerRestrictions();
@@ -1321 +1336 @@
                                                             strErrorMessage);
             if (strErrorMessage.isEmpty() && comCloudClient.isOk())
-                m_comCloudClients << comCloudClient;
+                comCloudClients << comCloudClient;
         }
     }
+    return comCloudClients;
 }
 
 void UIActivityOverviewModel::sltCloudUpdateTimeout()
 {
+    ///QVector<CCloudMachine> obtainCloudMachineList(); UIActivityOverviewModel::obtainCloudMachineList()
 }
 
@@ -1437 +1454 @@
 void UIActivityOverviewModel::addItem(const QUuid& uMachineId, const QString& strMachineName, KMachineState enmState)
 {
-    m_itemList.append(UIActivityOverviewItem(uMachineId, strMachineName, enmState));
+    UIActivityOverviewItem newItem(uMachineId, strMachineName);
+    newItem.m_enmMachineState = enmState;
+    m_itemList.append(newItem);
 }