Changeset 104951 in vbox

Timestamp:

Jun 18, 2024 10:00:39 AM (3 months ago)

Author:

vboxsync

Message:

FE/Qt. bugref:10659. More fixes for local vm row.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview

Files:

• UIVMActivityOverviewModelView.cpp (modified) (7 diffs)
• UIVMActivityOverviewModelView.h (modified) (4 diffs)
• UIVMActivityOverviewWidget.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewModelView.cpp

@@ -29 +29 @@
 #include <QApplication>
 #include <QHeaderView>
+#include <QMouseEvent>
 #include <QTimer>
 
@@ -86 +87 @@
     quint64  m_uNetworkDownTotal;
     quint64  m_uNetworkUpTotal;
+
+    quint64          m_uVMExitTotal;
+    quint64          m_uDiskWriteTotal;
+    quint64          m_uDiskReadTotal;
+
 };
 
@@ -96 +102 @@
     , m_uNetworkDownTotal(0)
     , m_uNetworkUpTotal(0)
+    , m_uVMExitTotal(0)
+    , m_uDiskWriteTotal(0)
+    , m_uDiskReadTotal(0)
 {
     if (m_enmMachineState == KMachineState_Running)
@@ -150 +159 @@
     updateCellText(VMActivityOverviewColumn_NetworkUpTotal, QString("%1").arg(UITranslator::formatSize(m_uNetworkUpTotal, iDecimalCount)));
     updateCellText(VMActivityOverviewColumn_NetworkDownTotal, QString("%1").arg(UITranslator::formatSize(m_uNetworkDownTotal, iDecimalCount)));
+
+    /* IO rate: */
+    quint64 uPrevWriteTotal = m_uDiskWriteTotal;
+    quint64 uPrevReadTotal = m_uDiskReadTotal;
+    UIMonitorCommon::getDiskLoad(m_comDebugger, m_uDiskWriteTotal, m_uDiskReadTotal);
+    quint64 uDiskWriteRate = m_uDiskWriteTotal - uPrevWriteTotal;
+    quint64 uDiskReadRate = m_uDiskReadTotal - uPrevReadTotal;
+    updateCellText(VMActivityOverviewColumn_DiskIOReadRate,QString("%1").arg(UITranslator::formatSize(uDiskReadRate, iDecimalCount)));
+    updateCellText(VMActivityOverviewColumn_DiskIOWriteRate,QString("%1").arg(UITranslator::formatSize(uDiskWriteRate, iDecimalCount)));
+    updateCellText(VMActivityOverviewColumn_DiskIOReadTotal,  QString("%1").arg(UITranslator::formatSize(m_uDiskReadTotal, iDecimalCount)));
+    updateCellText(VMActivityOverviewColumn_DiskIOWriteTotal, QString("%1").arg(UITranslator::formatSize(m_uDiskWriteTotal, iDecimalCount)));
+
+    /* VM Exits: */
+    quint64 uPrevVMExitsTotal = m_uVMExitTotal;
+    UIMonitorCommon::getVMMExitCount(m_comDebugger, m_uVMExitTotal);
+    quint64 uVMExitRate = m_uVMExitTotal - uPrevVMExitsTotal;
+    updateCellText(VMActivityOverviewColumn_VMExits, QString("%1/%2").arg(UITranslator::addMetricSuffixToNumber(uVMExitRate)).
+                   arg(UITranslator::addMetricSuffixToNumber(m_uVMExitTotal)));
+
 
 }
@@ -228 +256 @@
 }
 
