Changeset 83496 in vbox

Timestamp:

Mar 31, 2020 12:02:10 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686. Moving some code to the common area.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/monitor

Files:

• UIMonitorCommon.cpp (modified) (2 diffs)
• UIMonitorCommon.h (modified) (1 diff)
• performance/UIPerformanceMonitor.cpp (modified) (7 diffs)
• resource/UIResourceMonitor.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/monitor/UIMonitorCommon.cpp

@@ -17 +17 @@
 
 /* Qt includes: */
+#include <QPainter>
 #include <QXmlStreamReader>
 
@@ -147 +148 @@
     }
 }
+
+/* static */
+QPainterPath UIMonitorCommon::doughnutSlice(const QRectF &outerRectangle, const QRectF &innerRectangle, float fStartAngle, float fSweepAngle)
+{
+    QPainterPath subPath1;
+    subPath1.moveTo(outerRectangle.center());
+    subPath1.arcTo(outerRectangle, fStartAngle,
+                   -1.f * fSweepAngle);
+    subPath1.closeSubpath();
+
+    QPainterPath subPath2;
+    subPath2.moveTo(innerRectangle.center());
+    subPath2.arcTo(innerRectangle, fStartAngle,
+                   -1.f * fSweepAngle);
+    subPath2.closeSubpath();
+
+    return subPath1.subtracted(subPath2);
+}
+
+/* static */
+QPainterPath UIMonitorCommon::wholeArc(const QRectF &rectangle)
+{
+    QPainterPath arc;
+    arc.addEllipse(rectangle);
+    return arc;
+}
+
+/* static */
+void UIMonitorCommon::drawCombinedDoughnutChart(quint64 data1, const QColor &data1Color,
+                               quint64 data2, const QColor &data2Color,
+                               QPainter &painter, quint64  iMaximum,
+                               const QRectF &chartRect, const QRectF &innerRect, int iOverlayAlpha)
+{
+    /* Draw two arcs. one for the inner the other for the outer circle: */
+    painter.setPen(QPen(QColor(100, 100, 100, iOverlayAlpha), 1));
+    painter.drawArc(chartRect, 0, 3600 * 16);
+    painter.drawArc(innerRect, 0, 3600 * 16);
+
+    /* Draw a translucent white background: */
+    QPainterPath background = wholeArc(chartRect).subtracted(wholeArc(innerRect));
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(QColor(255, 255, 255, iOverlayAlpha));
+    painter.drawPath(background);
+
+    /* Draw a doughnut slice for the first data series: */
+    float fAngle = 360.f * data1 / (float)iMaximum;
+    painter.setBrush(data1Color);
+    painter.drawPath(doughnutSlice(chartRect, innerRect, 90, fAngle));
+
+    float fAngle2 = 360.f * data2 / (float)iMaximum;
+    painter.setBrush(data2Color);
+    painter.drawPath(doughnutSlice(chartRect, innerRect, 90 - fAngle, fAngle2));
+}

trunk/src/VBox/Frontends/VirtualBox/src/monitor/UIMonitorCommon.h

@@ -49 +49 @@
                                QVector<CUnknown>& objectList, quint64 &iOutTotalRAM, quint64 &iOutFreeRAM);
 
+
+        static QPainterPath doughnutSlice(const QRectF &outerRectangle, const QRectF &innerRectangle, float fStartAngle, float fSweepAngle);
+        static QPainterPath wholeArc(const QRectF &rectangle);
+        static void drawCombinedDoughnutChart(quint64 data1, const QColor &data1Color,
+                                              quint64 data2, const QColor &data2Color,
+                                              QPainter &painter, quint64  iMaximum,
+                                              const QRectF &chartRect, const QRectF &innerRect, int iOverlayAlpha);
+
+
 private:
 

trunk/src/VBox/Frontends/VirtualBox/src/monitor/performance/UIPerformanceMonitor.cpp

@@ -108 +108 @@
        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);
 
        /** Drawing an overlay rectangle over the charts to indicate that they are disabled. */
        void drawDisabledChartRectangle(QPainter &painter);
