Changeset 80246 in vbox

Timestamp:

Aug 13, 2019 9:39:44 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9510: Some fixes and improvements

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIPerformanceMonitor.cpp (modified) (12 diffs)

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

@@ -40 +40 @@
 const int iMaximumQueueSize = 120;
 const int iMetricSetupCount = 1;
-
+const int iDecimalCount = 2;
 /*********************************************************************************************************************************
 *   UIChart definition.                                                                                     *
@@ -67 +67 @@
     void setDataSeriesColor(int iDataSeriesIndex, const QColor &color);
 
-    QString dataSeriesLabel(int iDataSeriesIndex);
-    void setDataSeriesLabel(int iDataSeriesIndex, const QString &strLabel);
+    QString XAxisLabel();
+    void setXAxisLabel(const QString &strLabel);
 
 protected:
@@ -90 +90 @@
     bool m_fUseGradientLineColor;
     QColor m_dataSeriesColor[2];
-    QString m_dataSeriesLabel[2];
+    QString m_strXAxisLabel;
 };
 
@@ -109 +109 @@
 
     m_iMarginLeft = 1 * qApp->QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
-    m_iMarginRight = 4 * qApp->QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
+    m_iMarginRight = 6 * qApp->QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
     m_iMarginTop = 0.3 * qApp->QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
     m_iMarginBottom = 2 * qApp->QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
@@ -182 +182 @@
 }
 
-QString UIChart::dataSeriesLabel(int iDataSeriesIndex)
-{
-    if (iDataSeriesIndex >= 2)
-        return QString();
-    return m_dataSeriesLabel[iDataSeriesIndex];
-}
-
-void UIChart::setDataSeriesLabel(int iDataSeriesIndex, const QString &strLabel)
-{
-    if (iDataSeriesIndex >= 2)
-        return;
-    if (m_dataSeriesLabel[iDataSeriesIndex] == strLabel)
-        return;
-    m_dataSeriesLabel[iDataSeriesIndex] = strLabel;
-    update();
+QString UIChart::XAxisLabel()
+{
+    return m_strXAxisLabel;
+}
+
+void UIChart::setXAxisLabel(const QString &strLabel)
+{
+    m_strXAxisLabel = strLabel;
 }
 
@@ -269 +262 @@
         if (i == 0)
         {
-            strCurentSec += " seconds";
+            strCurentSec += " " + m_strXAxisLabel;
             painter.drawText(iTextX, height() - m_iMarginBottom + iFontHeight, strCurentSec);
         }
@@ -323 +316 @@
     /* Draw YAxis tick labels: */
     painter.setPen(mainAxisColor);
-    for (int i = 1; i < iYSubAxisCount + 2; ++i)
-    {
-
-        int iTextY = m_iMarginTop + i * iChartHeight / (float) (iYSubAxisCount + 1);
+    for (int i = 0; i < iYSubAxisCount + 2; ++i)
+    {
+
+        int iTextY = 0.5 * iFontHeight + m_iMarginTop + i * iChartHeight / (float) (iYSubAxisCount + 1);
         QString strValue;
-        ULONG iValue = iMaximum - (i +1) * iMaximum / (float) (iYSubAxisCount + 2);
+        ULONG iValue = (iYSubAxisCount + 1 - i) * (iMaximum / (float) (iYSubAxisCount + 1));
+        //printf("%d %u\n", i, iValue);
         if (m_pSubMetric->unit().compare("%", Qt::CaseInsensitive) == 0)
             strValue = QString::number(iValue);
         else if (m_pSubMetric->unit().compare("kb", Qt::CaseInsensitive) == 0)
-            strValue = uiCommon().formatSize(_1K * (quint64)iValue);
+            strValue = uiCommon().formatSize(_1K * (quint64)iValue, iDecimalCount);
         else if (m_pSubMetric->unit().compare("b", Qt::CaseInsensitive) == 0 ||
                  m_pSubMetric->unit().compare("b/s", Qt::CaseInsensitive) == 0)
-            strValue = uiCommon().formatSize(iValue);
+            strValue = uiCommon().formatSize(iValue, iDecimalCount);
         painter.drawText(width() - 0.9 * m_iMarginRight, iTextY, strValue);
     }
@@ -486 +480 @@
 void UIPerformanceMonitor::retranslateUi()
 {
+    foreach (UIChart *pChart, m_charts)
+        pChart->setXAxisLabel(QApplication::translate("UIVMInformationDialog", "Seconds"));
+    int iMaximum = 0;
     m_strCPUInfoLabelTitle = QApplication::translate("UIVMInformationDialog", "CPU Load");
+    iMaximum = qMax(iMaximum, m_strCPUInfoLabelTitle.length());
+
     m_strRAMInfoLabelTitle = QApplication::translate("UIVMInformationDialog", "RAM Usage");
+    iMaximum = qMax(iMaximum, m_strRAMInfoLabelTitle.length());
     m_strRAMInfoLabelTotal = QApplication::translate("UIVMInformationDialog", "Total");
+    iMaximum = qMax(iMaximum, m_strRAMInfoLabelTotal.length());
     m_strRAMInfoLabelFree = QApplication::translate("UIVMInformationDialog", "Free");
+    iMaximum = qMax(iMaximum, m_strRAMInfoLabelFree.length());
     m_strRAMInfoLabelUsed = QApplication::translate("UIVMInformationDialog", "Used");
+    iMaximum = qMax(iMaximum, m_strRAMInfoLabelUsed.length());
     m_strNetInfoLabelTitle = QApplication::translate("UIVMInformationDialog", "Network");
+    iMaximum = qMax(iMaximum, m_strNetInfoLabelTitle.length());
     m_strNetInfoLabelReceived = QApplication::translate("UIVMInformationDialog", "Received");
+    iMaximum = qMax(iMaximum, m_strNetInfoLabelReceived.length());
     m_strNetInfoLabelTransmitted = QApplication::translate("UIVMInformationDialog", "Trasmitted");
+    iMaximum = qMax(iMaximum, m_strNetInfoLabelTransmitted.length());
     m_strNetInfoLabelMaximum = QApplication::translate("UIVMInformationDialog", "Maximum");
+    iMaximum = qMax(iMaximum, m_strNetInfoLabelMaximum.length());
+
+    /* 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 2 for unit string: */
+    iMaximum += (iDecimalCount + 5);
+    if (!m_infoLabels.isEmpty())
+    {
+        QLabel *pLabel = m_infoLabels.begin().value();
+
+        if (pLabel)
+        {
+            QFontMetrics labelFontMetric(pLabel->font());
+            int iWidth = iMaximum * labelFontMetric.width('X');
+            foreach (QLabel *pInfoLabel, m_infoLabels)
+                pInfoLabel->setFixedWidth(iWidth);
+        }
+    }
+
 }
 
@@ -537 +561 @@
         m_charts[m_strNetMetricName]->setUseGradientLineColor(false);
     }