+void UIVMActivityOverviewAccessibleTableView::updateColumVisibility()
+{
+    UIActivityOverviewAccessibleProxyModel *pProxyModel = qobject_cast<UIActivityOverviewAccessibleProxyModel*>(model());
+    if (!pProxyModel)
+        return;
+    UIActivityOverviewAccessibleModel *pModel = qobject_cast<UIActivityOverviewAccessibleModel*>(pProxyModel->sourceModel());
+    QHeaderView *pHeader = horizontalHeader();
+
+    if (!pModel || !pHeader)
+        return;
+    for (int i = (int)VMActivityOverviewColumn_Name; i < (int)VMActivityOverviewColumn_Max; ++i)
+    {
+        if (!pModel->columnVisible(i))
+            pHeader->hideSection(i);
+        else
+            pHeader->showSection(i);
+    }
+    resizeHeaders();
+}
+
+int UIVMActivityOverviewAccessibleTableView::selectedItemIndex() const
+{
+    UIActivityOverviewAccessibleProxyModel *pModel = qobject_cast<UIActivityOverviewAccessibleProxyModel*>(model());
+    if (!pModel)
+        return -1;
+
+    QItemSelectionModel *pSelectionModel =  selectionModel();
+    if (!pSelectionModel)
+        return -1;
+    QModelIndexList selectedItemIndices = pSelectionModel->selectedRows();
+    if (selectedItemIndices.isEmpty())
+        return -1;
+
+    /* just use the the 1st index: */
+    QModelIndex modelIndex = pModel->mapToSource(selectedItemIndices[0]);
+
+    if (!modelIndex.isValid())
+        return -1;
+    return modelIndex.row();
+}
+
+bool UIVMActivityOverviewAccessibleTableView::hasSelection() const
+{
+    if (!selectionModel())
+        return false;
+    return selectionModel()->hasSelection();
+}
+
 void UIVMActivityOverviewAccessibleTableView::setMinimumColumnWidths(const QMap<int, int>& widths)
 {
     m_minimumColumnWidths = widths;
     resizeHeaders();
+}
+
+void UIVMActivityOverviewAccessibleTableView::resizeEvent(QResizeEvent *pEvent)
+{
+    resizeHeaders();
+    QTableView::resizeEvent(pEvent);
+}
+
+void UIVMActivityOverviewAccessibleTableView::selectionChanged(const QItemSelection &selected, const QItemSelection &deselected)
+{
+    emit sigSelectionChanged(selected, deselected);
+    QTableView::selectionChanged(selected, deselected);
+}
+
+void UIVMActivityOverviewAccessibleTableView::mousePressEvent(QMouseEvent *pEvent)
+{
+    if (!indexAt(pEvent->position().toPoint()).isValid())
+        clearSelection();
+    QTableView::mousePressEvent(pEvent);
 }
 
@@ -262 +357 @@
 {
     initialize();
+}
+
+void UIActivityOverviewAccessibleModel::setColumnVisible(const QMap<int, bool>& columnVisible)
+{
+    m_columnVisible = columnVisible;
+}
+
+bool UIActivityOverviewAccessibleModel::columnVisible(int iColumnId) const
+{
+    return m_columnVisible.value(iColumnId, true);
+}
+
+
+bool UIActivityOverviewAccessibleModel::isVMRunning(int rowIndex) const
+{
+    if (rowIndex >= m_rows.size() || rowIndex < 0 || !m_rows[rowIndex])
+        return false;
+    return m_rows[rowIndex]->isRunning();
+}
+
+bool UIActivityOverviewAccessibleModel::isCloudVM(int rowIndex) const
+{
+    if (rowIndex >= m_rows.size() || rowIndex < 0 || !m_rows[rowIndex])
+        return false;
+    return m_rows[rowIndex]->isCloudVM();
 }
 
@@ -561 +681 @@
 }
 
+void UIActivityOverviewAccessibleProxyModel::setNotRunningVMVisibility(bool fShow)
+{
+    if (m_fShowNotRunningVMs == fShow)
+        return;
+    m_fShowNotRunningVMs = fShow;
+    invalidateFilter();
+}
+
+
+void UIActivityOverviewAccessibleProxyModel::setCloudVMVisibility(bool fShow)
+{
+    if (m_fShowCloudVMs == fShow)
+        return;
+    m_fShowCloudVMs = fShow;
+    invalidateFilter();
+}
+
+bool UIActivityOverviewAccessibleProxyModel::filterAcceptsRow(int iSourceRow, const QModelIndex &sourceParent) const
+{
+    Q_UNUSED(sourceParent);
+    if (m_fShowNotRunningVMs && m_fShowCloudVMs)
+        return true;
+    UIActivityOverviewAccessibleModel *pModel = qobject_cast<UIActivityOverviewAccessibleModel*>(sourceModel());
+    if (!pModel)
+        return true;
+
+    if (!m_fShowNotRunningVMs && !pModel->isVMRunning(iSourceRow))
+        return false;
+    if (!m_fShowCloudVMs && pModel->isCloudVM(iSourceRow))
+        return false;
+    return true;
+}
+
+
 
 /*********************************************************************************************************************************

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewModelView.h

@@ -54 +54 @@
     Q_OBJECT;
 
+signals:
+
+    void sigSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
+
 public:
 
     UIVMActivityOverviewAccessibleTableView(QWidget *pParent);
     void setMinimumColumnWidths(const QMap<int, int>& widths);
+    void updateColumVisibility();
+    int selectedItemIndex() const;
+    bool hasSelection() const;
+
+private:
+
+    virtual void resizeEvent(QResizeEvent *pEvent) RT_OVERRIDE;
+    virtual void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) RT_OVERRIDE;
+    virtual void mousePressEvent(QMouseEvent *pEvent) RT_OVERRIDE;
+
     /** Resizes all the columns in response to resizeEvent. Columns cannot be narrower than m_minimumColumnWidths values. */
     void resizeHeaders();
