Changeset 103164 in vbox

Timestamp:

Feb 1, 2024 4:14:28 PM (10 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10501. Moving some cloud machine related functions to the common code area.

Location:

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

Files:

• UIMonitorCommon.cpp (modified) (2 diffs)
• UIMonitorCommon.h (modified) (1 diff)
• vmactivity/UIVMActivityMonitor.cpp (modified) (3 diffs)
• vmactivity/UIVMActivityMonitor.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/activity/UIMonitorCommon.cpp

@@ -38 +38 @@
 
 /* COM includes: */
+#include "CForm.h"
+#include "CFormValue.h"
+#include "CRangedIntegerFormValue.h"
 #include "CMachineDebugger.h"
 #include "CPerformanceCollector.h"
-
+#include <VBox/com/VirtualBox.h>
 
 
@@ -309 +312 @@
     painter.drawPath(UIMonitorCommon::doughnutSlice(chartRect, innerRect, 90, fAngle));
 }
+
+/* static */
+quint64 UIMonitorCommon::determineTotalRAMAmount(CCloudMachine &comCloudMachine)
+{
+    quint64 iTotalRAM = 0;
+    CForm comForm = comCloudMachine.GetDetailsForm();
+    /* Ignore cloud machine errors: */
+    if (comCloudMachine.isOk())
+    {
+        /* Common anchor for all fields: */
+        const QString strAnchorType = "cloud";
+
+        /* For each form value: */
+        const QVector<CFormValue> values = comForm.GetValues();
+        foreach (const CFormValue &comIteratedValue, values)
+        {
+            /* Ignore invisible values: */
+            if (!comIteratedValue.GetVisible())
+                continue;
+
+            /* Acquire label: */
+            const QString strLabel = comIteratedValue.GetLabel();
+            if (strLabel != "RAM")
+                continue;
+
+            AssertReturn((comIteratedValue.GetType() == KFormValueType_RangedInteger), 0);
+
+            CRangedIntegerFormValue comValue(comIteratedValue);
+            iTotalRAM = comValue.GetInteger();
+            QString strRAMUnit = comValue.GetSuffix();
+            if (strRAMUnit.compare("gb", Qt::CaseInsensitive) == 0)
+                iTotalRAM *= _1G / _1K;
+            else if (strRAMUnit.compare("mb", Qt::CaseInsensitive) == 0)
+                iTotalRAM *= _1M / _1K;
+            if (!comValue.isOk())
+                iTotalRAM = 0;
+        }
+    }
+    return iTotalRAM;
+}

trunk/src/VBox/Frontends/VirtualBox/src/activity/UIMonitorCommon.h

@@ -131 +131 @@
                                       const QRectF &chartRect, const QRectF &innerRect, int iOverlayAlpha, const QColor &color);
 
+        static quint64 determineTotalRAMAmount(CCloudMachine &comCloudMachine);
+
 private:
 

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp

@@ -50 +50 @@
 /* COM includes: */
 #include "CConsole.h"
-#include "CForm.h"
-#include "CFormValue.h"
 #include "CGuest.h"
 #include "CPerformanceCollector.h"
 #include "CPerformanceMetric.h"
-#include "CRangedIntegerFormValue.h"
 #include <iprt/string.h>
-#include <VBox/com/VirtualBox.h>
 
 /* External includes: */
@@ -1814 +1810 @@
 
     setMachine(machine);
-    determineTotalRAMAmount();
+    m_iTotalRAM = UIMonitorCommon::determineTotalRAMAmount(m_comMachine);
 
     m_pMachineStateUpdateTimer = new QTimer(this);
@@ -1833 +1829 @@
     /* Start the timer: */
     start();
-}
-
-void UIVMActivityMonitorCloud::determineTotalRAMAmount()
-{
-    CForm comForm = m_comMachine.GetDetailsForm();
-    /* Ignore cloud machine errors: */
-    if (m_comMachine.isOk())
-    {
-        /* Common anchor for all fields: */
-        const QString strAnchorType = "cloud";
-
-        /* For each form value: */
-        const QVector<CFormValue> values = comForm.GetValues();
-        foreach (const CFormValue &comIteratedValue, values)
-        {
-            /* Ignore invisible values: */
-            if (!comIteratedValue.GetVisible())
-                continue;
-
-            /* Acquire label: */
-            const QString strLabel = comIteratedValue.GetLabel();
-            if (strLabel != "RAM")
-                continue;
-
-            AssertReturnVoid((comIteratedValue.GetType() == KFormValueType_RangedInteger));
-
-            CRangedIntegerFormValue comValue(comIteratedValue);
-            m_iTotalRAM = comValue.GetInteger();
-            QString strRAMUnit = comValue.GetSuffix();
-            if (strRAMUnit.compare("gb", Qt::CaseInsensitive) == 0)
-                m_iTotalRAM *= _1G / _1K;
-            else if (strRAMUnit.compare("mb", Qt::CaseInsensitive) == 0)
-                m_iTotalRAM *= _1M / _1K;
-            if (!comValue.isOk())
-                m_iTotalRAM = 0;
-        }
-    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.h

@@ -353 +353 @@
     bool findMetric(KMetricType enmMetricType, UIMetric &metric, int &iDataSeriesIndex) const;
     void prepareMetrics();
-    void determineTotalRAMAmount();
 
     CCloudMachine m_comMachine;