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

Timestamp:

Jan 10, 2024 8:41:20 AM (11 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10501. Converting time stamps we get from OCI a bit earlier.

Location:

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

Files:

• UIVMActivityMonitor.cpp (modified) (4 diffs)
• UIVMActivityMonitor.h (modified) (1 diff)

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

@@ -758 +758 @@
             int iDataIndex = qMin(labels->size() - 1, iTimeIndex - (m_iMaximumQueueSize - maxDataSize()));
             if (iDataIndex >= 0)
-                strAxisText = UIVMActivityMonitorCloud::formatCloudTimeStamp(labels->at(iDataIndex));
+                strAxisText = labels->at(iDataIndex);
         }
         else
@@ -2060 +2060 @@
 }
 
-void UIVMActivityMonitorCloud::sltMetricDataReceived(KMetricType enmMetricType, QVector<QString> data, QVector<QString> timeStamps)
+void UIVMActivityMonitorCloud::sltMetricDataReceived(KMetricType enmMetricType,
+                                                     const QVector<QString> &data, const QVector<QString> &timeStamps)
 {
     if (data.size() != timeStamps.size())
         return;
+    QVector<QString> newTimeStamps;
+    foreach (const QString &strTimeStamp, timeStamps)
+    {
+        if (strTimeStamp.isEmpty())
+            continue;
+        QDateTime dateTime = QDateTime::fromString(strTimeStamp, Qt::RFC2822Date);
+        if (!dateTime.isValid())
+            continue;
+        newTimeStamps << dateTime.time().toString("hh:mm");
+    }
+
     for (int i = 0; i < data.size(); ++i)
     {
@@ -2069 +2081 @@
         {
             float fValue = data[i].toFloat();
-            updateCPUChart((ULONG) fValue, timeStamps[i]);
+            updateCPUChart((ULONG) fValue, newTimeStamps[i]);
         }
         else if (enmMetricType == KMetricType_NetworksBytesOut)
-            cacheNetworkTransmit(timeStamps[i], (int)data[i].toFloat());
+            cacheNetworkTransmit(newTimeStamps[i], (int)data[i].toFloat());
         else if (enmMetricType == KMetricType_NetworksBytesIn)
-            cacheNetworkReceive(timeStamps[i], (int)data[i].toFloat());
+            cacheNetworkReceive(newTimeStamps[i], (int)data[i].toFloat());
         else if (enmMetricType == KMetricType_DiskBytesRead)
-            cacheDiskRead(timeStamps[i], (int)data[i].toFloat());
+            cacheDiskRead(newTimeStamps[i], (int)data[i].toFloat());
         else if (enmMetricType == KMetricType_DiskBytesWritten)
-            cacheDiskWrite(timeStamps[i], (int)data[i].toFloat());
+            cacheDiskWrite(newTimeStamps[i], (int)data[i].toFloat());
         else if (enmMetricType == KMetricType_MemoryUtilization)
         {
@@ -2085 +2097 @@
                 /* calculate used RAM amount in kb: */
                 quint64 iUsedRAM = data[i].toFloat() * (m_iTotalRAM / 100.f);
-                updateRAMChart(iUsedRAM, timeStamps[i]);
+                updateRAMChart(iUsedRAM, newTimeStamps[i]);
             }
         }

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

@@ -325 +325 @@
 
     void sltMetricNameListingComplete(QVector<QString> metricNameList);
-    void sltMetricDataReceived(KMetricType enmMetricType, QVector<QString> data, QVector<QString> timeStamps);
+    void sltMetricDataReceived(KMetricType enmMetricType,
+                               const QVector<QString> &data, const QVector<QString> &timeStamps);
     void sltMachineStateUpdateTimeout();