Changeset 102900 in vbox for trunk/src

Timestamp:

Jan 16, 2024 3:08:18 PM (16 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

161122

Message:

FE/Qt: bugref:10501. Using an enum rather than strings metric/chart container keys.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity

Files:

• UIVMActivityMonitor.cpp (modified) (50 diffs)
• UIVMActivityMonitor.h (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.cpp

@@ -1286 +1286 @@
     {
         QTextStream stream(&dataFile);
-        for (QMap<QString, UIMetric>::const_iterator iterator =  m_metrics.begin(); iterator != m_metrics.end(); ++iterator)
+        for (QMap<Metric_Type, UIMetric>::const_iterator iterator =  m_metrics.begin(); iterator != m_metrics.end(); ++iterator)
             iterator.value().toFile(stream);
         dataFile.close();
@@ -1323 +1323 @@
 void UIVMActivityMonitor::resetRAMInfoLabel()
 {
-    if (m_infoLabels.contains(m_strRAMMetricName)  && m_infoLabels[m_strRAMMetricName])
+    if (m_infoLabels.contains(Metric_Type_RAM)  && m_infoLabels[Metric_Type_RAM])
     {
         QString strInfo = QString("<b>%1</b><br/>%2: %3<br/>%4: %5<br/>%6: %7").
@@ -1329 +1329 @@
             .arg(m_strRAMInfoLabelFree).arg("--")
             .arg(m_strRAMInfoLabelUsed).arg("--");
-        m_infoLabels[m_strRAMMetricName]->setText(strInfo);
-    }
-}
-
-QString UIVMActivityMonitor::dataColorString(const QString &strChartName, int iDataIndex)
-{
-    if (!m_charts.contains(strChartName))
+        m_infoLabels[Metric_Type_RAM]->setText(strInfo);
+    }
+}
+
+QString UIVMActivityMonitor::dataColorString(Metric_Type enmType, int iDataIndex)
+{
+    if (!m_charts.contains(enmType))
         return QColor(Qt::black).name(QColor::HexRgb);
-    UIChart *pChart = m_charts[strChartName];
+    UIChart *pChart = m_charts[enmType];
     if (!pChart)
         return QColor(Qt::black).name(QColor::HexRgb);
@@ -1385 +1385 @@
 
     /* Configure charts: */
-    if (m_charts.contains(m_strCPUMetricName) && m_charts[m_strCPUMetricName])
-    {
-        m_charts[m_strCPUMetricName]->setIsPieChartAllowed(true);
-        m_charts[m_strCPUMetricName]->setIsAreaChartAllowed(true);
+    if (m_charts.contains(Metric_Type_CPU) && m_charts[Metric_Type_CPU])
+    {
+        m_charts[Metric_Type_CPU]->setIsPieChartAllowed(true);
+        m_charts[Metric_Type_CPU]->setIsAreaChartAllowed(true);
     }
 }
@@ -1479 +1479 @@
     ++m_iTimeStep;
 
-    if (m_metrics.contains(m_strRAMMetricName))
+    if (m_metrics.contains(Metric_Type_RAM))
     {
         quint64 iTotalRAM = 0;
@@ -1488 +1488 @@
 
     /* Update the CPU load chart with values we get from IMachineDebugger::getCPULoad(..): */
-    if (m_metrics.contains(m_strCPUMetricName))
+    if (m_metrics.contains(Metric_Type_CPU))
     {
         ULONG aPctExecuting;
@@ -1577 +1577 @@
         m_pTimer->stop();
     /* reset the metrics. this will delete their data cache: */
-    for (QMap<QString, UIMetric>::iterator iterator =  m_metrics.begin();
+    for (QMap<Metric_Type, UIMetric>::iterator iterator =  m_metrics.begin();
          iterator != m_metrics.end(); ++iterator)
         iterator.value().reset();
     /* force update on the charts to draw now emptied metrics' data: */
-    for (QMap<QString, UIChart*>::iterator iterator =  m_charts.begin();
+    for (QMap<Metric_Type, UIChart*>::iterator iterator =  m_charts.begin();
          iterator != m_charts.end(); ++iterator)
         iterator.value()->update();
@@ -1598 +1598 @@
     UIVMActivityMonitor::prepareWidgets();
 
-    QStringList chartOrder;
-    chartOrder << m_strCPUMetricName << m_strRAMMetricName <<
-        m_strNetworkMetricName << m_strDiskIOMetricName << m_strVMExitMetricName;
+    QVector<Metric_Type> chartOrder;
+    chartOrder << Metric_Type_CPU << Metric_Type_RAM <<
+        Metric_Type_Network_InOut << Metric_Type_Disk_InOut << Metric_Type_VM_Exits;
     int iRow = 0;
-    foreach (const QString &strMetricName, chartOrder)
-    {
-        if (!m_metrics.contains(strMetricName))
+    foreach (Metric_Type enmType, chartOrder)
+    {
+        if (!m_metrics.contains(enmType))
             continue;
 
@@ -1619 +1619 @@
         pLabel->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
         pChartLayout->addWidget(pLabel);
-        m_infoLabels.insert(strMetricName, pLabel);
-
-        UIChart *pChart = new UIChart(this, &(m_metrics[strMetricName]), m_iMaximumQueueSize);
+        m_infoLabels.insert(enmType, pLabel);
+
+        UIChart *pChart = new UIChart(this, &(m_metrics[enmType]), m_iMaximumQueueSize);
         connect(pChart, &UIChart::sigExportMetricsToFile,
                 this, &UIVMActivityMonitor::sltExportMetricsToFile);
         connect(pChart, &UIChart::sigDataIndexUnderCursor,
                 this, &UIVMActivityMonitor::sltChartDataIndexUnderCursorChanged);
-        m_charts.insert(strMetricName, pChart);
+        m_charts.insert(enmType, pChart);
         pChart->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
         pChartLayout->addWidget(pChart);
@@ -1661 +1661 @@
                     ramMetric.setDataSeriesName(1, "Used");
                     ramMetric.setRequiresGuestAdditions(true);
-                    m_metrics.insert(m_strRAMMetricName, ramMetric);
+                    m_metrics.insert(Metric_Type_RAM, ramMetric);
                 }
             }
@@ -1671 +1671 @@
     cpuMetric.setDataSeriesName(0, "Guest Load");
     cpuMetric.setDataSeriesName(1, "VMM Load");
-    m_metrics.insert(m_strCPUMetricName, cpuMetric);
+    m_metrics.insert(Metric_Type_CPU, cpuMetric);
 
     /* Network metric: */
@@ -1678 +1678 @@
     networkMetric.setDataSeriesName(1, "Transmit Rate");
     networkMetric.setAutoUpdateMaximum(true);
-    m_metrics.insert(m_strNetworkMetricName, networkMetric);
+    m_metrics.insert(Metric_Type_Network_InOut, networkMetric);
 
     /* Disk IO metric */
@@ -1685 +1685 @@
     diskIOMetric.setDataSeriesName(1, "Read Rate");
     diskIOMetric.setAutoUpdateMaximum(true);
-    m_metrics.insert(m_strDiskIOMetricName, diskIOMetric);
+    m_metrics.insert(Metric_Type_Disk_InOut, diskIOMetric);
 
     /* VM exits metric */
     UIMetric VMExitsMetric(m_strVMExitMetricName, "times", m_iMaximumQueueSize);
     VMExitsMetric.setAutoUpdateMaximum(true);
-    m_metrics.insert(m_strVMExitMetricName, VMExitsMetric);
+    m_metrics.insert(Metric_Type_VM_Exits, VMExitsMetric);
 }
 
@@ -1722 +1722 @@
 void UIVMActivityMonitorLocal::enableDisableGuestAdditionDependedWidgets(bool fEnable)
 {
-    for (QMap<QString, UIMetric>::const_iterator iterator =  m_metrics.begin();
+    for (QMap<Metric_Type, UIMetric>::const_iterator iterator =  m_metrics.begin();
          iterator != m_metrics.end(); ++iterator)
     {
@@ -1742 +1742 @@
         return;
 
-    UIMetric &VMExitMetric = m_metrics[m_strVMExitMetricName];
+    UIMetric &VMExitMetric = m_metrics[Metric_Type_VM_Exits];
     quint64 iRate = uTotalVMExits - VMExitMetric.total(0);
     VMExitMetric.setTotal(0, uTotalVMExits);
@@ -1752 +1752 @@
     }
     VMExitMetric.addData(0, iRate);
-    if (m_infoLabels.contains(m_strVMExitMetricName)  && m_infoLabels[m_strVMExitMetricName])
+    if (m_infoLabels.contains(Metric_Type_VM_Exits)  && m_infoLabels[Metric_Type_VM_Exits])
     {
         QString strInfo;
         strInfo = QString("<b>%1</b><br/><font color=\"%2\">%3: %4 %5</font><br/>%6: %7 %8")
             .arg(m_strVMExitInfoLabelTitle)
-            .arg(dataColorString(m_strCPUMetricName, 0)).arg(m_strVMExitLabelCurrent).arg(UITranslator::addMetricSuffixToNumber(iRate)).arg(VMExitMetric.unit())
+            .arg(dataColorString(Metric_Type_VM_Exits, 0)).arg(m_strVMExitLabelCurrent).arg(UITranslator::addMetricSuffixToNumber(iRate)).arg(VMExitMetric.unit())
             .arg(m_strVMExitLabelTotal).arg(UITranslator::addMetricSuffixToNumber(uTotalVMExits)).arg(VMExitMetric.unit());
-         m_infoLabels[m_strVMExitMetricName]->setText(strInfo);
-    }
-    if (m_charts.contains(m_strVMExitMetricName))
-        m_charts[m_strVMExitMetricName]->update();
+         m_infoLabels[Metric_Type_VM_Exits]->setText(strInfo);
+    }
+    if (m_charts.contains(Metric_Type_VM_Exits))
+        m_charts[Metric_Type_VM_Exits]->update();
 }
 
 void UIVMActivityMonitorLocal::updateCPUChart(quint64 iExecutingPercentage, ULONG iOtherPercentage)
 {
-    UIMetric &CPUMetric = m_metrics[m_strCPUMetricName];
+    UIMetric &CPUMetric = m_metrics[Metric_Type_CPU];
     CPUMetric.addData(0, iExecutingPercentage);
     CPUMetric.addData(1, iOtherPercentage);
     CPUMetric.setMaximum(100);
-    if (m_infoLabels.contains(m_strCPUMetricName)  && m_infoLabels[m_strCPUMetricName])
+    if (m_infoLabels.contains(Metric_Type_CPU)  && m_infoLabels[Metric_Type_CPU])
     {
         QString strInfo;
@@ -1777 +1777 @@
         strInfo = QString("<b>%1</b></b><br/><font color=\"%2\">%3: %4%5</font><br/><font color=\"%6\">%7: %8%9</font>")
             .arg(m_strCPUInfoLabelTitle)
-            .arg(dataColorString(m_strCPUMetricName, 0))
+            .arg(dataColorString(Metric_Type_CPU, 0))
             .arg(m_strCPUInfoLabelGuest).arg(QString::number(iExecutingPercentage)).arg(CPUMetric.unit())
-            .arg(dataColorString(m_strCPUMetricName, 1))
+            .arg(dataColorString(Metric_Type_CPU, 1))
             .arg(m_strCPUInfoLabelVMM).arg(QString::number(iOtherPercentage)).arg(CPUMetric.unit());
-        m_infoLabels[m_strCPUMetricName]->setText(strInfo);
-    }
-
-    if (m_charts.contains(m_strCPUMetricName))
-        m_charts[m_strCPUMetricName]->update();
+        m_infoLabels[Metric_Type_CPU]->setText(strInfo);
+    }
+
+    if (m_charts.contains(Metric_Type_CPU))
+        m_charts[Metric_Type_CPU]->update();
 }
 
 void UIVMActivityMonitorLocal::updateRAMGraphsAndMetric(quint64 iTotalRAM, quint64 iFreeRAM)
 {
-    UIMetric &RAMMetric = m_metrics[m_strRAMMetricName];
+    UIMetric &RAMMetric = m_metrics[Metric_Type_RAM];
     RAMMetric.setMaximum(iTotalRAM);
     RAMMetric.addData(0, iTotalRAM - iFreeRAM);
-    if (m_infoLabels.contains(m_strRAMMetricName)  && m_infoLabels[m_strRAMMetricName])
+    if (m_infoLabels.contains(Metric_Type_RAM)  && m_infoLabels[Metric_Type_RAM])
     {
         QString strInfo;
@@ -1799 +1799 @@
             .arg(m_strRAMInfoLabelTitle)
             .arg(m_strRAMInfoLabelTotal).arg(UITranslator::formatSize(_1K * iTotalRAM, g_iDecimalCount))
-            .arg(dataColorString(m_strCPUMetricName, 1)).arg(m_strRAMInfoLabelFree).arg(UITranslator::formatSize(_1K * (iFreeRAM), g_iDecimalCount))
-            .arg(dataColorString(m_strCPUMetricName, 0)).arg(m_strRAMInfoLabelUsed).arg(UITranslator::formatSize(_1K * (iTotalRAM - iFreeRAM), g_iDecimalCount));
-        m_infoLabels[m_strRAMMetricName]->setText(strInfo);
-    }
-    if (m_charts.contains(m_strRAMMetricName))
-        m_charts[m_strRAMMetricName]->update();
+            .arg(dataColorString(Metric_Type_RAM, 1)).arg(m_strRAMInfoLabelFree).arg(UITranslator::formatSize(_1K * (iFreeRAM), g_iDecimalCount))
+            .arg(dataColorString(Metric_Type_RAM, 0)).arg(m_strRAMInfoLabelUsed).arg(UITranslator::formatSize(_1K * (iTotalRAM - iFreeRAM), g_iDecimalCount));
+        m_infoLabels[Metric_Type_RAM]->setText(strInfo);
+    }
+    if (m_charts.contains(Metric_Type_RAM))
+        m_charts[Metric_Type_RAM]->update();
 }
 
 void UIVMActivityMonitorLocal::updateNetworkChart(quint64 uReceiveTotal, quint64 uTransmitTotal)
 {
-    UIMetric &NetMetric = m_metrics[m_strNetworkMetricName];
+    UIMetric &NetMetric = m_metrics[Metric_Type_Network_InOut];
 
     quint64 uReceiveRate = uReceiveTotal - NetMetric.total(0);
@@ -1826 +1826 @@
     NetMetric.addData(1, uTransmitRate);
 
-    if (m_infoLabels.contains(m_strNetworkMetricName)  && m_infoLabels[m_strNetworkMetricName])
+    if (m_infoLabels.contains(Metric_Type_Network_InOut)  && m_infoLabels[Metric_Type_Network_InOut])
     {
         QString strInfo;
         strInfo = QString("<b>%1</b></b><br/><font color=\"%2\">%3: %4<br/>%5 %6</font><br/><font color=\"%7\">%8: %9<br/>%10 %11</font>")
             .arg(m_strNetworkInfoLabelTitle)
-            .arg(dataColorString(m_strNetworkMetricName, 0)).arg(m_strNetworkInfoLabelReceived).arg(UITranslator::formatSize(uReceiveRate, g_iDecimalCount))
+            .arg(dataColorString(Metric_Type_Network_InOut, 0)).arg(m_strNetworkInfoLabelReceived).arg(UITranslator::formatSize(uReceiveRate, g_iDecimalCount))
             .arg(m_strNetworkInfoLabelReceivedTotal).arg(UITranslator::formatSize(uReceiveTotal, g_iDecimalCount))
-            .arg(dataColorString(m_strNetworkMetricName, 1)).arg(m_strNetworkInfoLabelTransmitted).arg(UITranslator::formatSize(uTransmitRate, g_iDecimalCount))
+            .arg(dataColorString(Metric_Type_Network_InOut, 1)).arg(m_strNetworkInfoLabelTransmitted).arg(UITranslator::formatSize(uTransmitRate, g_iDecimalCount))
             .arg(m_strNetworkInfoLabelTransmittedTotal).arg(UITranslator::formatSize(uTransmitTotal, g_iDecimalCount));
-        m_infoLabels[m_strNetworkMetricName]->setText(strInfo);
-    }
-    if (m_charts.contains(m_strNetworkMetricName))
-        m_charts[m_strNetworkMetricName]->update();
+        m_infoLabels[Metric_Type_Network_InOut]->setText(strInfo);
+    }
+    if (m_charts.contains(Metric_Type_Network_InOut))
+        m_charts[Metric_Type_Network_InOut]->update();
 }
 
 void UIVMActivityMonitorLocal::updateDiskIOChart(quint64 uDiskIOTotalWritten, quint64 uDiskIOTotalRead)
 {
-    UIMetric &diskMetric = m_metrics[m_strDiskIOMetricName];
+    UIMetric &diskMetric = m_metrics[Metric_Type_Disk_InOut];
 
     quint64 uWriteRate = uDiskIOTotalWritten - diskMetric.total(0);
@@ -1859 +1859 @@
     diskMetric.addData(1, uReadRate);
 
-    if (m_infoLabels.contains(m_strDiskIOMetricName)  && m_infoLabels[m_strDiskIOMetricName])
+    if (m_infoLabels.contains(Metric_Type_Disk_InOut)  && m_infoLabels[Metric_Type_Disk_InOut])
     {
         QString strInfo = QString("<b>%1</b></b><br/><font color=\"%2\">%3: %4<br/>%5 %6</font><br/><font color=\"%7\">%8: %9<br/>%10 %11</font>")
             .arg(m_strDiskIOInfoLabelTitle)
-            .arg(dataColorString(m_strDiskIOMetricName, 0)).arg(m_strDiskIOInfoLabelWritten).arg(UITranslator::formatSize(uWriteRate, g_iDecimalCount))
+            .arg(dataColorString(Metric_Type_Disk_InOut, 0)).arg(m_strDiskIOInfoLabelWritten).arg(UITranslator::formatSize(uWriteRate, g_iDecimalCount))
             .arg(m_strDiskIOInfoLabelWrittenTotal).arg(UITranslator::formatSize((quint64)uDiskIOTotalWritten, g_iDecimalCount))
-            .arg(dataColorString(m_strDiskIOMetricName, 1)).arg(m_strDiskIOInfoLabelRead).arg(UITranslator::formatSize(uReadRate, g_iDecimalCount))
+            .arg(dataColorString(Metric_Type_Disk_InOut, 1)).arg(m_strDiskIOInfoLabelRead).arg(UITranslator::formatSize(uReadRate, g_iDecimalCount))
             .arg(m_strDiskIOInfoLabelReadTotal).arg(UITranslator::formatSize((quint64)uDiskIOTotalRead, g_iDecimalCount));
-        m_infoLabels[m_strDiskIOMetricName]->setText(strInfo);
-    }
-    if (m_charts.contains(m_strDiskIOMetricName))
-        m_charts[m_strDiskIOMetricName]->update();
+        m_infoLabels[Metric_Type_Disk_InOut]->setText(strInfo);
+    }
+    if (m_charts.contains(Metric_Type_Disk_InOut))
+        m_charts[Metric_Type_Disk_InOut]->update();
 }
 
 void UIVMActivityMonitorLocal::resetVMExitInfoLabel()
 {
-    if (m_infoLabels.contains(m_strVMExitMetricName)  && m_infoLabels[m_strVMExitMetricName])
+    if (m_infoLabels.contains(Metric_Type_VM_Exits)  && m_infoLabels[Metric_Type_VM_Exits])
     {
         QString strInfo;
@@ -1883 +1883 @@
             .arg(m_strVMExitLabelTotal).arg("--");
 
-        m_infoLabels[m_strVMExitMetricName]->setText(strInfo);
+        m_infoLabels[Metric_Type_VM_Exits]->setText(strInfo);
     }
 }
@@ -1889 +1889 @@
 void UIVMActivityMonitorLocal::resetCPUInfoLabel()
 {
-    if (m_infoLabels.contains(m_strCPUMetricName)  && m_infoLabels[m_strCPUMetricName])
+    if (m_infoLabels.contains(Metric_Type_CPU)  && m_infoLabels[Metric_Type_CPU])
     {
         QString strInfo =QString("<b>%1</b></b><br/>%2: %3<br/>%4: %5")
@@ -1895 +1895 @@
             .arg(m_strCPUInfoLabelGuest).arg("--")
             .arg(m_strCPUInfoLabelVMM).arg("--");
-        m_infoLabels[m_strCPUMetricName]->setText(strInfo);
+        m_infoLabels[Metric_Type_CPU]->setText(strInfo);
     }
 }
@@ -1901 +1901 @@
 void UIVMActivityMonitorLocal::resetNetworkInfoLabel()
 {
-    if (m_infoLabels.contains(m_strNetworkMetricName)  && m_infoLabels[m_strNetworkMetricName])
+    if (m_infoLabels.contains(Metric_Type_Network_InOut)  && m_infoLabels[Metric_Type_Network_InOut])
     {
         QString strInfo = QString("<b>%1</b></b><br/>%2: %3<br/>%4 %5<br/>%6: %7<br/>%8 %9")
@@ -1909 +1909 @@
             .arg(m_strNetworkInfoLabelTransmitted).arg("--")
             .arg(m_strNetworkInfoLabelTransmittedTotal).arg("--");
-        m_infoLabels[m_strNetworkMetricName]->setText(strInfo);
+        m_infoLabels[Metric_Type_Network_InOut]->setText(strInfo);
     }
 }
@@ -1915 +1915 @@
 void UIVMActivityMonitorLocal::resetDiskIOInfoLabel()
 {
-    if (m_infoLabels.contains(m_strDiskIOMetricName)  && m_infoLabels[m_strDiskIOMetricName])
+    if (m_infoLabels.contains(Metric_Type_Disk_InOut)  && m_infoLabels[Metric_Type_Disk_InOut])
     {
         QString strInfo = QString("<b>%1</b></b><br/>%2: %3<br/>%4 %5<br/>%6: %7<br/>%8 %9")
@@ -1923 +1923 @@
             .arg(m_strDiskIOInfoLabelRead).arg("--")
             .arg(m_strDiskIOInfoLabelReadTotal).arg("--");
-        m_infoLabels[m_strDiskIOMetricName]->setText(strInfo);
+        m_infoLabels[Metric_Type_Disk_InOut]->setText(strInfo);
     }
 }
@@ -1940 +1940 @@
     , m_enmMachineState(KCloudMachineState_Invalid)
 {
-    m_metricTypeNames[KMetricType_CpuUtilization] = m_strCPUMetricName;
-    m_metricTypeNames[KMetricType_MemoryUtilization] = m_strRAMMetricName;
-    m_metricTypeNames[KMetricType_DiskBytesRead] = m_strDiskIOReadMetricName;
-    m_metricTypeNames[KMetricType_DiskBytesWritten] = m_strDiskIOWrittenMetricName;
-    m_metricTypeNames[KMetricType_NetworksBytesIn] = m_strNetworkInMetricName;
-    m_metricTypeNames[KMetricType_NetworksBytesOut] = m_strNetworkOutMetricName;
+    m_metricTypeDict[KMetricType_CpuUtilization]    = Metric_Type_CPU;
+    m_metricTypeDict[KMetricType_MemoryUtilization] = Metric_Type_RAM;
+    m_metricTypeDict[KMetricType_DiskBytesRead]     = Metric_Type_Disk_Out;
+    m_metricTypeDict[KMetricType_DiskBytesWritten]  = Metric_Type_Disk_In;
+    m_metricTypeDict[KMetricType_NetworksBytesIn]   = Metric_Type_Network_In;
+    m_metricTypeDict[KMetricType_NetworksBytesOut]  = Metric_Type_Network_Out;
 
     setMachine(machine);
@@ -2109 +2109 @@
 
     if (enmMetricType == KMetricType_NetworksBytesIn)
-        m_metrics[m_strNetworkInMetricName].reset();
+        m_metrics[Metric_Type_Network_In].reset();
     else if (enmMetricType == KMetricType_NetworksBytesOut)
-        m_metrics[m_strNetworkOutMetricName].reset();
+        m_metrics[Metric_Type_Network_Out].reset();
     else if (enmMetricType == KMetricType_DiskBytesRead)
-        m_metrics[m_strDiskIOReadMetricName].reset();
+        m_metrics[Metric_Type_Disk_Out].reset();
     else if (enmMetricType == KMetricType_DiskBytesWritten)
-        m_metrics[m_strDiskIOWrittenMetricName].reset();
+        m_metrics[Metric_Type_Disk_In].reset();
     else if (enmMetricType == KMetricType_CpuUtilization)
-        m_metrics[m_strCPUMetricName].reset();
+        m_metrics[Metric_Type_CPU].reset();
     else if (enmMetricType == KMetricType_MemoryUtilization)
-        m_metrics[m_strRAMMetricName].reset();
+        m_metrics[Metric_Type_RAM].reset();
 
 
@@ -2125 +2125 @@
     {
         if (enmMetricType == KMetricType_CpuUtilization)
-        {
             updateCPUChart(newData[i], newTimeStamps[i]);
-        }
         else if (enmMetricType == KMetricType_NetworksBytesOut)
             updateNetworkOutChart(newData[i], newTimeStamps[i]);
@@ -2223 +2221 @@
         m_pTimer->stop();
     /* reset the metrics. this will delete their data cache: */
-    for (QMap<QString, UIMetric>::iterator iterator =  m_metrics.begin();
+    for (QMap<Metric_Type, UIMetric>::iterator iterator =  m_metrics.begin();
          iterator != m_metrics.end(); ++iterator)
         iterator.value().reset();
     /* force update on the charts to draw now emptied metrics' data: */
-    for (QMap<QString, UIChart*>::iterator iterator =  m_charts.begin();
+    for (QMap<Metric_Type, UIChart*>::iterator iterator =  m_charts.begin();
          iterator != m_charts.end(); ++iterator)
         iterator.value()->update();
@@ -2251 +2249 @@
 void UIVMActivityMonitorCloud::updateCPUChart(quint64 iLoadPercentage, const QString &strLabel)
 {
-    UIMetric &CPUMetric = m_metrics[m_strCPUMetricName];
+    UIMetric &CPUMetric = m_metrics[Metric_Type_CPU];
     CPUMetric.addData(0, iLoadPercentage, strLabel);
     CPUMetric.setMaximum(100);
-    if (m_infoLabels.contains(m_strCPUMetricName)  && m_infoLabels[m_strCPUMetricName])
+    if (m_infoLabels.contains(Metric_Type_CPU)  && m_infoLabels[Metric_Type_CPU])
     {
         QString strInfo;
@@ -2260 +2258 @@
         strInfo = QString("<b>%1</b></b><br/><font color=\"%2\">%3: %4%5</font>")
             .arg(m_strCPUInfoLabelTitle)
-            .arg(dataColorString(m_strCPUMetricName, 0))
+            .arg(dataColorString(Metric_Type_CPU, 0))
             .arg(m_strCPUInfoLabelGuest).arg(QString::number(iLoadPercentage)).arg(CPUMetric.unit());
 
-        m_infoLabels[m_strCPUMetricName]->setText(strInfo);
-    }
-
-    if (m_charts.contains(m_strCPUMetricName))
-        m_charts[m_strCPUMetricName]->update();
+        m_infoLabels[Metric_Type_CPU]->setText(strInfo);
+    }
+
+    if (m_charts.contains(Metric_Type_CPU))
+        m_charts[Metric_Type_CPU]->update();
 }
 
 void UIVMActivityMonitorCloud::updateNetworkInChart(quint64 uReceiveRate, const QString &strLabel)
 {
-    UIMetric &networkMetric = m_metrics[m_strNetworkInMetricName];
+    UIMetric &networkMetric = m_metrics[Metric_Type_Network_In];
     networkMetric.addData(0, uReceiveRate, strLabel);
 
 
-    if (m_infoLabels.contains(m_strNetworkInMetricName)  && m_infoLabels[m_strNetworkInMetricName])
+    if (m_infoLabels.contains(Metric_Type_Network_In)  && m_infoLabels[Metric_Type_Network_In])
     {
         QString strInfo;
         strInfo = QString("<b>%1</b></b><br/><font color=\"%2\">%3: %4</font><br/>")
             .arg(m_strNetworkInInfoLabelTitle)
-            .arg(dataColorString(m_strNetworkInMetricName, 0)).arg(m_strNetworkInfoLabelReceived).arg(UITranslator::formatSize(uReceiveRate, g_iDecimalCount));
-
-        m_infoLabels[m_strNetworkInMetricName]->setText(strInfo);
-    }
-    if (m_charts.contains(m_strNetworkInMetricName))
-        m_charts[m_strNetworkInMetricName]->update();
+            .arg(dataColorString(Metric_Type_Network_In, 0)).arg(m_strNetworkInfoLabelReceived).arg(UITranslator::formatSize(uReceiveRate, g_iDecimalCount));
+
+        m_infoLabels[Metric_Type_Network_In]->setText(strInfo);
+    }
+    if (m_charts.contains(Metric_Type_Network_In))
+        m_charts[Metric_Type_Network_In]->update();
 }
 
 void UIVMActivityMonitorCloud::updateNetworkOutChart(quint64 uTransmitRate, const QString &strLabel)
 {
-    UIMetric &networkMetric = m_metrics[m_strNetworkOutMetricName];
+    UIMetric &networkMetric = m_metrics[Metric_Type_Network_Out];
     networkMetric.addData(0, uTransmitRate, strLabel);
 
-    if (m_infoLabels.contains(m_strNetworkOutMetricName)  && m_infoLabels[m_strNetworkOutMetricName])
+    if (m_infoLabels.contains(Metric_Type_Network_Out)  && m_infoLabels[Metric_Type_Network_Out])
     {
         QString strInfo;
         strInfo = QString("<b>%1</b></b><br/><font color=\"%5\">%6: %7<br/></font>")
             .arg(m_strNetworkOutInfoLabelTitle)
-            .arg(dataColorString(m_strNetworkOutMetricName, 1)).arg(m_strNetworkInfoLabelTransmitted).arg(UITranslator::formatSize(uTransmitRate, g_iDecimalCount));
-
-        m_infoLabels[m_strNetworkOutMetricName]->setText(strInfo);
-    }
-    if (m_charts.contains(m_strNetworkOutMetricName))
-        m_charts[m_strNetworkOutMetricName]->update();
+            .arg(dataColorString(Metric_Type_Network_Out, 0)).arg(m_strNetworkInfoLabelTransmitted).arg(UITranslator::formatSize(uTransmitRate, g_iDecimalCount));
+
+        m_infoLabels[Metric_Type_Network_Out]->setText(strInfo);
+    }
+    if (m_charts.contains(Metric_Type_Network_Out))
+        m_charts[Metric_Type_Network_Out]->update();
 }
 
 void UIVMActivityMonitorCloud::updateDiskIOWrittenChart(quint64 uWriteRate, const QString &strLabel)
 {
-    UIMetric &diskMetric = m_metrics[m_strDiskIOWrittenMetricName];
+    UIMetric &diskMetric = m_metrics[Metric_Type_Disk_In];
 
     diskMetric.addData(0, uWriteRate, strLabel);
 
 
-    if (m_infoLabels.contains(m_strDiskIOWrittenMetricName)  && m_infoLabels[m_strDiskIOWrittenMetricName])
+    if (m_infoLabels.contains(Metric_Type_Disk_In)  && m_infoLabels[Metric_Type_Disk_In])
     {
         QString strInfo = QString("<b>%1</b></b><br/> <font color=\"%2\">%3: %4</font>")
             .arg(m_strDiskIOInfoLabelTitle)
-            .arg(dataColorString(m_strDiskIOWrittenMetricName, 0)).arg(m_strDiskIOInfoLabelWritten).arg(UITranslator::formatSize(uWriteRate, g_iDecimalCount));
-
-        m_infoLabels[m_strDiskIOWrittenMetricName]->setText(strInfo);
-    }
-
-    if (m_charts.contains(m_strDiskIOWrittenMetricName))
-        m_charts[m_strDiskIOWrittenMetricName]->update();
+            .arg(dataColorString(Metric_Type_Disk_In, 0)).arg(m_strDiskIOInfoLabelWritten).arg(UITranslator::formatSize(uWriteRate, g_iDecimalCount));
+
+        m_infoLabels[Metric_Type_Disk_In]->setText(strInfo);
+    }
+
+    if (m_charts.contains(Metric_Type_Disk_In))
+        m_charts[Metric_Type_Disk_In]->update();
 }
 
 void UIVMActivityMonitorCloud::updateDiskIOReadChart(quint64 uReadRate, const QString &strLabel)
 {
-    UIMetric &diskMetric = m_metrics[m_strDiskIOReadMetricName];
+    UIMetric &diskMetric = m_metrics[Metric_Type_Disk_Out];
 
     diskMetric.addData(0, uReadRate, strLabel);
 
 
-    if (m_infoLabels.contains(m_strDiskIOReadMetricName)  && m_infoLabels[m_strDiskIOReadMetricName])
+    if (m_infoLabels.contains(Metric_Type_Disk_Out)  && m_infoLabels[Metric_Type_Disk_Out])
     {
         QString strInfo = QString("<b>%1</b></b><br/> <font color=\"%2\">%3: %4</font>")
             .arg(m_strDiskIOInfoLabelTitle)
-            .arg(dataColorString(m_strDiskIOReadMetricName, 1)).arg(m_strDiskIOInfoLabelRead).arg(UITranslator::formatSize(uReadRate, g_iDecimalCount));
-
-        m_infoLabels[m_strDiskIOReadMetricName]->setText(strInfo);
-    }
-
-    if (m_charts.contains(m_strDiskIOReadMetricName))
-        m_charts[m_strDiskIOReadMetricName]->update();
+            .arg(dataColorString(Metric_Type_Disk_Out, 0)).arg(m_strDiskIOInfoLabelRead).arg(UITranslator::formatSize(uReadRate, g_iDecimalCount));
+
+        m_infoLabels[Metric_Type_Disk_Out]->setText(strInfo);
+    }
+
+    if (m_charts.contains(Metric_Type_Disk_Out))
+        m_charts[Metric_Type_Disk_Out]->update();
 }
 
@@ -2350 +2348 @@
 void UIVMActivityMonitorCloud::updateRAMChart(quint64 iUsedRAM, const QString &strLabel)
 {
-    UIMetric &RAMMetric = m_metrics[m_strRAMMetricName];
+    UIMetric &RAMMetric = m_metrics[Metric_Type_RAM];
     RAMMetric.setMaximum(m_iTotalRAM);
     RAMMetric.addData(0, iUsedRAM, strLabel);
 
-    if (m_infoLabels.contains(m_strRAMMetricName)  && m_infoLabels[m_strRAMMetricName])
+    if (m_infoLabels.contains(Metric_Type_RAM)  && m_infoLabels[Metric_Type_RAM])
     {
         QString strInfo;
@@ -2360 +2358 @@
             .arg(m_strRAMInfoLabelTitle)
             .arg(m_strRAMInfoLabelTotal).arg(UITranslator::formatSize(_1K * m_iTotalRAM, g_iDecimalCount))
-            .arg(dataColorString(m_strCPUMetricName, 1)).arg(m_strRAMInfoLabelFree).arg(UITranslator::formatSize(_1K * (m_iTotalRAM - iUsedRAM), g_iDecimalCount))
-            .arg(dataColorString(m_strCPUMetricName, 0)).arg(m_strRAMInfoLabelUsed).arg(UITranslator::formatSize(_1K * iUsedRAM, g_iDecimalCount));
-        m_infoLabels[m_strRAMMetricName]->setText(strInfo);
-    }
-
-    if (m_charts.contains(m_strRAMMetricName))
-        m_charts[m_strRAMMetricName]->update();
+            .arg(dataColorString(Metric_Type_RAM, 1)).arg(m_strRAMInfoLabelFree).arg(UITranslator::formatSize(_1K * (m_iTotalRAM - iUsedRAM), g_iDecimalCount))
+            .arg(dataColorString(Metric_Type_RAM, 0)).arg(m_strRAMInfoLabelUsed).arg(UITranslator::formatSize(_1K * iUsedRAM, g_iDecimalCount));
+        m_infoLabels[Metric_Type_RAM]->setText(strInfo);
+    }
+
+    if (m_charts.contains(Metric_Type_RAM))
+        m_charts[Metric_Type_RAM]->update();
 }
 
 bool UIVMActivityMonitorCloud::findMetric(KMetricType enmMetricType, UIMetric &metric, int &iDataSeriesIndex) const
 {
-    if (m_metricTypeNames[enmMetricType].isEmpty())
+    if (!m_metricTypeDict.contains(enmMetricType))
         return false;
 
-    const QString &strMetricName = m_metricTypeNames[enmMetricType];
-
-    if (!m_metrics.contains(strMetricName))
+    Metric_Type enmType = m_metricTypeDict[enmMetricType];
+
+    if (!m_metrics.contains(enmType))
         return false;
 
-    metric = m_metrics[strMetricName];
+    metric = m_metrics[enmType];
     iDataSeriesIndex = 0;
     if (enmMetricType == KMetricType_NetworksBytesOut ||
@@ -2394 +2392 @@
         UIMetric ramMetric(m_strRAMMetricName, "kb", m_iMaximumQueueSize);
         ramMetric.setDataSeriesName(0, "Used");
-        m_metrics.insert(m_strRAMMetricName, ramMetric);
+        m_metrics.insert(Metric_Type_RAM, ramMetric);
     }
 
@@ -2400 +2398 @@
     UIMetric cpuMetric(m_strCPUMetricName, "%", m_iMaximumQueueSize);
     cpuMetric.setDataSeriesName(0, "CPU Utilization");
-    m_metrics.insert(m_strCPUMetricName, cpuMetric);
+    m_metrics.insert(Metric_Type_CPU, cpuMetric);
 
     /* Network in metric: */
@@ -2406 +2404 @@
     networkInMetric.setDataSeriesName(0, "Receive Rate");
     networkInMetric.setAutoUpdateMaximum(true);
-    m_metrics.insert(m_strNetworkInMetricName, networkInMetric);
+    m_metrics.insert(Metric_Type_Network_In, networkInMetric);
 
     /* Network out metric: */
-    UIMetric networkOutMetric(m_strNetworkInMetricName, "B", m_iMaximumQueueSize);
+    UIMetric networkOutMetric(m_strNetworkOutMetricName, "B", m_iMaximumQueueSize);
     networkOutMetric.setDataSeriesName(0, "Transmit Rate");
     networkOutMetric.setAutoUpdateMaximum(true);
-    m_metrics.insert(m_strNetworkOutMetricName, networkOutMetric);
+    m_metrics.insert(Metric_Type_Network_Out, networkOutMetric);
 
     /* Disk write metric */
@@ -2418 +2416 @@
     diskIOWrittenMetric.setDataSeriesName(0, "Write Rate");
     diskIOWrittenMetric.setAutoUpdateMaximum(true);
-    m_metrics.insert(m_strDiskIOWrittenMetricName, diskIOWrittenMetric);
+    m_metrics.insert(Metric_Type_Disk_In, diskIOWrittenMetric);
 
     /* Disk read metric */
@@ -2424 +2422 @@
     diskIOReadMetric.setDataSeriesName(0, "Read Rate");
     diskIOReadMetric.setAutoUpdateMaximum(true);
-    m_metrics.insert(m_strDiskIOReadMetricName, diskIOReadMetric);
+    m_metrics.insert(Metric_Type_Disk_Out, diskIOReadMetric);
 
 }
