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

Timestamp:

Dec 14, 2023 2:06:44 PM (14 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10501. Fixing mouse over chart stuff.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp (modified) (7 diffs)

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

@@ -61 +61 @@
 /** The time in seconds between metric inquries done to API. */
 const ULONG g_iPeriod = 1;
-/** The number of data points we store in UIChart. with g_iPeriod=1 it corresponds to 2 min. of data. */
-//const int m_iMaximumQueueSize = 120;
+
 /** This is passed to IPerformanceCollector during its setup. When 1 that means IPerformanceCollector object does a data cache of size 1. */
 const int g_iMetricSetupCount = 1;
@@ -202 +201 @@
        QConicalGradient conicalGradientForDataSeries(const QRectF &rectangle, int iDataIndex);
     /** @} */
+    int maxDataSize() const;
 
     UIMetric *m_pMetric;
@@ -487 +487 @@
     const int iX = width() - pEvent->position().x() - m_iMarginRight;
     QPoint eventPosition(pEvent->position().x(), pEvent->position().y());
+    int iDataSize = maxDataSize();
     m_iDataIndexUnderCursor = -1;
-    if (m_lineChartRect.contains(eventPosition))
+    if (iDataSize > 0 && m_lineChartRect.contains(eventPosition))
+    {
         m_iDataIndexUnderCursor = m_iMaximumQueueSize  - (int)((iX) / m_fPixelPerDataPoint) - 1;
-    //printf("m_iDataIndexUnderCursor %d\n", m_iDataIndexUnderCursor);
+        m_iDataIndexUnderCursor = m_iDataIndexUnderCursor - (m_iMaximumQueueSize - iDataSize);
+    }
+
     update();
     QIWithRetranslateUI<QWidget>::mouseMoveEvent(pEvent);
@@ -614 +618 @@
             }
         }
+
         /* Draw a horizontal and vertical line on data point under the mouse cursor
          * and draw the value on the left hand side of the chart: */
         if (m_fDrawCurenValueIndicators && m_iDataIndexUnderCursor >= 0 && m_iDataIndexUnderCursor < data->size())
         {
+
             painter.setPen(QPen(m_dataSeriesColor[k], 0.5));
-            float fHeight = fH * data->at(data->size() - m_iDataIndexUnderCursor);
-            if (fHeight > 0)
-            {
-                // painter.drawLine(m_iMarginLeft, height() - (fHeight + m_iMarginBottom),
-                //                  width() - m_iMarginRight, height() - (fHeight + m_iMarginBottom));
-                painter.setPen(mainAxisColor);
-                float fX = (width() - m_iMarginRight) - ((data->size() - m_iDataIndexUnderCursor - 1) * fBarWidth);
-                painter.drawLine(fX, 0, fX, height() - m_iMarginBottom);
-                //    int iAverageFontWidth = fontMetrics.averageCharWidth();
-//                 QString strValue = QString::number(data->at(data->size() - m_iDataIndexUnderCursor));
-// #if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
-//                 painter.drawText(m_iMarginLeft - fontMetrics.horizontalAdvance(strValue) - iAverageFontWidth,
-//                                  height() - (fHeight + m_iMarginBottom) + 0.5 * iFontHeight, strValue);
-// #else
-//                 painter.drawText(m_iMarginLeft - fontMetrics.width(strValue) - iAverageFontWidth,
-//                                  height() - (fHeight + m_iMarginBottom) + 0.5 * iFontHeight, strValue);
-// #endif
-
-            }
+            painter.setPen(mainAxisColor);
+            float fX = (width() - m_iMarginRight) - ((data->size() - m_iDataIndexUnderCursor - 1) * fBarWidth);
+            painter.drawLine(fX, 0, fX, height() - m_iMarginBottom);
         }
     }
@@ -744 +734 @@
     gradient.setColorAt(1, pieColor);
     return gradient;
+}
+
+int UIChart::maxDataSize() const
+{
+    int iSize = 0;
+    for (int k = 0; k < DATA_SERIES_SIZE; ++k)
+    {
+        if (m_pMetric->data(k))
+            iSize = qMax(iSize, m_pMetric->data(k)->size());
+    }
+    return iSize;
 }
 
@@ -858 +859 @@
     , m_iMaximumQueueSize(iMaximumQueueSize)
 {
-    RT_NOREF(iMaximumQueueSize); /* Unused according to Clang 11. */
     m_iTotal[0] = 0;
     m_iTotal[1] = 0;
@@ -865 +865 @@
 UIMetric::UIMetric()
     : m_iMaximum(0)
-#if 0 /* Unused according to Clang 11. */
-    , m_iMaximumQueueSize(0)
-#endif
     , m_fRequiresGuestAdditions(false)
     , m_fIsInitialized(false)
+    , m_iMaximumQueueSize(0)
 {
 }