-       /* Returns a half translucent complete arc. */
-       QPainterPath wholeArc(const QRectF &rectangle);
-       QPainterPath doughnutSlice(const QRectF &outerRectangle, const QRectF &innerRectangle,
-                                  float fStartAngle, float fSweepAngle);
        QConicalGradient conicalGradientForDataSeries(const QRectF &rectangle, int iDataIndex);
     /** @} */
@@ -187 +180 @@
     retranslateUi();
 }
-
 
 bool UIChart::isPieChartAllowed() const
@@ -474 +466 @@
 
    /* Draw a white filled circle and that the arc for data: */
-    QPainterPath background = wholeArc(chartRect);
+    QPainterPath background = UIMonitorCommon::wholeArc(chartRect);
     painter.setPen(Qt::NoPen);
     painter.setBrush(QColor(255, 255, 255, m_iOverlayAlpha));
@@ -502 +494 @@
 
     /* Draw a white filled circle and the arc for data: */
-    QPainterPath background = wholeArc(chartRect).subtracted(wholeArc(innerRect));
+    QPainterPath background = UIMonitorCommon::wholeArc(chartRect).subtracted(UIMonitorCommon::wholeArc(innerRect));
     painter.setPen(Qt::NoPen);
     painter.setBrush(QColor(255, 255, 255, m_iOverlayAlpha));
@@ -510 +502 @@
     float fAngle = 360.f * data->back() / (float)iMaximum;
     painter.setBrush(conicalGradientForDataSeries(chartRect, iDataIndex));
-    painter.drawPath(doughnutSlice(chartRect, innerRect, 90, fAngle));
-}
-
-void UIChart::drawCombinedDoughnutChart(QPainter &painter, quint64  iMaximum,
-                               const QRectF &chartRect, const QRectF &innerRect)
-{
-    int iDataIndex = 0;
-    const QQueue<quint64> *data = m_pMetric->data(iDataIndex);
-    if (!data || data->isEmpty())
-        return;
-
-    /* Draw two arcs. one for the inner the other for the outer circle: */
-    painter.setPen(QPen(QColor(100, 100, 100, m_iOverlayAlpha), 1));
-    painter.drawArc(chartRect, 0, 3600 * 16);
-    painter.drawArc(innerRect, 0, 3600 * 16);
-
-    /* Draw a translucent white background: */
-    QPainterPath background = wholeArc(chartRect).subtracted(wholeArc(innerRect));
-    painter.setPen(Qt::NoPen);
-    painter.setBrush(QColor(255, 255, 255, m_iOverlayAlpha));
-    painter.drawPath(background);
-
-    /* Draw a doughnut slice for the first data series: */
-    float fAngle = 360.f * data->back() / (float)iMaximum;
-    painter.setBrush(dataSeriesColor(iDataIndex, 50));
-    painter.drawPath(doughnutSlice(chartRect, innerRect, 90, fAngle));
-
-    /* Draw another slice for 2nd data series on top of the first if necessary: */
-    iDataIndex = 1;
-    const QQueue<quint64> *data2 = m_pMetric->data(iDataIndex);
-    if (data2 && !data2->isEmpty())
-    {
-        float fAngle2 = 360.f * data2->back() / (float)iMaximum;
-        painter.setBrush(dataSeriesColor(iDataIndex, 50));
-        painter.drawPath(doughnutSlice(chartRect, innerRect, 90 - fAngle, fAngle2));
-    }
-}
-
-QPainterPath UIChart::wholeArc(const QRectF &rectangle)
-{
-    QPainterPath arc;
-    arc.addEllipse(rectangle);
-    return arc;
+    painter.drawPath(UIMonitorCommon::doughnutSlice(chartRect, innerRect, 90, fAngle));
 }
 
@@ -567 +517 @@
 }
 
