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

Timestamp:

Aug 6, 2019 3:15:11 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref: 9510: Some refactoring

Location:

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

Files:

• UIPerformanceMonitor.cpp (modified) (12 diffs)
• UIPerformanceMonitor.h (modified) (2 diffs)

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

@@ -18 +18 @@
 /* Qt includes: */
 #include <QApplication>
+#include <QLabel>
 #include <QPainter>
-
 #include <QGridLayout>
 #include <QTimer>
@@ -60 +60 @@
 protected:
 
-    virtual void paintEvent(QPaintEvent *pEvent) /* override */ = 0;
+    virtual void paintEvent(QPaintEvent *pEvent) /* override */;
     virtual QSize minimumSizeHint() const /* override */;
     virtual QSize sizeHint() const  /* override */;
@@ -70 +70 @@
     int m_iMargin;
     QStringList m_textList;
-};
-
-/*********************************************************************************************************************************
-*   UILineChart definition.                                                                                     *
-*********************************************************************************************************************************/
-class UILineChart : public UIChart
-{
-
-    Q_OBJECT;
-
-public:
-
-    UILineChart(QWidget *pParent, const UISubMetric *pSubMetric);
-
-protected:
-
-    virtual void paintEvent(QPaintEvent *pEvent) /* override */;
-
-};
-
-/*********************************************************************************************************************************
-*   UIPieChart definition.                                                                                     *
-*********************************************************************************************************************************/
-class UIPieChart : public UIChart
-{
-
-    Q_OBJECT;
-
-public:
-
-    UIPieChart(QWidget *pParent, const UISubMetric *pSubMetric);
-
-protected:
-
-    virtual void paintEvent(QPaintEvent *pEvent) /* override */;
-
-private:
-
     int m_iPieChartSize;
     QRect m_pieChartRect;
 
 };
+
 
 /*********************************************************************************************************************************
@@ -123 +86 @@
 {
     m_iMargin = qApp->QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
+    m_iPieChartSize = 1.5f * qApp->style()->pixelMetric(QStyle::PM_LargeIconSize);
+    m_pieChartRect = QRect(1.5 * m_iMargin, 1.5 * m_iMargin, m_iPieChartSize, m_iPieChartSize);
+    m_size = QSize(6 * m_iPieChartSize, 1.8 * m_iPieChartSize);
 }
 
@@ -176 +142 @@
 }
 
-/*********************************************************************************************************************************
-*   UILineChart implementation.                                                                                     *
-*********************************************************************************************************************************/
-
-UILineChart::UILineChart(QWidget *pParent, const UISubMetric *pSubMetric)
-    :UIChart(pParent, pSubMetric)
-{
-    // QPalette pal = palette();
-    // pal.setColor(QPalette::Background, Qt::red);
-    // setAutoFillBackground(true);
-    // setPalette(pal);
-}
-
-void UILineChart::paintEvent(QPaintEvent *pEvent)
+void UIChart::paintEvent(QPaintEvent *pEvent)
 {
     Q_UNUSED(pEvent);
@@ -247 +200 @@
     }
 
