Changeset 81508 in vbox for trunk/src/VBox

Timestamp:

Oct 24, 2019 6:39:40 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9510. Drawing doughnut with a bit darker color.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationPerformanceMonitor.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationPerformanceMonitor.cpp

@@ -96 +96 @@
     void setIsAreaChartAllowed(bool fIsAreaChartAllowed);
 
-    QColor dataSeriesColor(int iDataSeriesIndex);
+    QColor dataSeriesColor(int iDataSeriesIndex, int iDark = 0);
     void setDataSeriesColor(int iDataSeriesIndex, const QColor &color);
 
@@ -125 +125 @@
        void drawDoughnutChart(QPainter &painter, quint64 iMaximum, int iDataIndex,
                               const QRectF &chartRect, const QRectF &innerRect);
+       /** Draws a doughnut shaped shart for two data series combines. the 2nd data is added on top of 1st. */
        void drawCombinedDoughnutChart(QPainter &painter, quint64 iMaximum,
                                       const QRectF &chartRect, const QRectF &innerRect);
@@ -267 +268 @@
 }
 
-QColor UIChart::dataSeriesColor(int iDataSeriesIndex)
+QColor UIChart::dataSeriesColor(int iDataSeriesIndex, int iDark /* = 0 */)
 {
     if (iDataSeriesIndex >= DATA_SERIES_SIZE)
         return QColor();
-    return m_dataSeriesColor[iDataSeriesIndex];
+    return QColor(qMax(m_dataSeriesColor[iDataSeriesIndex].red() - iDark, 0),
+                  qMax(m_dataSeriesColor[iDataSeriesIndex].green() - iDark, 0),
+                  qMax(m_dataSeriesColor[iDataSeriesIndex].blue() - iDark, 0),
+                  m_dataSeriesColor[iDataSeriesIndex].alpha());
 }
 
@@ -473 +477 @@
     if (!m_pMetric)
         return;
-    /* First draw a doughnut shaped chart for the 1st data series */
+
     const QQueue<quint64> *data = m_pMetric->data(iDataIndex);
     if (!data || data->isEmpty())
@@ -514 +518 @@
     painter.drawArc(innerRect, 0, 3600 * 16);
 
-    /* Draw a white filled circle and that the arc for data: */
+    /* Draw a white filled circle and the arc for data: */
     QPainterPath background = wholeArc(chartRect).subtracted(wholeArc(innerRect));
     painter.setPen(Qt::NoPen);
@@ -547 +551 @@
     /* Draw a doughnut slice for the first data series: */
     float fAngle = 360.f * data->back() / (float)iMaximum;
-    painter.setBrush(m_dataSeriesColor[iDataIndex]);
+    painter.setBrush(dataSeriesColor(iDataIndex, 50));
     painter.drawPath(doughnutSlice(chartRect, innerRect, 90, fAngle));
 
@@ -556 +560 @@
     {
         float fAngle2 = 360.f * data2->back() / (float)iMaximum;
-        painter.setBrush(m_dataSeriesColor[iDataIndex]);
+        painter.setBrush(dataSeriesColor(iDataIndex, 50));
         painter.drawPath(doughnutSlice(chartRect, innerRect, 90 - fAngle, fAngle2));
     }