-QPainterPath UIChart::doughnutSlice(const QRectF &outerRectangle, const QRectF &innerRectangle, float fStartAngle, float fSweepAngle)
-{
-    QPainterPath subPath1;
-    subPath1.moveTo(outerRectangle.center());
-    subPath1.arcTo(outerRectangle, fStartAngle,
-                   -1.f * fSweepAngle);
-    subPath1.closeSubpath();
-
-    QPainterPath subPath2;
-    subPath2.moveTo(innerRectangle.center());
-    subPath2.arcTo(innerRectangle, fStartAngle,
-                   -1.f * fSweepAngle);
-    subPath2.closeSubpath();
-
-    return subPath1.subtracted(subPath2);
-}
-
 void UIChart::drawCombinedPieCharts(QPainter &painter, quint64 iMaximum)
 {
@@ -600 +533 @@
                          QSizeF(0.5 * chartRect.width(), 0.5 * chartRect.height()));
         /* Draw a doughnut chart where data series are stacked on to of each other: */
-        drawCombinedDoughnutChart(painter, iMaximum, chartRect, innerRect);
+        if (m_pMetric->data(0) && !m_pMetric->data(0)->isEmpty() &&
+            m_pMetric->data(1) && !m_pMetric->data(1)->isEmpty())
+            UIMonitorCommon::drawCombinedDoughnutChart(m_pMetric->data(0)->back(), dataSeriesColor(0, 50),
+                                                       m_pMetric->data(1)->back(), dataSeriesColor(1, 50),
+                                                       painter, iMaximum, chartRect, innerRect, m_iOverlayAlpha);
 #if 0
         /* Draw a doughnut shaped chart and then pie chart inside it: */

trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp

@@ -61 +61 @@
 };
 
+
+/*********************************************************************************************************************************
+*   Class UIVMResourceMonitorHostStatsWidget definition.                                                                         *
+*********************************************************************************************************************************/
+
+class UIVMResourceMonitorHostStatsWidget : public QWidget
+{
+
+    Q_OBJECT;
+
+
+public:
+
+    UIVMResourceMonitorHostStatsWidget(QWidget *pParent = 0);
+
+};
+
 /*********************************************************************************************************************************
 *   Class UIVMResourceMonitorTableView definition.                                                                           *
@@ -167 +184 @@
 };
 
-/*********************************************************************************************************************************
-*   Class UIVMResourceMonitorProxyModel definition.                                                                           *
+
+/*********************************************************************************************************************************
+*   Class UIVMResourceMonitorProxyModel definition.                                                                              *
 *********************************************************************************************************************************/
 class UIResourceMonitorProxyModel : public QSortFilterProxyModel
@@ -250 +268 @@
 
 /*********************************************************************************************************************************
-*   UIVMResourceMonitorDelegate definition.                                                                                       *
+*   UIVMResourceMonitorDelegate definition.                                                                                      *
 *********************************************************************************************************************************/
 /** A QItemDelegate child class to disable dashed lines drawn around selected cells in QTableViews */
@@ -264 +282 @@
 
 
-
-/*********************************************************************************************************************************
-*   Class UIVMResourceMonitorTableView implementation.                                                                            *
+/*********************************************************************************************************************************
+*   Class UIVMResourceMonitorHostStatsWidget implementation.                                                                     *
+*********************************************************************************************************************************/
+
+UIVMResourceMonitorHostStatsWidget::UIVMResourceMonitorHostStatsWidget(QWidget *pParent /* = 0 */)
+    :QWidget(pParent)
+{
+}
+
+
+/*********************************************************************************************************************************
+*   Class UIVMResourceMonitorTableView implementation.                                                                           *
 *********************************************************************************************************************************/
 
@@ -414 +441 @@
 
 /*********************************************************************************************************************************
-*   Class UIVMResourceMonitorHostStats implementation.                                                                            *
+*   Class UIVMResourceMonitorHostStats implementation.                                                                           *
 *********************************************************************************************************************************/
 
@@ -427 +454 @@
 
 /*********************************************************************************************************************************
-*   Class UIVMResourceMonitorCheckBox implementation.                                                                             *
+*   Class UIVMResourceMonitorCheckBox implementation.                                                                            *
 *********************************************************************************************************************************/
 
@@ -446 +473 @@
 
 /*********************************************************************************************************************************
-*   Class UIVMResourceMonitorProxyModel implementation.                                                                           *
+*   Class UIVMResourceMonitorProxyModel implementation.                                                                          *
 *********************************************************************************************************************************/
 UIResourceMonitorProxyModel::UIResourceMonitorProxyModel(QObject *parent /* = 0 */)