Merge branch 'PureCode' of http://x-copper.cn:8418/WolfSpirit/EJM_Display into PureCode
This commit is contained in:
@@ -246,7 +246,11 @@ void P601_TransportPage::UIRefreshTimeOut()
|
||||
for (int i = 0; i < 32; ++i)
|
||||
{
|
||||
// 根据索引查找对应的标签控件
|
||||
<<<<<<< HEAD
|
||||
QLabel* Label = findChild<QLabel*>(QString("Transport_SSConditions_%1").arg(i+1));
|
||||
=======
|
||||
QLabel* Label = findChild<QLabel*>(QString("Text_SSConditions_%1").arg(i+1));
|
||||
>>>>>>> f88b815723b08bbfe04dcdec05fc5555cef9352c
|
||||
// 如果找到标签
|
||||
if (Label){
|
||||
// 基础样式:默认背景图
|
||||
@@ -263,6 +267,7 @@ void P601_TransportPage::UIRefreshTimeOut()
|
||||
}
|
||||
|
||||
void P601_TransportPage::TrailRefreshTimeOut(){
|
||||
<<<<<<< HEAD
|
||||
ui->Transport_CPW_L1->appendPoint(0, getNodeValue("IN_PhaseTransportL.Filtered30_U") .toReal());
|
||||
ui->Transport_CPW_L1->appendPoint(1, getNodeValue("IN_PhaseTransportL.Filtered30_V") .toReal());
|
||||
ui->Transport_CPW_L1->appendPoint(2, getNodeValue("IN_PhaseTransportL.Filtered30_W") .toReal());
|
||||
@@ -272,6 +277,17 @@ void P601_TransportPage::TrailRefreshTimeOut(){
|
||||
ui->Transport_CPW_R1->appendPoint(1, getNodeValue("IN_PhaseTransportR.Filtered30_V") .toReal());
|
||||
ui->Transport_CPW_R1->appendPoint(2, getNodeValue("IN_PhaseTransportR.Filtered30_W") .toReal());
|
||||
ui->Transport_CPW_R2->appendPoint(0,getNodeValue("IN_PhaseTransportR.Filtered_Temp") .toDouble());
|
||||
=======
|
||||
ui->CPW_L1->appendPoint(0, getNodeValue("IN_PhaseTransportL.Filtered30_U") .toReal());
|
||||
ui->CPW_L1->appendPoint(1, getNodeValue("IN_PhaseTransportL.Filtered30_V") .toReal());
|
||||
ui->CPW_L1->appendPoint(2, getNodeValue("IN_PhaseTransportL.Filtered30_W") .toReal());
|
||||
ui->CPW_L2->appendPoint(0,getNodeValue("IN_PhaseTransportL.Filtered_Temp") .toDouble());
|
||||
|
||||
ui->CPW_R1->appendPoint(0, getNodeValue("IN_PhaseTransportR.Filtered30_U") .toReal());
|
||||
ui->CPW_R1->appendPoint(1, getNodeValue("IN_PhaseTransportR.Filtered30_V") .toReal());
|
||||
ui->CPW_R1->appendPoint(2, getNodeValue("IN_PhaseTransportR.Filtered30_W") .toReal());
|
||||
ui->CPW_R2->appendPoint(0,getNodeValue("IN_PhaseTransportR.Filtered_Temp") .toDouble());
|
||||
>>>>>>> f88b815723b08bbfe04dcdec05fc5555cef9352c
|
||||
}
|
||||
|
||||
void P601_TransportPage::RotateDev(){
|
||||
|
||||
Reference in New Issue
Block a user