Changeset 80451 in vbox

Timestamp:

Aug 27, 2019 6:49:29 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9510:

• switching to vertical design
• making VM Exit metric avaible in release builds as well

Location:

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

Files:

• UIInformationRuntime.cpp (modified) (13 diffs)
• UIInformationRuntime.h (modified) (3 diffs)

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

@@ -23 +23 @@
 #include <QPainter>
 #include <QGridLayout>
+#include <QScrollArea>
 #include <QStyle>
 #include <QXmlStreamReader>
+#include <QVBoxLayout>
 #include <QTableWidget>
 #include <QTimer>
@@ -431 +433 @@
     m_iPieChartRadius = 1.2f * qApp->style()->pixelMetric(QStyle::PM_LargeIconSize);
     m_iPieChartSpacing = 0.3 * qApp->QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
-    m_size = QSize(10 * m_iPieChartRadius,  2 * m_iPieChartRadius);
+    m_size = QSize(10 * m_iPieChartRadius,  3 * m_iPieChartRadius);
     retranslateUi();
 }
@@ -993 +995 @@
     /* Compute the maximum label string length and set it as a fixed width to labels to prevent always changing widths: */
     /* Add m_iDecimalCount plus 3 characters for the number and 3 for unit string: */
-    iMaximum += (iDecimalCount + 7);
+    iMaximum += (iDecimalCount + 6);
     if (!m_infoLabels.isEmpty())
     {
@@ -1010 +1012 @@
 void UIInformationRuntime::prepareObjects()
 {
-    m_pMainLayout = new QGridLayout(this);
-    if (m_pMainLayout)
-    {
-        m_pMainLayout->setSpacing(10);
-    }
+    m_pMainLayout = new QVBoxLayout(this);
+    if (!m_pMainLayout)
+        return;
+    m_pMainLayout->setSpacing(0);
 
     m_pTimer = new QTimer(this);
@@ -1023 +1024 @@
     }
 
-    UIRuntimeInfoWidget *m_pRuntimeInfoWidget = new UIRuntimeInfoWidget(0, m_machine, m_console);
-    m_pMainLayout->addWidget(m_pRuntimeInfoWidget, 0, 0, 6, 1);
-    m_pRuntimeInfoWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+    QScrollArea *pScrollArea = new QScrollArea;
+    m_pMainLayout->addWidget(pScrollArea);
+    QWidget *pContainerWidget = new QWidget;
+    QGridLayout *pContainerLayout = new QGridLayout;
+    pContainerWidget->setLayout(pContainerLayout);
+    pContainerLayout->setSpacing(10);
+    pContainerWidget->show();
+    pScrollArea->setWidget(pContainerWidget);
+    pScrollArea->setWidgetResizable(true);
 
     QStringList chartOrder;
@@ -1033 +1040 @@
     foreach (const QString &strMetricName, chartOrder)
     {
+        QHBoxLayout *pChartLayout = new QHBoxLayout;
+        pChartLayout->setSpacing(0);
+
         if (!m_subMetrics.contains(strMetricName))
             continue;
         QLabel *pLabel = new QLabel;
         pLabel->setAlignment(Qt::AlignLeft | Qt::AlignTop);
-        m_pMainLayout->addWidget(pLabel, iRow, 1);
+        pChartLayout->addWidget(pLabel);
         m_infoLabels.insert(strMetricName, pLabel);
 
@@ -1043 +1053 @@
         m_charts.insert(strMetricName, pChart);
         pChart->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-        m_pMainLayout->addWidget(pChart, iRow, 2);
+        pChartLayout->addWidget(pChart);
+        pContainerLayout->addLayout(pChartLayout, iRow, 0, 1, 2);
         ++iRow;
     }
@@ -1052 +1063 @@
     if (m_charts.contains(m_strRAMMetricName) && m_charts[m_strRAMMetricName])
         m_charts[m_strRAMMetricName]->setWithPieChart(false);
+
+
+    UIRuntimeInfoWidget *m_pRuntimeInfoWidget = new UIRuntimeInfoWidget(0, m_machine, m_console);
+    pContainerLayout->addWidget(m_pRuntimeInfoWidget, iRow, 0, 2, 2);
+    m_pRuntimeInfoWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+
 
     QWidget *bottomSpacerWidget = new QWidget(this);
@@ -1060 +1077 @@
     // bottomSpacerWidget->setAutoFillBackground(true);
     // bottomSpacerWidget->setPalette(pal);
-
-    m_pMainLayout->addWidget(bottomSpacerWidget, iRow, 1, 1, 2);
+    pContainerLayout->addWidget(bottomSpacerWidget, iRow, 0, 1, 2);
 }
 
