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

@@ -246,7 +246,11 @@ void P501_LoaderPage::UIRefreshTimeOut()
for (int i = 0; i < 32; ++i)
{
// 根据索引查找对应的标签控件
<<<<<<< HEAD
QLabel* Label = findChild<QLabel*>(QString("Loader_SSConditions_%1").arg(i+1));
=======
QLabel* Label = findChild<QLabel*>(QString("Text_SSConditions_%1").arg(i+1));
>>>>>>> f88b815723b08bbfe04dcdec05fc5555cef9352c
// 如果找到标签
if (Label){
// 基础样式:默认背景图
@@ -268,6 +272,7 @@ void P501_LoaderPage::UIRefreshTimeOut()
}
void P501_LoaderPage::TrailRefreshTimeOut(){
<<<<<<< HEAD
ui->Loader_CPW_L1->appendPoint(0, getNodeValue("IN_PhaseLoaderL.Filtered30_U") .toReal());
ui->Loader_CPW_L1->appendPoint(1, getNodeValue("IN_PhaseLoaderL.Filtered30_V") .toReal());
ui->Loader_CPW_L1->appendPoint(2, getNodeValue("IN_PhaseLoaderL.Filtered30_W") .toReal());
@@ -277,6 +282,17 @@ void P501_LoaderPage::TrailRefreshTimeOut(){
ui->Loader_CPW_R1->appendPoint(1, getNodeValue("IN_PhaseLoaderR.Filtered30_V") .toReal());
ui->Loader_CPW_R1->appendPoint(2, getNodeValue("IN_PhaseLoaderR.Filtered30_W") .toReal());
ui->Loader_CPW_R2->appendPoint(0,getNodeValue("IN_PhaseLoaderR.Filtered_Temp") .toDouble());
=======
ui->CPW_L1->appendPoint(0, getNodeValue("IN_PhaseLoaderL.Filtered30_U") .toReal());
ui->CPW_L1->appendPoint(1, getNodeValue("IN_PhaseLoaderL.Filtered30_V") .toReal());
ui->CPW_L1->appendPoint(2, getNodeValue("IN_PhaseLoaderL.Filtered30_W") .toReal());
ui->CPW_L2->appendPoint(0,getNodeValue("IN_PhaseLoaderL.Filtered_Temp") .toDouble());
ui->CPW_R1->appendPoint(0, getNodeValue("IN_PhaseLoaderR.Filtered30_U") .toReal());
ui->CPW_R1->appendPoint(1, getNodeValue("IN_PhaseLoaderR.Filtered30_V") .toReal());
ui->CPW_R1->appendPoint(2, getNodeValue("IN_PhaseLoaderR.Filtered30_W") .toReal());
ui->CPW_R2->appendPoint(0,getNodeValue("IN_PhaseLoaderR.Filtered_Temp") .toDouble());
>>>>>>> f88b815723b08bbfe04dcdec05fc5555cef9352c
}
void P501_LoaderPage::RotateDev(){