-    painter.setPen(Qt::black);
-
-    QFont painterFont;
-    painterFont.setPixelSize(18);
-    painter.setFont(painterFont);
-}
-
-
-/*********************************************************************************************************************************
-*   UIPieChart implementation.                                                                                     *
-*********************************************************************************************************************************/
-
-UIPieChart::UIPieChart(QWidget *pParent, const UISubMetric *pSubMetric)
-    :UIChart(pParent, pSubMetric)
-{
-    QPalette pal = palette();
-    pal.setColor(QPalette::Background, Qt::yellow);
-    setAutoFillBackground(true);
-    setPalette(pal);
-
-    m_iPieChartSize = 1.5f * qApp->style()->pixelMetric(QStyle::PM_LargeIconSize);
-    m_pieChartRect = QRect(m_iMargin, m_iMargin, m_iPieChartSize, m_iPieChartSize);
-
-    m_size = QSize(3 * m_iPieChartSize + 2 * m_iMargin,
-                   m_iPieChartSize + 2 * m_iMargin + 4 * QApplication::fontMetrics().height());
-
-}
-
-void UIPieChart::paintEvent(QPaintEvent *pEvent)
-{
-    Q_UNUSED(pEvent);
-
-    QPainter painter(this);
-    painter.setRenderHint(QPainter::Antialiasing);// | QPainter::TextAntialiasing);
-    if (!m_pSubMetric)
-        return;
-    const QQueue<ULONG> &data = m_pSubMetric->data();
-
-    if (data.isEmpty() || iMaximumQueueSize == 0)
-        return;
-
-    float fMaximum = m_pSubMetric->maximum();
-    if (m_pSubMetric->isPercentage())
-        fMaximum = 100.f;
-    if (fMaximum == 0)
-        return;
 
     /* Draw a whole non-filled circle: */
@@ -299 +206 @@
 
     QPointF center(m_pieChartRect.center());
-    QPainterPath myPath;
-    myPath.moveTo(center);
+    QPainterPath fillPath;
+    QPainterPath dataPath;
+    dataPath.moveTo(center);
+    fillPath.moveTo(center);
     float fAngle = 360.f * data.back() / fMaximum;
-    myPath.arcTo(m_pieChartRect, 90/*startAngle*/,
+    dataPath.arcTo(m_pieChartRect, 90/*startAngle*/,
                  -1 * fAngle /*sweepLength*/);
-
-    QConicalGradient gradient;
-    gradient.setCenter(m_pieChartRect.center());
-    gradient.setAngle(90);
-    gradient.setColorAt(0, Qt::red);
-    gradient.setColorAt(1, Qt::green);
-
-    //painter.setBrush(Qt::red);
-    painter.setBrush(gradient);
+    fillPath.arcTo(m_pieChartRect, 90/*startAngle*/,
+                 -1 * 360 /*sweepLength*/);
+
+    /* First draw a white filled circle and that the arc for data: */
+    QConicalGradient pieGradient;
+    pieGradient.setCenter(m_pieChartRect.center());
+    pieGradient.setAngle(90);
+    pieGradient.setColorAt(0, Qt::red);
+    pieGradient.setColorAt(1, Qt::green);
+
     painter.setPen(Qt::NoPen);
-    painter.drawPath(myPath);
-
-    painter.setFont(m_font);
-    painter.setPen(Qt::black);
-    int iFontHeight = painter.fontMetrics().height();
-    int iTextY = m_pieChartRect.bottomLeft().y()  + m_iMargin + iFontHeight;
-    //QString strLastValue = QString("%1%2").arg(QString::number(data.back())).arg(m_pSubMetric->unit());
-    for (int i = 0; i < m_textList.size(); ++i)
-        painter.drawText(m_iMargin, iTextY + i * iFontHeight, m_textList[i]);
-}
-
+    painter.setBrush(Qt::white);
+    painter.drawPath(fillPath);
+    painter.setBrush(pieGradient);
+    painter.drawPath(dataPath);
+}
 
 /*********************************************************************************************************************************
@@ -462 +366 @@
          iterator != m_subMetrics.end(); ++iterator)
     {
-        UIPieChart *pPieChart = new UIPieChart(this, &(iterator.value()));
-        pPieChart->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
-        m_charts.insert(iterator.key(), pPieChart);
-        m_pMainLayout->addWidget(pPieChart, iRow, 0);
-
-
-        UILineChart *pChart = new UILineChart(this, &(iterator.value()));
+        QLabel *pLabel = new QLabel;
+        m_pMainLayout->addWidget(pLabel, iRow, 0);
+        m_infoLabels.insert(iterator.key(), pLabel);
+
+        UIChart *pChart = new UIChart(this, &(iterator.value()));
         m_charts.insert(iterator.key(), pChart);
         pChart->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
@@ -551 +453 @@
     }
 
-    //printf("total ram %u %u\n", iTotalRAM, iFreeRAM);
-
-
-
     /* Update the CPU load chart with values we get from IMachineDebugger::getCPULoad(..): */
     if (m_subMetrics.contains(m_strCPUMetricName))
@@ -565 +463 @@
         CPUMetric.addData(aPctExecuting);
         QList<UIChart*> charts = m_charts.values(m_strCPUMetricName);