@@ -1157 +1173 @@
                     else if (metric.name() == m_strVMExitMetricName)
                     {
-                        if (data.m_strName.contains("all", Qt::CaseInsensitive))
+                        if (data.m_strName.contains("RecordedExits", Qt::CaseInsensitive))
                             uTotalVMExits += data.m_counter;
                     }
@@ -1238 +1254 @@
     {
         UIMetric VMExitsMetric(m_strVMExitMetricName, "times", iMaximumQueueSize);
-        VMExitsMetric.setQueryPrefix("HM");
+        VMExitsMetric.setQueryPrefix("PROF");
         QStringList typeList;
         typeList << "CPU";
         VMExitsMetric.setDeviceTypeList(typeList);
         QStringList subStringList;
-        subStringList << "All";
+        subStringList << "RecordedExits";
         VMExitsMetric.setMetricDataSubString(subStringList);
         m_subMetrics.insert(m_strVMExitMetricName, VMExitsMetric);
@@ -1484 +1500 @@
 
     QString strStats = debugger.GetStats(strQuery, false);
-
     QXmlStreamReader xmlReader;
     xmlReader.addData(strStats);
@@ -1500 +1515 @@
                 xmlData.push_back(DebuggerMetricData(*(attributes.value("name").string()), iCounter));
             }
+            else if (xmlReader.name() == "U64")
+            {
+                QXmlStreamAttributes attributes = xmlReader.attributes();
+                qulonglong iCounter = attributes.value("val").toULongLong();
+                iTotal += iCounter;
+                xmlReader.skipCurrentElement();
+                xmlData.push_back(DebuggerMetricData(*(attributes.value("name").string()), iCounter));
+            }
             else
                 xmlReader.skipCurrentElement();

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

@@ -42 +42 @@
 /* Forward declarations: */
 class QTimer;
-class QGridLayout;
+class QVBoxLayout;
 class QLabel;
 class UIChart;
@@ -103 +103 @@
     void composeQueryString();
 
-    /** This list is used to differentiate xml data we get from the IMachineDebugger. */
-    QStringList m_deviceTypeList;
-    /** This is used to select data series of the metric. For example, for network metric
-      * it is ReceiveBytes/TransmitBytes */
-    QStringList m_metricDataSubString;
-    QString m_strQueryPrefix;
+    /** @name The following strings are string list are used while making IMachineDebugger::getStats calls and parsing the resultin
+      * xml stream.
+      * @{ */
+        /** This string is used while calling IMachineDebugger::getStats(..). It is composed of
+        * m_strQueryPrefix, m_deviceTypeList, and  m_metricDataSubString. */
+        QString m_strQueryString;
+        /** This list is used to differentiate xml data we get from the IMachineDebugger. */
+        QStringList m_deviceTypeList;
+        /** This is used to select data series of the metric. For example, for network metric
+         * it is ReceiveBytes/TransmitBytes */
+        QStringList m_metricDataSubString;
+        QString m_strQueryPrefix;
+    /** @} */
 
     QString m_strName;
     QString m_strUnit;
-    /** This string is used while calling IMachineDebugger::getStats(..). It is composed of
-      * m_strQueryPrefix, m_deviceTypeList, and  m_metricDataSubString. */
-    QString m_strQueryString;
     qulonglong m_iMaximum;
     QQueue<qulonglong> m_data[DATA_SERIES_SIZE];
@@ -177 +181 @@
     CMachineDebugger      m_machineDebugger;
     /** Holds the instance of layout we create. */
-    QGridLayout *m_pMainLayout;
+    QVBoxLayout *m_pMainLayout;
     UIRuntimeInfoWidget *m_pRuntimeInfoWidget;
     QTimer *m_pTimer;