@@ -2432 +2430 @@
     UIVMActivityMonitor::prepareWidgets();
 
-    QStringList chartOrder;
-    chartOrder << m_strCPUMetricName << m_strRAMMetricName <<
-        m_strNetworkInMetricName << m_strNetworkOutMetricName << m_strDiskIOWrittenMetricName << m_strDiskIOReadMetricName;
+    QVector<Metric_Type> chartOrder;
+    chartOrder << Metric_Type_CPU << Metric_Type_RAM <<
+        Metric_Type_Network_In << Metric_Type_Network_Out << Metric_Type_Disk_In << Metric_Type_Disk_Out;
     int iRow = 0;
-    foreach (const QString &strMetricName, chartOrder)
-    {
-        if (!m_metrics.contains(strMetricName))
+    foreach (Metric_Type enmType, chartOrder)
+    {
+        if (!m_metrics.contains(enmType))
             continue;
 
@@ -2453 +2451 @@
         pLabel->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
         pChartLayout->addWidget(pLabel);
-        m_infoLabels.insert(strMetricName, pLabel);
-
-        UIChart *pChart = new UIChart(this, &(m_metrics[strMetricName]), m_iMaximumQueueSize);
+        m_infoLabels.insert(enmType, pLabel);
+
+        UIChart *pChart = new UIChart(this, &(m_metrics[enmType]), m_iMaximumQueueSize);
         connect(pChart, &UIChart::sigExportMetricsToFile,
                 this, &UIVMActivityMonitor::sltExportMetricsToFile);
         connect(pChart, &UIChart::sigDataIndexUnderCursor,
                 this, &UIVMActivityMonitor::sltChartDataIndexUnderCursorChanged);
-        m_charts.insert(strMetricName, pChart);
+        m_charts.insert(enmType, pChart);
         pChart->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
         pChartLayout->addWidget(pChart);
@@ -2471 +2469 @@
     bottomSpacerWidget->setVisible(true);
     m_pContainerLayout->addWidget(bottomSpacerWidget, iRow, 0, 1, 2);
-    m_charts[m_strCPUMetricName]->setShowPieChart(false);
+    m_charts[Metric_Type_CPU]->setShowPieChart(false);
 }
 
 void UIVMActivityMonitorCloud::resetCPUInfoLabel()
 {
-    if (m_infoLabels.contains(m_strCPUMetricName)  && m_infoLabels[m_strCPUMetricName])
+    if (m_infoLabels.contains(Metric_Type_CPU)  && m_infoLabels[Metric_Type_CPU])
     {
         QString strInfo;
@@ -2484 +2482 @@
             .arg(m_strCPUInfoLabelGuest).arg("---");
 
-        m_infoLabels[m_strCPUMetricName]->setText(strInfo);
+        m_infoLabels[Metric_Type_CPU]->setText(strInfo);
     }
 }
@@ -2490 +2488 @@
 void UIVMActivityMonitorCloud::resetNetworkInInfoLabel()
 {
-    if (m_infoLabels.contains(m_strNetworkInMetricName)  && m_infoLabels[m_strNetworkInMetricName])
+    if (m_infoLabels.contains(Metric_Type_Network_In)  && m_infoLabels[Metric_Type_Network_In])
     {
         QString strInfo = QString("<b>%1</b></b><br/>%2: %3")
@@ -2496 +2494 @@
             .arg(m_strNetworkInfoLabelReceived).arg("--");
 
-        m_infoLabels[m_strNetworkInMetricName]->setText(strInfo);
+        m_infoLabels[Metric_Type_Network_In]->setText(strInfo);
     }
 }
@@ -2502 +2500 @@
 void UIVMActivityMonitorCloud::resetNetworkOutInfoLabel()
 {
-    if (m_infoLabels.contains(m_strNetworkOutMetricName)  && m_infoLabels[m_strNetworkOutMetricName])
+    if (m_infoLabels.contains(Metric_Type_Network_Out)  && m_infoLabels[Metric_Type_Network_Out])
     {
         QString strInfo = QString("<b>%1</b></b><br/>%2: %3")
@@ -2508 +2506 @@
             .arg(m_strNetworkInfoLabelTransmitted).arg("--");
 
-        m_infoLabels[m_strNetworkOutMetricName]->setText(strInfo);
+        m_infoLabels[Metric_Type_Network_Out]->setText(strInfo);
     }
 }
@@ -2514 +2512 @@
 void UIVMActivityMonitorCloud::resetDiskIOWrittenInfoLabel()
 {
-    if (m_infoLabels.contains(m_strDiskIOWrittenMetricName)  && m_infoLabels[m_strDiskIOWrittenMetricName])
+    if (m_infoLabels.contains(Metric_Type_Disk_In)  && m_infoLabels[Metric_Type_Disk_In])
     {
         QString strInfo = QString("<b>%1</b></b><br/>%2: %3")
             .arg(m_strDiskIOInfoLabelTitle)
             .arg(m_strDiskIOInfoLabelWritten).arg("--");
-        m_infoLabels[m_strDiskIOWrittenMetricName]->setText(strInfo);
+        m_infoLabels[Metric_Type_Disk_In]->setText(strInfo);
     }
 }
@@ -2525 +2523 @@
 void UIVMActivityMonitorCloud::resetDiskIOReadInfoLabel()
 {
-    if (m_infoLabels.contains(m_strDiskIOReadMetricName)  && m_infoLabels[m_strDiskIOReadMetricName])
+    if (m_infoLabels.contains(Metric_Type_Disk_Out)  && m_infoLabels[Metric_Type_Disk_Out])
     {
         QString strInfo = QString("<b>%1</b></b><br/>%2: %3")
             .arg(m_strDiskIOInfoLabelTitle)
             .arg(m_strDiskIOInfoLabelRead).arg("--");
-        m_infoLabels[m_strDiskIOReadMetricName]->setText(strInfo);
+        m_infoLabels[Metric_Type_Disk_Out]->setText(strInfo);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/activity/vmactivity/UIVMActivityMonitor.h

@@ -65 +65 @@
 #define DATA_SERIES_SIZE 2
 
-struct UIMetricData
-{
-    quint64 m_value;
-    QString m_strLabel;
+enum Metric_Type
+{
+    Metric_Type_CPU = 0,
+    Metric_Type_RAM,
+    Metric_Type_Disk_InOut,
+    Metric_Type_Disk_In,
+    Metric_Type_Disk_Out,
+    Metric_Type_Network_InOut,
+    Metric_Type_Network_In,
+    Metric_Type_Network_Out,
+    Metric_Type_VM_Exits,
+    Metric_Type_Max
 };
 
@@ -168 +176 @@
     virtual void start() = 0;
 
-    /** Returns a QColor for the chart with @p strChartName and data series with @p iDataIndex. */
-    QString dataColorString(const QString &strChartName, int iDataIndex);
+    QString dataColorString(Metric_Type enmType, int iDataIndex);
 
     /** @name The following functions reset corresponding info labels
@@ -183 +190 @@
     QTimer                 *m_pTimer;
     quint64                 m_iTimeStep;
-    QMap<QString, UIMetric> m_metrics;
+    QMap<Metric_Type, UIMetric> m_metrics;
 
     /** @name These metric names are used for map keys to identify metrics. They are not translated.
@@ -196 +203 @@
         QVector<CUnknown> m_objectList;
     /** @} */
-    QMap<QString,UIChart*>  m_charts;
-    /** Stores the QLabel instances which we show next to each UIChart. The value is the name of the metric. */
-    QMap<QString,QLabel*>   m_infoLabels;
+    QMap<Metric_Type, UIChart*>  m_charts;
+    QMap<Metric_Type, QLabel*>   m_infoLabels;
 
     /** @name Cached translated strings.
@@ -370 +376 @@
 
     QVector<KMetricType> m_availableMetricTypes;
-    /** Mapping from API enums to internal metric names. Necessary also since we don't hace a 1-to-1 mapping. */
-    QHash<KMetricType, QString> m_metricTypeNames;
+    /** Mapping from API enums to internal metric type enum. */
+    QHash<KMetricType, Metric_Type> m_metricTypeDict;
 
     /** Total amount of RAM in kb. */