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

Timestamp:

Jul 13, 2020 9:17:08 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9686. Moving UIPerformanceMonitor to UICommon.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (6 diffs)
• src/monitor/performance/UIPerformanceMonitor.cpp (modified) (5 diffs)
• src/monitor/performance/UIPerformanceMonitor.h (modified) (3 diffs)
• src/runtime/information/UIVMInformationDialog.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -682 +682 @@
 VirtualBoxVM_QT_MOCHDRS = \
         src/globals/UIStarter.h \
-        src/monitor/performance/UIPerformanceMonitor.h \
         src/runtime/UIConsoleEventHandler.h \
         src/runtime/UIFrameBuffer.h \
@@ -815 +814 @@
         src/logviewer/UIVMLogViewerTextEdit.h \
         src/logviewer/UIVMLogViewerWidget.h \
+        src/monitor/performance/UIPerformanceMonitor.h \
         src/medium/UIFDCreationDialog.h \
         src/medium/UIMediumEnumerator.h \
@@ -945 +945 @@
 #
 VirtualBoxVM_QT_MOCSRCS = \
-        src/monitor/performance/UIPerformanceMonitor.cpp \
         src/runtime/UIConsoleEventHandler.cpp \
         src/runtime/UIFrameBuffer.cpp \
@@ -980 +979 @@
         src/logviewer/UIVMLogViewerSearchPanel.cpp \
         src/logviewer/UIVMLogViewerTextEdit.cpp \
+        src/monitor/performance/UIPerformanceMonitor.cpp \
         src/medium/UIMediumEnumerator.cpp \
         src/medium/viso/UIVisoContentBrowser.cpp \
@@ -1160 +1160 @@
         src/main.cpp \
         src/globals/UIStarter.cpp \
-        src/monitor/performance/UIPerformanceMonitor.cpp \
         src/runtime/UIConsoleEventHandler.cpp \
         src/runtime/UIFrameBuffer.cpp \
@@ -1321 +1320 @@
         src/logviewer/UIVMLogViewerWidget.cpp \
         src/monitor/UIMonitorCommon.cpp \
+        src/monitor/performance/UIPerformanceMonitor.cpp \
         src/medium/UIFDCreationDialog.cpp \
         src/medium/UIMedium.cpp \

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

@@ -30 +30 @@
 #include "UICommon.h"
 #include "UIPerformanceMonitor.h"
-#include "UISession.h"
 
 /* COM includes: */
@@ -690 +689 @@
 }
 
-
 /*********************************************************************************************************************************
 *   UIPerformanceMonitor implementation.                                                                              *
 *********************************************************************************************************************************/
 
-UIPerformanceMonitor::UIPerformanceMonitor(QWidget *pParent, const CMachine &machine, const CConsole &console, const UISession *pSession)
+UIPerformanceMonitor::UIPerformanceMonitor(QWidget *pParent, const CMachine &machine, const CConsole &console)
     : QIWithRetranslateUI<QWidget>(pParent)
     , m_fGuestAdditionsAvailable(false)
@@ -713 +711 @@
         m_comGuest = m_console.GetGuest();
     m_fGuestAdditionsAvailable = guestAdditionsAvailable(6 /* minimum major version */);
-    connect(pSession, &UISession::sigAdditionsStateChange, this, &UIPerformanceMonitor::sltGuestAdditionsStateChange);
 
     prepareMetrics();
@@ -862 +859 @@
     ++m_iTimeStep;
 
-   if (m_metrics.contains(m_strRAMMetricName))
-   {
-       quint64 iTotalRAM = 0;
-       quint64 iFreeRAM = 0;
-       UIMonitorCommon::getRAMLoad(m_performanceMonitor, m_nameList, m_objectList, iTotalRAM, iFreeRAM);
-       updateRAMGraphsAndMetric(iTotalRAM, iFreeRAM);
-   }
+    if (m_metrics.contains(m_strRAMMetricName))
+    {
+        quint64 iTotalRAM = 0;
+        quint64 iFreeRAM = 0;
+        UIMonitorCommon::getRAMLoad(m_performanceMonitor, m_nameList, m_objectList, iTotalRAM, iFreeRAM);
+        updateRAMGraphsAndMetric(iTotalRAM, iFreeRAM);
+    }
 
     /* Update the CPU load chart with values we get from IMachineDebugger::getCPULoad(..): */
@@ -904 +901 @@
 }
 
-/**
- *
- * @returns
- */
 void UIPerformanceMonitor::sltGuestAdditionsStateChange()
 {

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

@@ -100 +100 @@
   * two sources of the performance metrics. Unfortunately these two have very distinct APIs resulting a bit too much
   * special casing etc.*/
-class UIPerformanceMonitor : public QIWithRetranslateUI<QWidget>
+class  SHARED_LIBRARY_STUFF UIPerformanceMonitor : public QIWithRetranslateUI<QWidget>
 {
     Q_OBJECT;
@@ -109 +109 @@
       * @param machine is machine reference.
       * @param console is machine console reference. */
-    UIPerformanceMonitor(QWidget *pParent, const CMachine &machine, const CConsole &console, const UISession *pSession);
+    UIPerformanceMonitor(QWidget *pParent, const CMachine &machine, const CConsole &console);
     ~UIPerformanceMonitor();
+
+ public slots:
+
+    /** @name These functions are connected to API events and implement necessary updates.
+      * @{ */
+        void sltGuestAdditionsStateChange();
+    /** @} */
 
 protected:
@@ -120 +127 @@
     /** Reads the metric values for several sources and calls corresponding update functions. */
     void sltTimeout();
-    /** @name These functions are connected to API events and implement necessary updates.
-      * @{ */
-        void sltGuestAdditionsStateChange();
-    /** @} */
 
 private:

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

@@ -200 +200 @@
         /* Create Performance Monitor tab: */
         UIPerformanceMonitor *pPerformanceMonitorWidget =
-            new UIPerformanceMonitor(this, m_pMachineWindow->machine(), m_pMachineWindow->console(), m_pMachineWindow->uisession());
+            new UIPerformanceMonitor(this, m_pMachineWindow->machine(), m_pMachineWindow->console());
         if (pPerformanceMonitorWidget)
         {
+            connect(m_pMachineWindow->uisession(), &UISession::sigAdditionsStateChange,
+                    pPerformanceMonitorWidget, &UIPerformanceMonitor::sltGuestAdditionsStateChange);
             m_tabs.insert(2, pPerformanceMonitorWidget);
             m_pTabWidget->addTab(m_tabs.value(2), QString());