Changeset 102653 in vbox

Timestamp:

Dec 20, 2023 2:35:23 PM (11 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10501. Formatiing datetime we get from OCI and using them in the chart X axis. This still needs some polishing.

Location:

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

Files:

• UIVMActivityMonitor.cpp (modified) (6 diffs)
• UIVMActivityMonitor.h (modified) (4 diffs)

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

@@ -743 +743 @@
     for (int i = 0; i < iXSubAxisCount + 2; ++i)
     {
+        int iTimeIndex = iTotalSeconds - i * iTotalSeconds / (float)(iXSubAxisCount + 1);
+        QString strAxisText;
+        if (m_pMetric && m_pMetric->hasDataLabels())
+        {
+            int iDataIndex = iTimeIndex - (m_iMaximumQueueSize - maxDataSize());
+            const QQueue<QString> *labels = m_pMetric->labels();
+            if (iDataIndex < labels->size())
+            {
+                strAxisText = UIVMActivityMonitorCloud::formatCloudTimeStamp(labels->at(iDataIndex));
+
+            }
+        }
+        else
+            strAxisText = QString::number(iTimeIndex);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+        int iTextWidth = fontMetrics.horizontalAdvance(strAxisText);
+#else
+        int iTextWidth = fontMetrics.width(strAxisText);
+#endif
         int iTextX = m_lineChartRect.left() + i * m_lineChartRect.width() / (float) (iXSubAxisCount + 1);
-        QString strCurrentSec = QString::number(iTotalSeconds - i * iTotalSeconds / (float)(iXSubAxisCount + 1));
-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-        int iTextWidth = fontMetrics.horizontalAdvance(strCurrentSec);
-#else
-        int iTextWidth = fontMetrics.width(strCurrentSec);
-#endif
         if (i == 0)
         {
-            strCurrentSec += " " + m_strXAxisLabel;
-            painter.drawText(iTextX, m_lineChartRect.bottom() + iFontHeight, strCurrentSec);
+            strAxisText += " " + m_strXAxisLabel;
+            painter.drawText(iTextX, m_lineChartRect.bottom() + iFontHeight, strAxisText);
         }
         else
-            painter.drawText(iTextX - 0.5 * iTextWidth, m_lineChartRect.bottom() + iFontHeight, strCurrentSec);
+            painter.drawText(iTextX - 0.5 * iTextWidth, m_lineChartRect.bottom() + iFontHeight, strAxisText);
     }
 }
@@ -1034 +1047 @@
     addData(iDataSeriesIndex, iData);
 
-    m_labels[iDataSeriesIndex].enqueue(strLabel);
-    if (m_data[iDataSeriesIndex].size() > m_iMaximumQueueSize)
-        m_labels[iDataSeriesIndex].dequeue();
+    if (iDataSeriesIndex == 0)
+    {
+        m_labels.enqueue(strLabel);
+        if (m_labels.size() > m_iMaximumQueueSize)
+            m_labels.dequeue();
+    }
 }
 
@@ -1044 +1060 @@
         return 0;
     return &m_data[iDataSeriesIndex];
+}
+
+const QQueue<QString> *UIMetric::labels() const
+{
+    return &m_labels;
+}
+
+bool UIMetric::hasDataLabels() const
+{
+    return !m_labels.isEmpty();
 }
 
@@ -2053 +2079 @@
     UIMetric &networkMetric = m_metrics[m_strNetworkMetricName];
     networkMetric.addData(0, uReceiveRate, strLabel);
-    networkMetric.addData(1, uTransmitRate, strLabel);
+    networkMetric.addData(1, uTransmitRate);
 
     if (m_infoLabels.contains(m_strNetworkMetricName)  && m_infoLabels[m_strNetworkMetricName])
@@ -2072 +2098 @@
 
     diskMetric.addData(0, uWriteRate, strLabel);
-    diskMetric.addData(1, uReadRate, strLabel);
+    diskMetric.addData(1, uReadRate);
 
     if (m_infoLabels.contains(m_strDiskIOMetricName)  && m_infoLabels[m_strDiskIOMetricName])
@@ -2235 +2261 @@
 }
 
-
+/* static */
+QString UIVMActivityMonitorCloud::formatCloudTimeStamp(const QString &strInput)
+{
+    QDateTime dateTime = QDateTime::fromString(strInput, Qt::RFC2822Date);
+
+    if (!dateTime.isValid())
+        return QString();
+
+    return dateTime.time().toString("HH:mm");
+}
 
 #include "UIVMActivityMonitor.moc"

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

@@ -88 +88 @@
     void addData(int iDataSeriesIndex, quint64 fData);
     void addData(int iDataSeriesIndex, quint64 fData, const QString &strLabel);
+
     const QQueue<quint64> *data(int iDataSeriesIndex) const;
+    const QQueue<QString> *labels() const;
+    bool hasDataLabels() const;
 
     /** # of the data point of the data series with index iDataSeriesIndex. */
@@ -118 +121 @@
     quint64 m_iMaximum;
     QQueue<quint64> m_data[DATA_SERIES_SIZE];
-    QQueue<QString> m_labels[DATA_SERIES_SIZE];
+    /** We assume m_data[0] and m_data[1] have a common label array. */
+    QQueue<QString> m_labels;
     /** The total data (the counter value we get from IMachineDebugger API). For the metrics
       * we get from IMachineDebugger m_data values are computed as deltas of total values t - (t-1) */
@@ -315 +319 @@
     virtual QUuid machineId() const RT_OVERRIDE;
     virtual QString machineName() const RT_OVERRIDE;
+    /** Accoring to OCI docs returned time stamp is in RFC3339 format. */
+    static QString formatCloudTimeStamp(const QString &strInput);
 
 private slots:
@@ -348 +354 @@
     void cacheNetworkTransmit(const QString &strTimeStamp, int iValue);
 
-
     bool findMetric(KMetricType enmMetricType, UIMetric &metric, int &iDataSeriesIndex) const;
     void prepareMetrics();
+
     CCloudMachine m_comMachine;
     UIProgressTaskReadCloudMachineMetricList *m_ReadListProgressTask;