-    // if (m_charts.contains(m_strCPUMetricName) && m_charts[m_strCPUMetricName])
-    //     m_charts[m_strCPUMetricName]->setUseGradientLineColor(false);
+    if (m_charts.contains(m_strCPUMetricName) && m_charts[m_strCPUMetricName])
+        m_charts[m_strCPUMetricName]->setUseGradientLineColor(false);
 
     QWidget *bottomSpacerWidget = new QWidget(this);
@@ -714 +738 @@
 void UIPerformanceMonitor::updateCPUGraphsAndMetric(ULONG iExecutingPercentage, ULONG iOtherPercentage)
 {
-    Q_UNUSED(iOtherPercentage);
     UISubMetric &CPUMetric = m_subMetrics[m_strCPUMetricName];
     CPUMetric.addData(0, iExecutingPercentage);
-    //CPUMetric.addData(1, iOtherPercentage);
+    CPUMetric.addData(1, iOtherPercentage);
     CPUMetric.setMaximum(100);
     if (m_infoLabels.contains(m_strCPUMetricName) && m_infoLabels[m_strCPUMetricName])
@@ -741 +764 @@
         QString strInfo;
         if (m_infoLabels[m_strRAMMetricName]->isEnabled())
-            strInfo = QString("<b>%1</b><br/>%2: %3<br/>%4: %5<br/>%6: %7").arg(m_strRAMInfoLabelTitle).arg(m_strRAMInfoLabelTotal).arg(uiCommon().formatSize(_1K * iTotalRAM))
-                .arg(m_strRAMInfoLabelFree).arg(uiCommon().formatSize(_1K * (iFreeRAM)))
-                .arg(m_strRAMInfoLabelUsed).arg(uiCommon().formatSize(_1K * (iTotalRAM - iFreeRAM)));
+            strInfo = QString("<b>%1</b><br/>%2: %3<br/>%4: %5<br/>%6: %7").arg(m_strRAMInfoLabelTitle).arg(m_strRAMInfoLabelTotal).arg(uiCommon().formatSize(_1K * iTotalRAM, iDecimalCount))
+                .arg(m_strRAMInfoLabelFree).arg(uiCommon().formatSize(_1K * (iFreeRAM), iDecimalCount))
+                .arg(m_strRAMInfoLabelUsed).arg(uiCommon().formatSize(_1K * (iTotalRAM - iFreeRAM), iDecimalCount));
         else
             strInfo = QString("<b>%1</b><br/>%2: %3<br/>%4: %5<br/>%6: %7").arg(m_strRAMInfoLabelTitle).arg(m_strRAMInfoLabelTotal).arg("---").arg(m_strRAMInfoLabelFree).arg("---").arg(m_strRAMInfoLabelUsed).arg("---");
@@ -767 +790 @@
         if (m_infoLabels[m_strNetMetricName]->isEnabled())
             strInfo = QString("<b>%1</b></b><br/><font color=\"#FF0000\">%2: %3</font><br/><font color=\"#0000FF\">%4: %5</font><br/>%6: %7").arg(m_strNetInfoLabelTitle)
-                .arg(m_strNetInfoLabelReceived).arg(uiCommon().formatSize((quint64)iReceiveRate))
-                .arg(m_strNetInfoLabelTransmitted).arg(uiCommon().formatSize((quint64)iTransmitRate))
-                .arg(m_strNetInfoLabelMaximum).arg(uiCommon().formatSize((quint64)iMaximum));
+                .arg(m_strNetInfoLabelReceived).arg(uiCommon().formatSize((quint64)iReceiveRate, iDecimalCount))
+                .arg(m_strNetInfoLabelTransmitted).arg(uiCommon().formatSize((quint64)iTransmitRate, iDecimalCount))
+                .arg(m_strNetInfoLabelMaximum).arg(uiCommon().formatSize((quint64)iMaximum, iDecimalCount));
         else
             strInfo = QString("<b>%1</b><br/>%2: %3<br/>%4: %5<br/>%6: %7").arg(m_strNetInfoLabelTitle).arg(m_strNetInfoLabelReceived).arg("---").arg(m_strNetInfoLabelTransmitted).arg("---");