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

Timestamp:

Jul 22, 2020 8:29:51 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686, bugref:9510. Adding a toolbar for the performance monitor pane.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIActionPool.cpp (modified) (2 diffs)
• globals/UIActionPool.h (modified) (1 diff)
• manager/UIToolPaneMachine.cpp (modified) (2 diffs)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (1 diff)
• monitor/performance/UIPerformanceMonitor.cpp (modified) (11 diffs)
• monitor/performance/UIPerformanceMonitor.h (modified) (8 diffs)
• runtime/information/UIVMInformationDialog.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

@@ -2253 +2253 @@
 
 
-
+/** Simple action extension, used as 'Export' action class. */
+class UIActionMenuPerformanceMonitorExport : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    /** Constructs action passing @a pParent to the base-class. */
+    UIActionMenuPerformanceMonitorExport(UIActionPool *pParent)
+        : UIActionSimple(pParent,
+                         ":/log_viewer_save_32px.png", ":/log_viewer_save_16px.png",
+                         ":/log_viewer_save_disabled_32px.png", ":/log_viewer_save_disabled_16px.png")
+    {
+        setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    }
+
+protected:
+
+    /** Returns shortcut extra-data ID. */
+    virtual QString shortcutExtraDataID() const /* override */
+    {
+        return QString("ExportCharts");
+    }
+
+    /** Returns default shortcut. */
+    virtual QKeySequence defaultShortcut(UIActionPoolType) const /* override */
+    {
+        return QKeySequence();
+    }
+
+    /** Handles translation event. */
+    virtual void retranslateUi() /* override */
+    {
+        setName(QApplication::translate("UIActionPool", "Export..."));
+        setShortcutScope(QApplication::translate("UIActionPool", "Performance Monitor"));
+        setStatusTip(QApplication::translate("UIActionPool", "Export the chart data into a text file"));
+        setToolTip(  QApplication::translate("UIActionPool", "Export the chart data into a text file")
+                   + (shortcut().isEmpty() ? QString() : QString(" (%1)").arg(shortcut().toString())));
+    }
+};
 
 
@@ -2504 +2543 @@
     m_pool[UIActionIndex_M_FileManager_S_Guest_ShowProperties] = new UIActionMenuFileManagerShowProperties(this);
 
+    /* Create 'Performance Monitor' actions: */
+    m_pool[UIActionIndex_M_PerformanceMonitor_S_Export] = new UIActionMenuPerformanceMonitorExport(this);
+
 
     /* Prepare update-handlers for known menus: */

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h

@@ -136 +136 @@
     UIActionIndex_M_FileManager_S_Guest_ShowProperties,
 
+    /* Machine performance monitor actions. */
+    UIActionIndex_M_PerformanceMonitor_S_Export,
 
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp

