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

Timestamp:

Aug 13, 2019 12:45:41 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9510: Some more improvements on charts etc.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information

Files:

• UIPerformanceMonitor.cpp (modified) (14 diffs)
• UIPerformanceMonitor.h (modified) (1 diff)

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

@@ -37 +37 @@
 #include "CPerformanceMetric.h"
 
+#define DATA_SERIES_SIZE 2
 const ULONG iPeriod = 1;
 const int iMaximumQueueSize = 120;
 const int iMetricSetupCount = 1;
 const int iDecimalCount = 2;
+
 /*********************************************************************************************************************************
 *   UIChart definition.                                                                                     *
@@ -91 +93 @@
     QStringList m_textList;
     int m_iPieChartSize;
-    QRect m_pieChartRect;
+    QRect m_pieChartRect[DATA_SERIES_SIZE];
     bool m_fDrawPieChart;
     bool m_fUseGradientLineColor;
-    QColor m_dataSeriesColor[2];
+    QColor m_dataSeriesColor[DATA_SERIES_SIZE];
     QString m_strXAxisLabel;
 };
@@ -118 +120 @@
     m_iMarginBottom = 2 * qApp->QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
     m_iPieChartSize = 1.5f * qApp->style()->pixelMetric(QStyle::PM_LargeIconSize);
-    m_pieChartRect = QRect(1.5 * m_iMarginLeft, 1.5 * m_iMarginTop, m_iPieChartSize, m_iPieChartSize);
+    m_pieChartRect[0] = QRect(1.5 * m_iMarginLeft, 1.5 * m_iMarginTop, m_iPieChartSize, m_iPieChartSize);
+    m_pieChartRect[1] = QRect(m_pieChartRect[0].x() + m_iPieChartSize + 0.5 * m_iMarginLeft, 1.5 * m_iMarginTop, m_iPieChartSize, m_iPieChartSize);
     m_size = QSize(6 * m_iPieChartSize, 2 * m_iPieChartSize);
 }
@@ -172 +175 @@
 QColor UIChart::dataSeriesColor(int iDataSeriesIndex)
 {
-    if (iDataSeriesIndex >= 2)
+    if (iDataSeriesIndex >= DATA_SERIES_SIZE)
         return QColor();
     return m_dataSeriesColor[iDataSeriesIndex];
@@ -179 +182 @@
 void UIChart::setDataSeriesColor(int iDataSeriesIndex, const QColor &color)
 {
-    if (iDataSeriesIndex >= 2)
+    if (iDataSeriesIndex >= DATA_SERIES_SIZE)
         return;
     if (m_dataSeriesColor[iDataSeriesIndex] == color)
@@ -285 +288 @@
     float fBarWidth = iChartWidth / (float) (iMaximumQueueSize - 1);
     float fH = iChartHeight / (float)iMaximum;
-    if (m_fUseGradientLineColor)
-    {
-        QLinearGradient gradient(0, 0, 0, iChartHeight);
-        gradient.setColorAt(1.0, Qt::green);
-        gradient.setColorAt(0.5, Qt::yellow);
-        gradient.setColorAt(0.0, Qt::red);
-        painter.setPen(QPen(gradient, 2.5));
-    }
-    for (int k = 0; k < 2; ++k)
-    {
+    for (int k = 0; k < DATA_SERIES_SIZE; ++k)
+    {
+        if (m_fUseGradientLineColor)
+        {
+            QLinearGradient gradient(0, 0, 0, iChartHeight);
+            gradient.setColorAt(0, Qt::black);
+            gradient.setColorAt(1, m_dataSeriesColor[k]);
+            painter.setPen(QPen(gradient, 2.5));
+        }
+
         const QQueue<ULONG> *data = m_pSubMetric->data(k);
         if (!m_fUseGradientLineColor)
@@ -354 +357 @@
 void UIChart::drawPieCharts(QPainter &painter, ULONG iMaximum)
 {
-    /* Draw a whole non-filled circle: */
-    painter.setPen(QPen(Qt::gray, 1));
-    painter.drawArc(m_pieChartRect, 0, 3600 * 16);
-
-    QPointF center(m_pieChartRect.center());
-    QPainterPath fillPath;
-    fillPath.moveTo(center);
-    fillPath.arcTo(m_pieChartRect, 90/*startAngle*/,
-                   -1 * 360 /*sweepLength*/);
-
-    /* First draw a white filled circle and that the arc for data: */
-    painter.setPen(Qt::NoPen);
-    painter.setBrush(QColor(255, 255, 255, 175));
-    painter.drawPath(fillPath);
-
-    /* Prepare the gradient for the pie chart: */
-    QConicalGradient pieGradient;
-    pieGradient.setCenter(m_pieChartRect.center());
-    pieGradient.setAngle(90);
-    pieGradient.setColorAt(0, Qt::red);
-    pieGradient.setColorAt(0.5, Qt::yellow);
-    pieGradient.setColorAt(1, Qt::green);
-
-    /* Draw the pie chart for the 0th data series only: */
-    const QQueue<ULONG> *data = m_pSubMetric->data(0);
-    if (data && !data->isEmpty())
-    {
+    for (int i = 0; i < DATA_SERIES_SIZE; ++i)
+    {
+        /* Draw the pie chart for the 0th data series only: */
+        const QQueue<ULONG> *data = m_pSubMetric->data(i);
+        if (!data || data->isEmpty())
+            continue;
+
+        /* Draw a whole non-filled circle: */
+        painter.setPen(QPen(Qt::gray, 1));
+        painter.drawArc(m_pieChartRect[i], 0, 3600 * 16);
+
+        QPointF center(m_pieChartRect[i].center());
+        QPainterPath fillPath;
+        fillPath.moveTo(center);
+        fillPath.arcTo(m_pieChartRect[i], 90/*startAngle*/,
+                       -1 * 360 /*sweepLength*/);
+
+        /* First draw a white filled circle and that the arc for data: */
+        painter.setPen(Qt::NoPen);
+        painter.setBrush(QColor(255, 255, 255, 175));
+        painter.drawPath(fillPath);
+
+        /* Prepare the gradient for the pie chart: */
+        QConicalGradient pieGradient;
+        pieGradient.setCenter(m_pieChartRect[i].center());
+        pieGradient.setAngle(90);
+        pieGradient.setColorAt(0, Qt::black);
+        pieGradient.setColorAt(1, m_dataSeriesColor[i]);
+
         QPainterPath dataPath;
         dataPath.moveTo(center);
         float fAngle = 360.f * data->back() / (float)iMaximum;
-        dataPath.arcTo(m_pieChartRect, 90/*startAngle*/,
+        dataPath.arcTo(m_pieChartRect[i], 90/*startAngle*/,
                        -1 * fAngle /*sweepLength*/);
         painter.setBrush(pieGradient);
         painter.drawPath(dataPath);
+
     }
 }
@@ -436 +442 @@
 void UISubMetric::addData(int iDataSeriesIndex, ULONG fData)
 {
-    if (iDataSeriesIndex >= 2)
+    if (iDataSeriesIndex >= DATA_SERIES_SIZE)
         return;
     m_data[iDataSeriesIndex].enqueue(fData);
@@ -445 +451 @@
 const QQueue<ULONG> *UISubMetric::data(int iDataSeriesIndex) const
 {
-    if (iDataSeriesIndex >= 2)
+    if (iDataSeriesIndex >= DATA_SERIES_SIZE)
         return 0;
     return &m_data[iDataSeriesIndex];
@@ -498 +504 @@
     m_strCPUInfoLabelTitle = QApplication::translate("UIVMInformationDialog", "CPU Load");
     iMaximum = qMax(iMaximum, m_strCPUInfoLabelTitle.length());
+
+    m_strCPUInfoLabelGuest = QApplication::translate("UIVMInformationDialog", "Guest Load");
+    iMaximum = qMax(iMaximum, m_strCPUInfoLabelGuest.length());
+    m_strCPUInfoLabelVMM = QApplication::translate("UIVMInformationDialog", "VMM Load");
+    iMaximum = qMax(iMaximum, m_strCPUInfoLabelVMM.length());
 
     m_strRAMInfoLabelTitle = QApplication::translate("UIVMInformationDialog", "RAM Usage");
@@ -526 +537 @@
             QFontMetrics labelFontMetric(pLabel->font());
             int iWidth = iMaximum * labelFontMetric.width('x');
-            printf("%d %d\n", labelFontMetric.width('x'), labelFontMetric.width('X'));
             foreach (QLabel *pInfoLabel, m_infoLabels)
                 pInfoLabel->setFixedWidth(iWidth);
@@ -576 +586 @@
     if (m_charts.contains(m_strCPUMetricName) && m_charts[m_strCPUMetricName])
         m_charts[m_strCPUMetricName]->setUseGradientLineColor(false);
+    if (m_charts.contains(m_strRAMMetricName) && m_charts[m_strRAMMetricName])
+        m_charts[m_strRAMMetricName]->setUseGradientLineColor(false);
 
     QWidget *bottomSpacerWidget = new QWidget(this);
@@ -622 +634 @@
         if (aReturnDataLengths[i] == 0)
             continue;
-        if (aReturnNames[i].contains("Disk"), Qt::CaseInsensitive)
-            printf("%f\n", 22.2);
         /* Read the last of the return data disregarding the rest since we are caching the data in GUI side: */
         float fData = returnData[aReturnDataIndices[i] + aReturnDataLengths[i] - 1] / (float)aReturnScales[i];
@@ -755 +765 @@
     CPUMetric.addData(1, iOtherPercentage);
     CPUMetric.setMaximum(100);
-    if (m_infoLabels.contains(m_strCPUMetricName) && m_infoLabels[m_strCPUMetricName])
+    if (m_infoLabels.contains(m_strCPUMetricName)  && m_infoLabels[m_strCPUMetricName])
     {
         QString strInfo;
+        QString strReceiveColor;
         if (m_infoLabels[m_strCPUMetricName]->isEnabled())
-            strInfo = QString("<b>%1</b><br/>%2%3").arg(m_strCPUInfoLabelTitle).arg(QString::number(iExecutingPercentage)).arg("%");
+            strInfo = QString("<b>%1</b></b><br/><font color=\"%2\">%3: %4\%</font><br/><font color=\"%5\">%6: %7\%</font>")
+                .arg(m_strCPUInfoLabelTitle)
+                .arg(dataColorString(m_strCPUMetricName, 0))
+                .arg(m_strCPUInfoLabelGuest).arg(QString::number(iExecutingPercentage))
+                .arg(dataColorString(m_strCPUMetricName, 1))
+                .arg(m_strCPUInfoLabelVMM).arg(QString::number(iOtherPercentage));
         else
             strInfo = QString("<b>%1</b><br/>%2%3").arg(m_strCPUInfoLabelTitle).arg("--").arg("%");
         m_infoLabels[m_strCPUMetricName]->setText(strInfo);
     }
+
     if (m_charts.contains(m_strCPUMetricName))
         m_charts[m_strCPUMetricName]->update();

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIPerformanceMonitor.h

@@ -144 +144 @@
         /** CPU info label strings. */
         QString m_strCPUInfoLabelTitle;
+        QString m_strCPUInfoLabelGuest;
+        QString  m_strCPUInfoLabelVMM;
         /** RAM usage info label strings. */
         QString m_strRAMInfoLabelTitle;