Changeset 103119 in vbox for trunk

Timestamp:

Jan 30, 2024 9:59:59 AM (13 months ago)

Author:

vboxsync

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

161366

Message:

FE/Qt: bugref:10501. Refactoring item classes. part 4.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/activity/overview/UIVMActivityOverviewWidget.cpp (modified) (16 diffs)

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

@@ -237 +237 @@
     virtual ~UIActivityOverviewItem();
     bool operator==(const UIActivityOverviewItem& other) const;
+    virtual QString machineStateString() const = 0;
     virtual bool isRunning() const = 0;
     virtual bool isCloudVM() const = 0;
     virtual void updateColumnData() = 0;
+
+    QString columnData(int iColumnIndex) const;
+
     QUuid         m_VMuid;
     QString       m_strVMName;
@@ -290 +294 @@
     virtual bool isCloudVM() const override;
     virtual void updateColumnData() override;
+    virtual QString machineStateString() const override;
     void setMachineState(KMachineState enmState);
-
-    quint64  m_uCPUVMMLoad;
-
-    quint64 m_uVMExitRate;
-    quint64 m_uVMExitTotal;
-
-    CMachineDebugger m_comDebugger;
 
 protected:
@@ -308 +306 @@
     CGuest   m_comGuest;
     KMachineState m_enmMachineState;
+
+    quint64  m_uCPUVMMLoad;
+    quint64 m_uVMExitRate;
+    quint64 m_uVMExitTotal;
+    CMachineDebugger m_comDebugger;
 };
 
@@ -325 +328 @@
     virtual bool isCloudVM() const override;
     virtual void updateColumnData() override;
+    virtual QString machineStateString() const override;
 
 protected:
@@ -398 +402 @@
     void sltMachineStateChanged(const QUuid &uId, const KMachineState state);
     void sltMachineRegistered(const QUuid &uId, bool fRegistered);
-    void sltTimeout();
+    void sltLocalUpdateTimeout();
+    void sltCloudUpdateTimeout();
 
 private:
@@ -412 +417 @@
     QVector<UIActivityOverviewItem*> m_itemList;
     QMap<int, QString> m_columnTitles;
-    QTimer *m_pTimer;
+    QTimer *m_pLocalUpdateTimer;
+    QTimer *m_pCloudUpdateTimer;
     /** @name The following are used during UIPerformanceCollector::QueryMetricsData(..)
      * @{ */
@@ -890 +896 @@
 }
 
+QString UIActivityOverviewItem::columnData(int iColumnIndex) const
+{
+    return m_columnData.value(iColumnIndex, QString());
+}
+
 
 /*********************************************************************************************************************************
@@ -945 +956 @@
 }
 
+QString UIActivityOverviewItemCloud::machineStateString() const
+{
+    if (!m_comCloudMachine.isOk())
+        return QString();
+    return gpConverter->toString(m_comCloudMachine.GetState());
+}
+
 
 /*********************************************************************************************************************************
@@ -1006 +1024 @@
 {
     m_enmMachineState = enmState;
+    if (m_enmMachineState == KMachineState_Running)
+        resetDebugger();
 }
 
@@ -1097 +1117 @@
         QString("%1/%2").arg(UITranslator::addMetricSuffixToNumber(m_uVMExitRate)).
         arg(UITranslator::addMetricSuffixToNumber(m_uVMExitTotal));
+}
+
+QString UIActivityOverviewItemLocal::machineStateString() const
+{
+    return gpConverter->toString(m_enmMachineState);
 }
 
@@ -1176 +1201 @@
 UIActivityOverviewModel::UIActivityOverviewModel(QObject *parent /*= 0*/)
     :QAbstractTableModel(parent)
-    , m_pTimer(new QTimer(this))
+    , m_pLocalUpdateTimer(new QTimer(this))
+    , m_pCloudUpdateTimer(new QTimer(this))
 {
     initialize();
@@ -1191 +1217 @@
     connect(gVBoxEvents, &UIVirtualBoxEventHandler::sigMachineRegistered,
             this, &UIActivityOverviewModel::sltMachineRegistered);
-    if (m_pTimer)
-    {
-        connect(m_pTimer, &QTimer::timeout, this, &UIActivityOverviewModel::sltTimeout);
-        m_pTimer->start(1000);
+    if (m_pLocalUpdateTimer)
+    {
+        connect(m_pLocalUpdateTimer, &QTimer::timeout, this, &UIActivityOverviewModel::sltLocalUpdateTimeout);
+        m_pLocalUpdateTimer->start(1000);
+    }
+    if (m_pCloudUpdateTimer)
+    {
+        connect(m_pCloudUpdateTimer, &QTimer::timeout, this, &UIActivityOverviewModel::sltCloudUpdateTimeout);
+        m_pCloudUpdateTimer->start(60 * 1000);
     }
 }
@@ -1212 +1243 @@
 void UIActivityOverviewModel::setShouldUpdate(bool fShouldUpdate)
 {
-    if (m_pTimer)
+    if (m_pLocalUpdateTimer)
     {
         if (fShouldUpdate)
-            m_pTimer->start();
+            m_pLocalUpdateTimer->start();
         else
-            m_pTimer->stop();
+            m_pLocalUpdateTimer->stop();
     }
 }
@@ -1264 +1295 @@
 QVariant UIActivityOverviewModel::data(const QModelIndex &index, int role) const
 {
-    Q_UNUSED(index);
-    Q_UNUSED(role);
-    return QVariant();
-#if 0
-    if (machineState(index.row()) != KMachineState_Running)
+    if (!isVMRunning(index.row()))
     {
         if (role == Qt::FontRole)
@@ -1281 +1308 @@
     if (!index.isValid() || role != Qt::DisplayRole || index.row() >= rowCount())
         return QVariant();
+
+    UIActivityOverviewItem *pItem = m_itemList[index.row()];
+    AssertPtrReturn(pItem, QVariant());
+
     if (index.column() == VMActivityOverviewColumn_Name)
-        return m_itemList[index.row()].m_columnData[index.column()];
-    if (m_itemList[index.row()].m_enmMachineState != KMachineState_Running)
-        return gpConverter->toString(m_itemList[index.row()].m_enmMachineState);
-    return m_itemList[index.row()].m_columnData[index.column()];
-#endif
+        return pItem->columnData(index.column());
+
+    if (!pItem->isRunning())
+        return pItem->machineStateString();
+
+    return pItem->columnData(index.column());
 }
 
@@ -1358 +1390 @@
 }
 
-void UIActivityOverviewModel::sltTimeout()
-{
-
-
+void UIActivityOverviewModel::sltCloudUpdateTimeout()
+{
+}
+
+void UIActivityOverviewModel::sltLocalUpdateTimeout()
+{
     /* Host's RAM usage is obtained from IHost not from IPerformanceCollector: */
     getHostRAMStats();