Changeset 80771 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Sep 13, 2019 10:25:13 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9510: Adding an option to show/hide pie charts.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationRuntime.cpp (modified) (13 diffs)

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

@@ -161 +161 @@
     const QStringList &textList() const;
 
-    bool withPieChart() const;
-    void setWithPieChart(bool fWithPieChart);
+    bool isPieChartAllowed() const;
+    void setIsPieChartAllowed(bool fWithPieChart);
+
+    bool drawPieChart() const;
+    void setDrawPieChart(bool fDrawPieChart);
 
     bool useGradientLineColor() const;
@@ -184 +187 @@
     void sltCreateContextMenu(const QPoint &point);
     void sltResetMetric();
+    void sltSetDrawPieChart(bool fDrawPieChart);
 
 private:
@@ -217 +221 @@
     int m_iPieChartRadius;
     int m_iPieChartSpacing;
-    bool m_fWithPieChart;
+    /** For some chart it is not possible to have a pie chart, Then We dont present the
+      * option to show it to user. see m_fIsPieChartAllowed. */
+    bool m_fIsPieChartAllowed;
+    /**  m_fDrawPieChart is considered only if m_fIsPieChartAllowed is true. */
+    bool m_fDrawPieChart;
     bool m_fUseGradientLineColor;
     QColor m_dataSeriesColor[DATA_SERIES_SIZE];
@@ -223 +231 @@
     QString m_strGAWarning;
     QString m_strResetActionLabel;
+    QString m_strPieChartToggleActionLabel;
 };
 
@@ -524 +533 @@
     , m_size(QSize(50, 50))
     , m_iOverlayAlpha(80)
-    , m_fWithPieChart(false)
+    , m_fIsPieChartAllowed(false)
+    , m_fDrawPieChart(true)
     , m_fUseGradientLineColor(false)
 {
@@ -557 +567 @@
 }
 
-bool UIChart::withPieChart() const
-{
-    return m_fWithPieChart;
-}
-
-void UIChart::setWithPieChart(bool fWithPieChart)
-{
-    if (m_fWithPieChart == fWithPieChart)
-        return;
-    m_fWithPieChart = fWithPieChart;
+bool UIChart::isPieChartAllowed() const
+{
+    return m_fIsPieChartAllowed;
+}
+
+void UIChart::setIsPieChartAllowed(bool fWithPieChart)
+{
+    if (m_fIsPieChartAllowed == fWithPieChart)
+        return;
+    m_fIsPieChartAllowed = fWithPieChart;
+    update();
+}
+
+bool UIChart::drawPieChart() const
+{
+    return m_fDrawPieChart;
+}
+
+void UIChart::setDrawPieChart(bool fDrawChart)
+{
+    if (m_fDrawPieChart == fDrawChart)
+        return;
+    m_fDrawPieChart = fDrawChart;
     update();
 }
@@ -625 +648 @@
     m_strGAWarning = QApplication::translate("UIVMInformationDialog", "No guest additions! This metric requires guest additions to work properly.");
     m_strResetActionLabel = QApplication::translate("UIVMInformationDialog", "Reset");
+    m_strPieChartToggleActionLabel = QApplication::translate("UIVMInformationDialog", "Show Pie Chart");
 }
 
@@ -668 +692 @@
     painter.setPen(mainAxisColor);
     drawXAxisLabels(painter, iXSubAxisCount);
-
 
     /* Draw a half-transparent rectangle over the whole widget to indicate the it is disabled: */
@@ -731 +754 @@
     }
 
-    if (m_fWithPieChart)
+    if (m_fIsPieChartAllowed && m_fDrawPieChart)
         drawCombinedPieCharts(painter, iMaximum);
 }
@@ -853 +876 @@
     QPainterPath arc;
     QPointF center(rectangle.center());
-
-    // arc.moveTo(center);
-    // arc.arcTo(rectangle, 90/*startAngle*/,
-    //                -1 * 360 /*sweepLength*/);
-
     arc.addEllipse(rectangle);
     return arc;
@@ -938 +956 @@
     QAction *pResetAction = menu.addAction(m_strResetActionLabel);
     connect(pResetAction, &QAction::triggered, this, &UIChart::sltResetMetric);
+    if (m_fIsPieChartAllowed)
+    {
+        QAction *pPieChartToggle = menu.addAction(m_strPieChartToggleActionLabel);
+        pPieChartToggle->setCheckable(true);
+        pPieChartToggle->setChecked(m_fDrawPieChart);
+        connect(pPieChartToggle, &QAction::toggled, this, &UIChart::sltSetDrawPieChart);
+    }
     menu.exec(mapToGlobal(point));
 }
@@ -945 +970 @@
     if (m_pMetric)
         m_pMetric->reset();
+}
+
+void UIChart::sltSetDrawPieChart(bool fDrawPieChart)
+{
+    setDrawPieChart(fDrawPieChart);
 }
 
@@ -1257 +1287 @@
     /* Configure charts: */
     if (m_charts.contains(m_strCPUMetricName) && m_charts[m_strCPUMetricName])
-        m_charts[m_strCPUMetricName]->setWithPieChart(true);
+        m_charts[m_strCPUMetricName]->setIsPieChartAllowed(true);
 
     m_pRuntimeInfoWidget = new UIRuntimeInfoWidget(0, m_machine, m_console);