@@ -193 +193 @@
             case UIToolType_Performance:
             {
-                m_pPanePerformanceMonitor = new UIPerformanceMonitor(0, m_comMachine);
+                m_pPanePerformanceMonitor = new UIPerformanceMonitor(EmbedTo_Stack, 0, m_comMachine, false /* Show toolbar */);
                 AssertPtrReturnVoid(m_pPanePerformanceMonitor);
 #ifndef VBOX_WS_MAC
@@ -298 +298 @@
     if (isToolOpened(UIToolType_Performance))
     {
-        // AssertPtrReturnVoid(m_pPanePerformanceMonitor);
-        // // CSession comSession = uiCommon().openSession(m_comMachine.GetId(), KLockType_Shared);
-        // // AssertReturnVoid(!comSession.isNull());
-        // // CConsole comConsole = comSession.GetConsole();
-        // AssertReturnVoid(!comConsole.isNull());
-
-        //m_pPaneLogViewer->setMachine(m_comMachine);
+        AssertPtrReturnVoid(m_pPanePerformanceMonitor);
+        m_pPanePerformanceMonitor->setMachine(m_comMachine);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -830 +830 @@
                 case UIToolType_Performance:
                 {
+                    m_pToolBar->addAction(actionPool()->action(UIActionIndex_M_PerformanceMonitor_S_Export));
                     break;
                 }

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

@@ -30 +30 @@
 #include "UICommon.h"
 #include "UIPerformanceMonitor.h"
+#include "UIToolBar.h"
+#include "UIVirtualBoxEventHandler.h"
 
 /* COM includes: */
@@ -539 +541 @@
 }
 
-
 void UIChart::sltCreateContextMenu(const QPoint &point)
 {
@@ -699 +700 @@
 *********************************************************************************************************************************/
 
-UIPerformanceMonitor::UIPerformanceMonitor(QWidget *pParent, const CMachine &machine)
+UIPerformanceMonitor::UIPerformanceMonitor(EmbedTo enmEmbedding, QWidget *pParent,
+                                           const CMachine &machine, bool fShowToolbar /* = false */)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_fGuestAdditionsAvailable(false)
     , m_pMainLayout(0)
     , m_pTimer(0)
+    , m_pToolBar(0)
     , m_strCPUMetricName("CPU Load")
     , m_strRAMMetricName("RAM Usage")
@@ -711 +714 @@
     , m_strVMExitMetricName("VMExits")
     , m_iTimeStep(0)
-{
-    setMachine(machine);
-    m_fGuestAdditionsAvailable = guestAdditionsAvailable(6 /* minimum major version */);
-
+    , m_enmEmbedding(enmEmbedding)
+    , m_fShowToolbar(fShowToolbar)
+{
     prepareMetrics();
     prepareObjects();
-    enableDisableGuestAdditionDependedWidgets(m_fGuestAdditionsAvailable);
+    if (fShowToolbar)
+        prepareToolBar();
     retranslateUi();
+    connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineStateChange, this, &UIPerformanceMonitor::sltMachineStateChange);
+    setMachine(machine);
 }
 
@@ -727 +732 @@
 void UIPerformanceMonitor::setMachine(const CMachine &comMachine)
 {
+    reset();
     if (comMachine.isNull())
         return;
@@ -734 +740 @@
 
     m_comMachine = comMachine;
+
+    if (m_comMachine.GetState() == KMachineState_Running)
+    {
+        openSession();
+        start();
+    }
+}
+
+void UIPerformanceMonitor::openSession()
+{
     m_comSession = uiCommon().openSession(m_comMachine.GetId(), KLockType_Shared);
     AssertReturnVoid(!m_comSession.isNull());
@@ -806 +822 @@
         }
     }
-    sltTimeout();
 }
 
@@ -818 +833 @@
     m_pTimer = new QTimer(this);
     if (m_pTimer)
-    {
         connect(m_pTimer, &QTimer::timeout, this, &UIPerformanceMonitor::sltTimeout);
-        m_pTimer->start(1000 * g_iPeriod);
-    }
 
     QScrollArea *pScrollArea = new QScrollArea(this);
@@ -920 +932 @@
         UIMonitorCommon::getVMMExitCount(m_comMachineDebugger, cTotalVMExits);
         updateVMExitMetric(cTotalVMExits);
+    }
+}
+
+void UIPerformanceMonitor::sltMachineStateChange(const QUuid &uId)
+{
+    if (m_comMachine.isNull())
+        return;
+    if (m_comMachine.GetId() != uId)
+        return;
+    reset();
+    if (m_comMachine.GetState() == KMachineState_Running)
+    {
+        openSession();
+        start();
     }
 }
@@ -978 +1004 @@
 }
 
+void UIPerformanceMonitor::prepareToolBar()
+{
+    /* Create toolbar: */
+    m_pToolBar = new UIToolBar(parentWidget());
+    AssertPtrReturnVoid(m_pToolBar);
+    {
+        /* Configure toolbar: */
+        const int iIconMetric = (int)(QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize));
+        m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
+        m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+
+#ifdef VBOX_WS_MAC
+        /* Check whether we are embedded into a stack: */
+        if (m_enmEmbedding == EmbedTo_Stack)
+        {
+            /* Add into layout: */
+            layout()->addWidget(m_pToolBar);
+        }
+#else
+        /* Add into layout: */
+        layout()->addWidget(m_pToolBar);
+#endif
+    }
+}
+
 bool UIPerformanceMonitor::guestAdditionsAvailable(int iMinimumMajorVersion)
 {
@@ -1191 +1242 @@
 }
 
