Changeset 102655 in vbox for trunk/src/VBox/Frontends

Timestamp:

Dec 20, 2023 4:17:42 PM (15 months ago)

Author:

vboxsync

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

160817

Message:

FE/Qt: bugref:10501. An addendum to r160815. Now X axis labels look much better.

Location:

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

Files:

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

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

@@ -703 +703 @@
     /* Draw YAxis tick labels: */
     painter.setPen(mainAxisColor);
-    for (int i = iYSubAxisCount + 1; i >= 0; --i)
+    /* This skips 0 and starts at the 2nd Y axis tick to label: */
+    for (int i = iYSubAxisCount; i >= 0; --i)
     {
         /* Draw the bottom most label and skip others when data maximum is 0: */
@@ -747 +748 @@
         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));
-
-            }
+            int iDataIndex = qMin(labels->size() - 1, iTimeIndex - (m_iMaximumQueueSize - maxDataSize()));
+            strAxisText = UIVMActivityMonitorCloud::formatCloudTimeStamp(labels->at(iDataIndex));
         }
         else
@@ -765 +762 @@
         if (i == 0)
         {
-            strAxisText += " " + m_strXAxisLabel;
+            if (!m_pMetric || !m_pMetric->hasDataLabels())
+                strAxisText += " " + m_strXAxisLabel;
             painter.drawText(iTextX, m_lineChartRect.bottom() + iFontHeight, strAxisText);
         }

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

@@ -319 +319 @@
     virtual QUuid machineId() const RT_OVERRIDE;
     virtual QString machineName() const RT_OVERRIDE;
-    /** Accoring to OCI docs returned time stamp is in RFC3339 format. */
+    /** According to OCI docs returned time stamp is in RFC3339 format. */
     static QString formatCloudTimeStamp(const QString &strInput);