WolfSpirit/EJM_Display
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

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

Browse Source
This commit is contained in:
陈俊鹏
2025-10-20 22:29:29 +08:00
parent 7d148d79c9 f88b815723
commit ec14de02e7
17 changed files with 451 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Pages/P301_PumpPage.cpp
View File

@@ -205,7 +205,11 @@ void P301_PumpPage::UIRefreshTimeOut()
for (int i = 0; i < 32; ++i)
{
// 根据索引查找对应的标签控件
<<<<<<< HEAD
QLabel* Label = findChild<QLabel*>(QString("Pump_SSConditions_%1").arg(i+1));
=======
QLabel* Label = findChild<QLabel*>(QString("Text_SSConditions_%1").arg(i+1));
>>>>>>> f88b815723b08bbfe04dcdec05fc5555cef9352c
// 如果找到标签
if (Label){
// 基础样式：默认背景图
@@ -236,10 +240,17 @@ void P301_PumpPage::UIRefreshTimeOut()
}
void P301_PumpPage::TrailRefreshTimeOut(){
<<<<<<< HEAD
ui->Pump_CPW_1->appendPoint(0, getNodeValue("IN_PhasePump.Filtered30_U") .toReal());
ui->Pump_CPW_1->appendPoint(1, getNodeValue("IN_PhasePump.Filtered30_V") .toReal());
ui->Pump_CPW_1->appendPoint(2, getNodeValue("IN_PhasePump.Filtered30_W") .toReal());
ui->Pump_CPW_2->appendPoint(0, getNodeValue("IN_PhasePump.Filtered_Temp") .toDouble());
=======
ui->CPW_1->appendPoint(0, getNodeValue("IN_PhasePump.Filtered30_U") .toReal());
ui->CPW_1->appendPoint(1, getNodeValue("IN_PhasePump.Filtered30_V") .toReal());
ui->CPW_1->appendPoint(2, getNodeValue("IN_PhasePump.Filtered30_W") .toReal());
ui->CPW_2->appendPoint(0, getNodeValue("IN_PhasePump.Filtered_Temp") .toDouble());
>>>>>>> f88b815723b08bbfe04dcdec05fc5555cef9352c
}