Merge branch 'PureCode' of http://x-copper.cn:8418/WolfSpirit/EJM_Display into PureCode

This commit is contained in:
2025-10-20 22:29:29 +08:00
17 changed files with 451 additions and 1 deletions

View File

@@ -7,7 +7,10 @@
#include <QTabWidget>
#include <QFileInfo>
#include <QPushButton>
<<<<<<< HEAD
#include <Threads/MultiCoreManager.h>
=======
>>>>>>> f88b815723b08bbfe04dcdec05fc5555cef9352c
class ReadOnlyItem : public QTableWidgetItem
{
public:
@@ -238,6 +241,7 @@ void P12_NetworkPage::UIRefreshTimeOut()
{
if(!gPageIndexStr.contains("P12"))
return;
<<<<<<< HEAD
// 使用多核心管理器异步处理数据更新
//MultiCoreManager::instance()->submitTask([this]() {
@@ -271,6 +275,20 @@ void P12_NetworkPage::UIRefreshTimeOut()
QMetaObject::invokeMethod(this, &P12_NetworkPage::UIRefresh_Page0, Qt::QueuedConnection);
}
//}, "network_page_update_task");
=======
switch (ui->MainWidget->currentIndex()) {
case 0:UIRefresh_Page0();break;
case 1:TableViewDataUpdate(ui->TableWidget_PLC_1,&mCsvConfig[0]);break;
case 2:TableViewDataUpdate(ui->TableWidget_PLC_2,&mCsvConfig[1]);break;
case 3:TableViewDataUpdate(ui->TableWidget_PLC_3,&mCsvConfig[2]);break;
case 4:TableViewDataUpdate(ui->TableWidget_PLC_4,&mCsvConfig[3]);break;
case 5:TableViewDataUpdate(ui->TableWidget_PLC_5,&mCsvConfig[4]);break;
case 6:TableViewDataUpdate(ui->TableWidget_PLC_6,&mCsvConfig[5]);break;
case 7:TableViewDataUpdate(ui->TableWidget_PLC_7,&mCsvConfig[6]);break;
case 8:TableViewDataUpdate(ui->TableWidget_PLC_8,&mCsvConfig[7]);break;
// case 9:TableViewDataUpdate(ui->TableWidget_PLC_9,&mCsvConfig[8]);break;
}
>>>>>>> f88b815723b08bbfe04dcdec05fc5555cef9352c
}
void P12_NetworkPage::on_But_Network_0_clicked(){ slideToIndex(0, "P12.0");}