Index: /trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp (revision 83599) +++ /trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.cpp (revision 83600) @@ -178,5 +178,5 @@ UIVMResourceMonitorTableView(QWidget *pParent = 0); - void setMinimumColumnWidths(const QVector& widths); + void setMinimumColumnWidths(const QMap& widths); void updateColumVisibility(); @@ -192,5 +192,6 @@ void resizeHeader(); - QVector m_minimumColumnWidths; + /** Value is in pixels. Columns cannot be narrower than this width. */ + QMap m_minimumColumnWidths; }; @@ -231,9 +232,12 @@ CMachineDebugger m_comDebugger; - mutable CGuest m_comGuest; + mutable CGuest m_comGuest; + /** The strings of each column for the item. We update this during performance query + * instead of model's data function to know the string length earlier. */ + QMap m_columnData; + private: void setupPerformanceCollector(); - }; @@ -303,8 +307,9 @@ QVariant data(const QModelIndex &index, int role) const /* override */; QVariant headerData(int section, Qt::Orientation orientation, int role) const; - void setColumnCaptions(const QVector& captions); + void setColumnCaptions(const QMap& captions); void setColumnVisible(const QMap& columnVisible); bool columnVisible(int iColumnId) const; void setShouldUpdate(bool fShouldUpdate); + const QMap dataLengths() const; private slots: @@ -315,4 +320,5 @@ private: + void initialize(); void initializeItems(); void setupPerformanceCollector(); @@ -325,5 +331,5 @@ /* Used to find machines by uid. key is the machine uid and int is the index to m_itemList */ QMap m_itemMap; - QVector m_columnCaptions; + QMap m_columnCaptions; QTimer *m_pTimer; /** @name The following are used during UIPerformanceCollector::QueryMetricsData(..) @@ -338,4 +344,6 @@ bool m_fShouldUpdate; UIVMResourceMonitorHostStats m_hostStats; + /** Maximum length of string length of data displayed in column. Updated in UIResourceMonitorModel::data(..). */ + mutable QMap m_columnDataMaxLength; }; @@ -667,11 +675,11 @@ UIVMResourceMonitorTableView::UIVMResourceMonitorTableView(QWidget *pParent /* = 0 */) :QTableView(pParent) - , m_minimumColumnWidths(QVector((int)VMResourceMonitorColumn_Max, 0)) -{ -} - -void UIVMResourceMonitorTableView::setMinimumColumnWidths(const QVector& widths) +{ +} + +void UIVMResourceMonitorTableView::setMinimumColumnWidths(const QMap& widths) { m_minimumColumnWidths = widths; + resizeHeader(); } @@ -710,9 +718,10 @@ int iHiddenSectionCount = pHeader->hiddenSectionCount(); int iWidth = width() / (iSectionCount - iHiddenSectionCount); - for (int i = 0; i < iSectionCount && i < m_minimumColumnWidths.size(); ++i) + for (int i = 0; i < iSectionCount; ++i) { if (pHeader->isSectionHidden(i)) continue; - pHeader->resizeSection(i, iWidth < m_minimumColumnWidths[i] ? m_minimumColumnWidths[i] : iWidth); + int iMinWidth = m_minimumColumnWidths.value((VMResourceMonitorColumn)i, 0); + pHeader->resizeSection(i, iWidth < iMinWidth ? iMinWidth : iWidth); } } @@ -885,4 +894,12 @@ , m_fShouldUpdate(true) { + initialize(); +} + +void UIResourceMonitorModel::initialize() +{ + for (int i = 0; i < (int)VMResourceMonitorColumn_Max; ++i) + m_columnDataMaxLength[i] = 0; + initializeItems(); connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineStateChange, @@ -913,76 +930,24 @@ } +const QMap UIResourceMonitorModel::dataLengths() const +{ + return m_columnDataMaxLength; +} + QVariant UIResourceMonitorModel::data(const QModelIndex &index, int role) const { - int iDecimalCount = 2; if (!index.isValid() || role != Qt::DisplayRole || index.row() >= rowCount()) return QVariant(); - - switch (index.column()) - { - case VMResourceMonitorColumn_Name: - return m_itemList[index.row()].m_strVMName; - break; - case VMResourceMonitorColumn_CPUGuestLoad: - return QString("%1%").arg(QString::number(m_itemList[index.row()].m_uCPUGuestLoad)); - break; - case VMResourceMonitorColumn_CPUVMMLoad: - return QString("%1%").arg(QString::number(m_itemList[index.row()].m_uCPUVMMLoad)); - break; - case VMResourceMonitorColumn_RAMUsedAndTotal: - if (m_itemList[index.row()].isWithGuestAdditions()) - return QString("%1/%2").arg(uiCommon().formatSize(_1K * m_itemList[index.row()].m_uUsedRAM, iDecimalCount)). - arg(uiCommon().formatSize(_1K * m_itemList[index.row()].m_uTotalRAM, iDecimalCount)); - else - return tr("N/A"); - break; - case VMResourceMonitorColumn_RAMUsedPercentage: - if (m_itemList[index.row()].isWithGuestAdditions()) - return QString("%1%").arg(QString::number(m_itemList[index.row()].m_fRAMUsagePercentage, 'f', 2)); - else - return tr("N/A"); - break; - case VMResourceMonitorColumn_NetworkUpRate: - return QString("%1").arg(uiCommon().formatSize(m_itemList[index.row()].m_uNetworkUpRate, iDecimalCount)); - break; - case VMResourceMonitorColumn_NetworkDownRate: - return QString("%1").arg(uiCommon().formatSize(m_itemList[index.row()].m_uNetworkDownRate, iDecimalCount)); - break; - case VMResourceMonitorColumn_NetworkUpTotal: - return QString("%1").arg(uiCommon().formatSize(m_itemList[index.row()].m_uNetworkUpTotal, iDecimalCount)); - break; - case VMResourceMonitorColumn_NetworkDownTotal: - return QString("%1").arg(uiCommon().formatSize(m_itemList[index.row()].m_uNetworkDownTotal, iDecimalCount)); - break; - case VMResourceMonitorColumn_DiskIOReadRate: - return QString("%1").arg(uiCommon().formatSize(m_itemList[index.row()].m_uDiskReadRate, iDecimalCount)); - break; - case VMResourceMonitorColumn_DiskIOWriteRate: - return QString("%1").arg(uiCommon().formatSize(m_itemList[index.row()].m_uDiskWriteRate, iDecimalCount)); - break; - case VMResourceMonitorColumn_DiskIOReadTotal: - return QString("%1").arg(uiCommon().formatSize(m_itemList[index.row()].m_uDiskReadTotal, iDecimalCount)); - break; - case VMResourceMonitorColumn_DiskIOWriteTotal: - return QString("%1").arg(uiCommon().formatSize(m_itemList[index.row()].m_uDiskWriteTotal, iDecimalCount)); - break; - case VMResourceMonitorColumn_VMExits: - return QString("%1/%2").arg(UICommon::addMetricSuffixToNumber(m_itemList[index.row()].m_uVMExitRate)). - arg(UICommon::addMetricSuffixToNumber(m_itemList[index.row()].m_uVMExitTotal)); - break; - default: - break; - } + return m_itemList[index.row()].m_columnData[index.column()]; +} + +QVariant UIResourceMonitorModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + if (role == Qt::DisplayRole && orientation == Qt::Horizontal) + return m_columnCaptions.value((VMResourceMonitorColumn)section, QString());; return QVariant(); } -QVariant UIResourceMonitorModel::headerData(int section, Qt::Orientation orientation, int role) const -{ - if (role == Qt::DisplayRole && orientation == Qt::Horizontal && section < m_columnCaptions.size()) - return m_columnCaptions[section]; - return QVariant(); -} - -void UIResourceMonitorModel::setColumnCaptions(const QVector& captions) +void UIResourceMonitorModel::setColumnCaptions(const QMap& captions) { m_columnCaptions = captions; @@ -1098,4 +1063,61 @@ } } + } + int iDecimalCount = 2; + for (int i = 0; i < m_itemList.size(); ++i) + { + m_itemList[i].m_columnData[VMResourceMonitorColumn_Name] = m_itemList[i].m_strVMName; + m_itemList[i].m_columnData[VMResourceMonitorColumn_CPUGuestLoad] = + QString("%1%").arg(QString::number(m_itemList[i].m_uCPUGuestLoad)); + m_itemList[i].m_columnData[VMResourceMonitorColumn_CPUVMMLoad] = + QString("%1%").arg(QString::number(m_itemList[i].m_uCPUVMMLoad)); + + if (m_itemList[i].isWithGuestAdditions()) + m_itemList[i].m_columnData[VMResourceMonitorColumn_RAMUsedAndTotal] = + QString("%1/%2").arg(uiCommon().formatSize(_1K * m_itemList[i].m_uUsedRAM, iDecimalCount)). + arg(uiCommon().formatSize(_1K * m_itemList[i].m_uTotalRAM, iDecimalCount)); + else + m_itemList[i].m_columnData[VMResourceMonitorColumn_RAMUsedAndTotal] = tr("N/A"); + + if (m_itemList[i].isWithGuestAdditions()) + m_itemList[i].m_columnData[VMResourceMonitorColumn_RAMUsedPercentage] = + QString("%1%").arg(QString::number(m_itemList[i].m_fRAMUsagePercentage, 'f', 2)); + else + m_itemList[i].m_columnData[VMResourceMonitorColumn_RAMUsedPercentage] = tr("N/A"); + + m_itemList[i].m_columnData[VMResourceMonitorColumn_NetworkUpRate] = + QString("%1").arg(uiCommon().formatSize(m_itemList[i].m_uNetworkUpRate, iDecimalCount)); + + m_itemList[i].m_columnData[VMResourceMonitorColumn_NetworkDownRate] = + QString("%1").arg(uiCommon().formatSize(m_itemList[i].m_uNetworkDownRate, iDecimalCount)); + + m_itemList[i].m_columnData[VMResourceMonitorColumn_NetworkUpTotal] = + QString("%1").arg(uiCommon().formatSize(m_itemList[i].m_uNetworkUpTotal, iDecimalCount)); + + m_itemList[i].m_columnData[VMResourceMonitorColumn_NetworkDownTotal] = + QString("%1").arg(uiCommon().formatSize(m_itemList[i].m_uNetworkDownTotal, iDecimalCount)); + + m_itemList[i].m_columnData[VMResourceMonitorColumn_DiskIOReadRate] = + QString("%1").arg(uiCommon().formatSize(m_itemList[i].m_uDiskReadRate, iDecimalCount)); + + m_itemList[i].m_columnData[VMResourceMonitorColumn_DiskIOWriteRate] = + QString("%1").arg(uiCommon().formatSize(m_itemList[i].m_uDiskWriteRate, iDecimalCount)); + + m_itemList[i].m_columnData[VMResourceMonitorColumn_DiskIOReadTotal] = + QString("%1").arg(uiCommon().formatSize(m_itemList[i].m_uDiskReadTotal, iDecimalCount)); + + m_itemList[i].m_columnData[VMResourceMonitorColumn_DiskIOWriteTotal] = + QString("%1").arg(uiCommon().formatSize(m_itemList[i].m_uDiskWriteTotal, iDecimalCount)); + + m_itemList[i].m_columnData[VMResourceMonitorColumn_VMExits] = + QString("%1/%2").arg(UICommon::addMetricSuffixToNumber(m_itemList[i].m_uVMExitRate)). + arg(UICommon::addMetricSuffixToNumber(m_itemList[i].m_uVMExitTotal)); + } + + for (int i = 0; i < (int)VMResourceMonitorColumn_Max; ++i) + { + for (int j = 0; j < m_itemList.size(); ++j) + if (m_columnDataMaxLength.value(i, 0) < m_itemList[j].m_columnData[i]) + m_columnDataMaxLength[i] = m_itemList[j].m_columnData[i].length(); } emit sigDataUpdate(); @@ -1281,5 +1303,4 @@ void UIResourceMonitorWidget::retranslateUi() { - m_columnCaptions.resize(VMResourceMonitorColumn_Max); m_columnCaptions[VMResourceMonitorColumn_Name] = tr("VM Name"); m_columnCaptions[VMResourceMonitorColumn_CPUGuestLoad] = tr("CPU Guest"); @@ -1298,16 +1319,5 @@ if (m_pModel) m_pModel->setColumnCaptions(m_columnCaptions); - if (m_pTableView) - { - QFontMetrics fontMetrics(m_pTableView->font()); - QVector columnWidths; - foreach (const QString strCaption, m_columnCaptions) - { - columnWidths << fontMetrics.width(strCaption) + - QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin) + - QApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin); - } - m_pTableView->setMinimumColumnWidths(columnWidths); - } + computeMinimumColumnWidths(); } @@ -1404,6 +1414,7 @@ { UIVMResourceMonitorCheckBox* pCheckBox = new UIVMResourceMonitorCheckBox; - pCheckBox->setText(m_columnCaptions[i]); - iLength = m_columnCaptions[i].length() > iLength ? m_columnCaptions[i].length() : iLength; + QString strCaption = m_columnCaptions.value((VMResourceMonitorColumn)i, QString()); + pCheckBox->setText(strCaption); + iLength = strCaption.length() > iLength ? strCaption.length() : iLength; if (!pCheckBox) continue; @@ -1507,4 +1518,5 @@ void UIResourceMonitorWidget::sltHandleDataUpdate() { + computeMinimumColumnWidths(); if (m_pProxyModel) m_pProxyModel->dataUpdate(); @@ -1526,4 +1538,24 @@ if (m_pTableView) m_pTableView->updateColumVisibility(); +} + +void UIResourceMonitorWidget::computeMinimumColumnWidths() +{ + if (!m_pTableView || !m_pModel) + return; + QFontMetrics fontMetrics(m_pTableView->font()); + const QMap &columnDataStringLengths = m_pModel->dataLengths(); + + QMap columnWidthsInPixels; + for (int i = 0; i < (int)VMResourceMonitorColumn_Max; ++i) + { + int iColumnStringWidth = columnDataStringLengths.value(i, 0); + int iColumnTitleWidth = m_columnCaptions.value(i, QString()).length(); + int iMax = iColumnStringWidth > iColumnTitleWidth ? iColumnStringWidth : iColumnTitleWidth; + columnWidthsInPixels[i] = iMax * fontMetrics.width('x') + + QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin) + + QApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin); + } + m_pTableView->setMinimumColumnWidths(columnWidthsInPixels); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.h (revision 83599) +++ /trunk/src/VBox/Frontends/VirtualBox/src/monitor/resource/UIResourceMonitor.h (revision 83600) @@ -88,4 +88,5 @@ bool columnVisible(int iColumnId) const; void updateModelColumVisibilityCache(); + void computeMinimumColumnWidths(); /** @name Prepare/cleanup cascade. @@ -114,5 +115,6 @@ UIResourceMonitorProxyModel *m_pProxyModel; UIResourceMonitorModel *m_pModel; - QVector m_columnCaptions; + /* The key is the column id (VMResourceMonitorColumn) and value is column title. */ + QMap m_columnCaptions; /* The key is the column id (VMResourceMonitorColumn) and value is true if the column is visible. */ QMap m_columnVisible;