-        QStringList textList;
-        textList << "CPU Load"
-                 << QString("%1%2").arg(QString::number(aPctExecuting)).arg("%");
-        foreach (UIChart* pChart, charts)
-            if (pChart)
-                pChart->setTextList(textList);
+        QString strInfo = QString("%1\n%2%3").arg("CPU Load").arg(QString::number(aPctExecuting)).arg("%");
+        if (m_infoLabels.contains(m_strCPUMetricName))
+            m_infoLabels[m_strCPUMetricName]->setText(strInfo);
+        if (m_charts.contains(m_strCPUMetricName))
+            m_charts[m_strCPUMetricName]->update();
     }
 
@@ -578 +475 @@
         RAMMetric.setMaximum(iTotalRAM);
         RAMMetric.addData(iTotalRAM - iFreeRAM);
-
-        QStringList textList;
-        textList << "RAM Usage"
-                 << QString("%1: %2"). arg("Total:").arg(uiCommon().formatSize(_1K * iTotalRAM))
-                 << QString("%1: %2"). arg("Free:").arg(uiCommon().formatSize(_1K * (iFreeRAM)))
-                 << QString("%1: %2"). arg("Used:").arg(uiCommon().formatSize(_1K * (iTotalRAM - iFreeRAM)));
-        QList<UIChart*> charts = m_charts.values(m_strRAMMetricName);
-        foreach (UIChart* pChart, charts)
-            if (pChart)
-                pChart->setTextList(textList);
+        QString strInfo = QString("%1\n%2: %3\n%4: %5\n%6: %7").arg("RAM Usage").arg("Total").arg(uiCommon().formatSize(_1K * iTotalRAM)).arg("Free:").arg(uiCommon().formatSize(_1K * (iFreeRAM))).arg("Used:").arg(uiCommon().formatSize(_1K * (iTotalRAM - iFreeRAM)));
+        if (m_infoLabels.contains(m_strRAMMetricName))
+            m_infoLabels[m_strRAMMetricName]->setText(strInfo);
+
+        if (m_charts.contains(m_strRAMMetricName))
+        {
+            m_charts[m_strRAMMetricName]->update();
+        }
     }
 
     /* Try to compute a global font size so that all texts fit to widgets: */
-    int iMinimumFontSize = 24;
-    foreach (UIChart *pChart, m_charts)
-    {
-        if (!qobject_cast<UIPieChart*>(pChart))
-            continue;
-                iMinimumFontSize = qMin(pChart->fontSize(), iMinimumFontSize);
-    }
-
-    foreach (UIChart *pChart, m_charts)
-    {
-        if (!pChart)
-            continue;
-        pChart->setFontSize(iMinimumFontSize);
-        pChart->update();
-    }
+    // int iMinimumFontSize = 24;
+    // foreach (UIChart *pChart, m_charts)
+    // {
+    //     if (!qobject_cast<UIPieChart*>(pChart))
+    //         continue;
+    //             iMinimumFontSize = qMin(pChart->fontSize(), iMinimumFontSize);
+    // }
+
+    // foreach (UIChart *pChart, m_charts)
+    // {
+    //     if (!pChart)
+    //         continue;
+    //     pChart->setFontSize(iMinimumFontSize);
+    //     pChart->update();
+    // }
 
 
@@ -653 +548 @@
                 if (strName.contains("RAM", Qt::CaseInsensitive) && strName.contains("Free", Qt::CaseInsensitive))
                 {
-                    //printf("xxxx %s %d\n", qPrintable(metrics[i].GetMetricName()), metrics[i].GetCount());
                     QString strRAMMetricName(m_strRAMMetricName);
                     m_subMetrics.insert(strRAMMetricName, UISubMetric(strRAMMetricName, metrics[i].GetUnit(), iMaximumQueueSize));

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

@@ -42 +42 @@
 class QTimer;
 class QGridLayout;
+class QLabel;
 class UIChart;
 
@@ -118 +119 @@
 
     QMap<QString, UISubMetric> m_subMetrics;
-    QMultiMap<QString,UIChart*>  m_charts;
+    QMap<QString,UIChart*>  m_charts;
+    QMap<QString,QLabel*>  m_infoLabels;
+
     QString m_strCPUMetricName;
     QString m_strRAMMetricName;