+void UIPerformanceMonitor::reset()
+{
+    m_fGuestAdditionsAvailable = false;
+    if (m_pTimer)
+        m_pTimer->stop();
+    for (QMap<QString, UIMetric>::iterator iterator =  m_metrics.begin();
+         iterator != m_metrics.end(); ++iterator)
+        iterator.value().reset();
+    for (QMap<QString, UIChart*>::iterator iterator =  m_charts.begin();
+         iterator != m_charts.end(); ++iterator)
+        iterator.value()->update();
+}
+
+void UIPerformanceMonitor::start()
+{
+    if (m_comMachine.isNull() || m_comMachine.GetState() != KMachineState_Running)
+        return;
+
+    m_fGuestAdditionsAvailable = guestAdditionsAvailable(6 /* minimum major version */);
+    enableDisableGuestAdditionDependedWidgets(m_fGuestAdditionsAvailable);
+    if (m_pTimer)
+        m_pTimer->start(1000 * g_iPeriod);
+}
+
+
 #include "UIPerformanceMonitor.moc"

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

@@ -36 +36 @@
 
 /* GUI includes: */
+#include "QIManagerDialog.h"
 #include "QIWithRetranslateUI.h"
 #include "UIMonitorCommon.h"
@@ -46 +47 @@
 class UISession;
 class UIRuntimeInfoWidget;
+class UIToolBar;
 
 #define DATA_SERIES_SIZE 2
@@ -110 +112 @@
     /** Constructs information-tab passing @a pParent to the QWidget base-class constructor.
       * @param machine is machine reference. */
-    UIPerformanceMonitor(QWidget *pParent, const CMachine &machine);
+    UIPerformanceMonitor(EmbedTo enmEmbedding, QWidget *pParent, const CMachine &machine, bool fShowToolbar = false);
     ~UIPerformanceMonitor();
     void setMachine(const CMachine &machine);
 
+#ifdef VBOX_WS_MAC
+    UIToolBar *toolbar() const { return m_pToolBar; }
+#endif
+
  public slots:
 
@@ -129 +135 @@
     /** Reads the metric values for several sources and calls corresponding update functions. */
     void sltTimeout();
+    /** Stop updating the charts if/when the machine state changes something other than KMachineState_Running. */
+    void sltMachineStateChange(const QUuid &uId);
 
 private:
@@ -134 +142 @@
     void prepareObjects();
     void prepareMetrics();
+    void prepareToolBar();
     bool guestAdditionsAvailable(int iMinimumMajorVersion);
     void enableDisableGuestAdditionDependedWidgets(bool fEnable);
@@ -148 +157 @@
     /** Returns a QColor for the chart with @p strChartName and data series with @p iDataIndex. */
     QString dataColorString(const QString &strChartName, int iDataIndex);
+    /* Starts the timer which in return collects data and updates charts/graphs. */
+    void start();
+    void reset();
+    void openSession();
 
     bool m_fGuestAdditionsAvailable;
@@ -158 +171 @@
     /** Holds the instance of layout we create. */
     QVBoxLayout *m_pMainLayout;
-    QTimer *m_pTimer;
+    QTimer      *m_pTimer;
+    UIToolBar   *m_pToolBar;
 
     /** @name The following are used during UIPerformanceCollector::QueryMetricsData(..)
@@ -210 +224 @@
     /** @} */
     quint64 m_iTimeStep;
+    EmbedTo m_enmEmbedding;
+    bool    m_fShowToolbar;
 };
 

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

@@ -200 +200 @@
         /* Create Performance Monitor tab: */
         UIPerformanceMonitor *pPerformanceMonitorWidget =
-            new UIPerformanceMonitor(this, m_pMachineWindow->machine());
+            new UIPerformanceMonitor(EmbedTo_Dialog, this, m_pMachineWindow->machine());
         if (pPerformanceMonitorWidget)
         {