@@ -76 +90 @@
     UIActivityOverviewAccessibleProxyModel(QObject *parent = 0);
     void dataUpdate();
+    void setNotRunningVMVisibility(bool fShow);
+    void setCloudVMVisibility(bool fShow);
 
 protected:
 
     // virtual bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const RT_OVERRIDE;
-    // bool filterAcceptsRow(int iSourceRow, const QModelIndex &sourceParent) const RT_OVERRIDE;
-
-private:
-
+    bool filterAcceptsRow(int iSourceRow, const QModelIndex &sourceParent) const RT_OVERRIDE RT_FINAL;
+
+private:
+
+    bool m_fShowNotRunningVMs;
+    bool m_fShowCloudVMs;
 
 };
@@ -165 +183 @@
     void setShouldUpdate(bool fShouldUpdate);
     void clearData();
+    bool isVMRunning(int rowIndex) const;
+    bool isCloudVM(int rowIndex) const;
+    void setColumnVisible(const QMap<int, bool>& columnVisible);
+    bool columnVisible(int iColumnId) const;
 
 private slots:
@@ -182 +204 @@
     QITableView *m_pTableView;
     QMap<int, QString> m_columnTitles;
+    QMap<int, bool> m_columnVisible;
     QTimer *m_pLocalVMUpdateTimer;
     /** Maximum length of string length of data displayed in column. Updated in UIActivityOverviewModel::data(..). */

trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.cpp

@@ -1906 +1906 @@
         connect(m_pModel, &UIActivityOverviewModel::sigHostStatsUpdate,
                 this, &UIVMActivityOverviewWidget::sltHandleHostStatsUpdate);
-        connect(m_pTableView, &UIVMActivityOverviewTableView::customContextMenuRequested,
-                this, &UIVMActivityOverviewWidget::sltHandleTableContextMenuRequest);
         connect(m_pTableView, &UIVMActivityOverviewTableView::sigSelectionChanged,
                 this, &UIVMActivityOverviewWidget::sltHandleTableSelectionChanged);
@@ -1918 +1916 @@
     m_pAccessibleModel = new UIActivityOverviewAccessibleModel(this, m_pAccessibleTableView);
     m_pAccessibleProxyModel->setSourceModel(m_pAccessibleModel);
+    m_pAccessibleProxyModel->setNotRunningVMVisibility(m_fShowNotRunningVMs);
+    m_pAccessibleProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
     m_pAccessibleTableView->setModel(m_pAccessibleProxyModel);
 
@@ -1935 +1935 @@
     m_pAccessibleTableView->sortByColumn(0, Qt::AscendingOrder);
 
+    connect(m_pAccessibleTableView, &UIVMActivityOverviewAccessibleTableView::customContextMenuRequested,
+            this, &UIVMActivityOverviewWidget::sltHandleTableContextMenuRequest);
+    connect(m_pAccessibleTableView, &UIVMActivityOverviewAccessibleTableView::sigSelectionChanged,
+            this, &UIVMActivityOverviewWidget::sltHandleTableSelectionChanged);
+
     layout()->addWidget(m_pAccessibleTableView);
 }
@@ -2057 +2062 @@
 void UIVMActivityOverviewWidget::sltHandleTableContextMenuRequest(const QPoint &pos)
 {
-    if (!m_pTableView)
+    if (!m_pAccessibleTableView)
         return;
 
@@ -2079 +2084 @@
             this, &UIVMActivityOverviewWidget::sltCloudVMVisibility);
 
-    menu.exec(m_pTableView->mapToGlobal(pos));
+    menu.exec(m_pAccessibleTableView->mapToGlobal(pos));
 }
 
@@ -2117 +2122 @@
     if (m_pProxyModel)
         m_pProxyModel->setNotRunningVMVisibility(m_fShowNotRunningVMs);
+    if (m_pAccessibleProxyModel)
+        m_pAccessibleProxyModel->setNotRunningVMVisibility(m_fShowNotRunningVMs);
+
 }
 
@@ -2124 +2132 @@
     if (m_pProxyModel)
         m_pProxyModel->setCloudVMVisibility(m_fShowCloudVMs);
+    if (m_pAccessibleProxyModel)
+        m_pAccessibleProxyModel->setCloudVMVisibility(m_fShowCloudVMs);
 }