broadcast canvas info

include/canvas.h

@@ -21,8 +21,8 @@ public:
     QList<QStringList> parameterList() const;
 
     bool isDefault() const;
-
     void clear();
+    int parameterCount() const;
 
 protected:
     void paintEvent(QPaintEvent *event) override;

include/mainwindow.h

@@ -20,7 +20,7 @@ public:
 
 protected:
     void init_ui();
-    void reload();
+    bool reload();
     void clear();
     void setCurrentCanvas(bool isNewComfigure = false);
 

include/projectmanager.h

@@ -19,9 +19,13 @@ public:
     xmlNodePtr canvas(const int &index);
     int canvasCount() const;
 
+    int currentCanvasIndex() const;
+    void setCurrentCanvasIndex(const int &newCurrentCanvasIndex);
+
 private:
     xmlDocPtr m_xmlDocPtr;
     QList<xmlNodePtr> m_canvasList;
+    int m_currentCanvasIndex;
 
 };
 

src/canvas.cpp

@@ -236,6 +236,15 @@ void Canvas::clear()
     m_parameterList.clear();
 }
 
+int Canvas::parameterCount() const
+{
+    int count = 0;
+    for(const auto &parameters : m_parameterList) {
+        count += parameters.count();
+    }
+    return count;
+}
+
 void Canvas::paintEvent(QPaintEvent *event)
 {
     // 绘制背景颜色

src/mainwindow.cpp

@@ -88,11 +88,12 @@ void MainWindow::init_ui()
     pMainLayout->setSpacing(0);
     pMainLayout->setContentsMargins(0, 0, 0, 0);
 
-    reload();
-    setCurrentCanvas();
+    if(reload()) {
+        setCurrentCanvas();
+    }
 }
 
-void MainWindow::reload()
+bool MainWindow::reload()
 {
     ProjectManager &projectMgr = AppContext::instance().projectManager();
     QString fileName = QString("%1/%2").arg(QDir::currentPath(), "conf/monitor.xml");
@@ -101,7 +102,7 @@ void MainWindow::reload()
         LOG_INFO("open monitor config xml success: {}, canvas count: {}", fileName.toUtf8().data(), projectMgr.canvasCount());
     } else {
         LOG_ERROR("open monitor config xml failed: {}", fileName.toUtf8().data());
-        return;
+        return false;
     }
 
     LOG_INFO("start reload monitor configure");
@@ -114,6 +115,7 @@ void MainWindow::reload()
         m_pStackedWidget->insertWidget(i, pCanvas);
     }
     LOG_INFO("reload monitor configure complete");
+    return true;
 }
 
 void MainWindow::clear()
@@ -166,6 +168,8 @@ void MainWindow::setCurrentCanvas(bool isNewComfigure)
     }
 
     m_pStackedWidget->setCurrentIndex(index);
+    ProjectManager &projectMgr = AppContext::instance().projectManager();
+    projectMgr.setCurrentCanvasIndex(index);
 }
 
 void MainWindow::onUpdateScreen(const QJsonObject &obj)
@@ -261,6 +265,7 @@ void MainWindow::onPageSwitdh(int state)
     }
 
     m_pStackedWidget->setCurrentIndex(nextIndex);
+    projectMgr.setCurrentCanvasIndex(nextIndex);
 
     QSettings settings("storage/conf/settings.ini", QSettings::IniFormat);
     settings.setIniCodec("UTF-8");
@@ -311,9 +316,9 @@ void MainWindow::onConfigureUpdate(const QString &filename)
     }
 
 
-    reload();
-
-    setCurrentCanvas(true);
+    if(reload()) {
+        setCurrentCanvas(true);
+    }
 
     LOG_INFO("update: default canvas index is {}", m_pStackedWidget->currentIndex());
     QSettings settings("storage/conf/settings.ini", QSettings::IniFormat);
@@ -327,12 +332,26 @@ void MainWindow::onReloadCanvas()
 {
     // reloadCanvas();
     clear();
-    reload();
-    setCurrentCanvas();
+    if(reload()) {
+        setCurrentCanvas();
+    }
 }
 
 void MainWindow::onReport()
 {
+    ProjectManager &projectMgr = AppContext::instance().projectManager();
     QJsonObject obj = AppContext::instance().sysState().sysStateInfo();
+    obj.insert("curcanvas", projectMgr.currentCanvasIndex());
+    obj.insert("canvascount", projectMgr.canvasCount());
+    obj.insert("parametercount", 0);
+
+    if(projectMgr.canvasCount() > 0) {
+        QWidget *pWidget = m_pStackedWidget->currentWidget();
+        Canvas *pCanvas = static_cast<Canvas *>(pWidget);
+        if(pCanvas) {
+            obj["parametercount"] = pCanvas->parameterCount();
+        }
+    }
+
     m_broadcast.write(obj);
 }

src/projectmanager.cpp

@@ -4,6 +4,7 @@
 ProjectManager::ProjectManager(QObject *parent)
     : QObject{parent}
     , m_xmlDocPtr(nullptr)
+    , m_currentCanvasIndex(-1)
 {
 
 }
@@ -71,3 +72,13 @@ int ProjectManager::canvasCount() const
 {
     return m_canvasList.count();
 }
+
+int ProjectManager::currentCanvasIndex() const
+{
+    return m_currentCanvasIndex;
+}
+
+void ProjectManager::setCurrentCanvasIndex(const int &newCurrentCanvasIndex)
+{
+    m_currentCanvasIndex = newCurrentCanvasIndex;
+}