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

@@ -105,6 +105,7 @@ void P00_PublicPage::WinInit()
ui->Label_VoiceWidget->move(32,70+576/2);
ui->Label_VoiceWidget->hide();
<<<<<<< HEAD
ui->ButToPage_1->setText(gPageName["P01"]);
ui->ButToPage_2->setText(gPageName["P02"]);
ui->ButToPage_3->setText(gPageName["P03"]);
@@ -121,6 +122,24 @@ void P00_PublicPage::WinInit()
ui->ButToPage_14->setText(gPageName["P14"]);
ui->ButToPage_15->setText(gPageName["P15"]);
ui->ButToPage_16->setText(gPageName["P16"]);
=======
ui->But_Page_0->setText(gPageName["P01"]);
ui->But_Page_1->setText(gPageName["P02"]);
ui->But_Page_2->setText(gPageName["P03"]);
ui->But_Page_3->setText(gPageName["P04"]);
ui->But_Page_4->setText(gPageName["P05"]);
ui->But_Page_5->setText(gPageName["P06"]);
ui->But_Page_6->setText(gPageName["P07"]);
ui->But_Page_7->setText(gPageName["P08"]);
ui->But_Page_8->setText(gPageName["P09"]);
ui->But_Page_9->setText(gPageName["P10"]);
ui->But_Page_10->setText(gPageName["P11"]);
ui->But_Page_11->setText(gPageName["P12.0"]);
ui->But_Page_12->setText(gPageName["P13"]);
ui->But_Page_13->setText(gPageName["P14"]);
ui->But_Page_14->setText(gPageName["P15"]);
ui->But_Page_15->setText(gPageName["P16"]);
>>>>>>> f88b815723b08bbfe04dcdec05fc5555cef9352c
// 初始化定时器(作为成员变量)
UIRefresh_Timer = new QTimer(this);
@@ -302,6 +321,7 @@ void P00_PublicPage::on_But_Close_clicked()
qApp->quit();
}
// 页面切换实现
<<<<<<< HEAD
void P00_PublicPage::on_ButToPage_1_clicked(){ ChangePage( 0, 1, "P01");}
void P00_PublicPage::on_ButToPage_2_clicked(){ ChangePage( 1, 2, "P02");}
void P00_PublicPage::on_ButToPage_3_clicked(){ ChangePage( 2, 301, "P03");}
@@ -318,12 +338,34 @@ void P00_PublicPage::on_ButToPage_13_clicked(){ ChangePage(12, 13, "P13");}
void P00_PublicPage::on_ButToPage_14_clicked(){ ChangePage(13, 14, "P14");}
void P00_PublicPage::on_ButToPage_15_clicked(){ ChangePage(14, 15, "P15");}
void P00_PublicPage::on_ButToPage_16_clicked(){ ChangePage(15, 16, "P16");}
=======
void P00_PublicPage::on_But_Page_0_clicked(){ ChangePage( 0, 1, "P01");}
void P00_PublicPage::on_But_Page_1_clicked(){ ChangePage( 1, 2, "P02");}
void P00_PublicPage::on_But_Page_2_clicked(){ ChangePage( 2, 301, "P03");}
void P00_PublicPage::on_But_Page_3_clicked(){ ChangePage( 3, 401, "P04");}
void P00_PublicPage::on_But_Page_4_clicked(){ ChangePage( 4, 501, "P05");}
void P00_PublicPage::on_But_Page_5_clicked(){ ChangePage( 5, 601, "P06");}
void P00_PublicPage::on_But_Page_6_clicked(){ ChangePage( 6, 7, "P07");}
void P00_PublicPage::on_But_Page_7_clicked(){ ChangePage( 7, 8, "P08");}
void P00_PublicPage::on_But_Page_8_clicked(){ ChangePage( 8, 9, "P09");}
void P00_PublicPage::on_But_Page_9_clicked(){ ChangePage( 9, 10, "P10");}
void P00_PublicPage::on_But_Page_10_clicked(){ ChangePage(10, 11, "P11");}
void P00_PublicPage::on_But_Page_11_clicked(){ ChangePage(11, 12, gPageIndexStr12);}
void P00_PublicPage::on_But_Page_12_clicked(){ ChangePage(12, 13, "P13");}
void P00_PublicPage::on_But_Page_13_clicked(){ ChangePage(13, 14, "P14");}
void P00_PublicPage::on_But_Page_14_clicked(){ ChangePage(14, 15, "P15");}
void P00_PublicPage::on_But_Page_15_clicked(){ ChangePage(15, 16, "P16");}
>>>>>>> f88b815723b08bbfe04dcdec05fc5555cef9352c
void P00_PublicPage::ChangePage(uint16_t PageIndex,uint16_t PageNum,QString PageName){
smoothScrollTo(PageIndex);
m_opcManager->writeNodeValue("PageContol.CurrentPage", PageNum,5,100);
gPageIndexStr = PageName;
if(PageNum != 12){
<<<<<<< HEAD
ui->ButToPage_12->setText(gPageName[gPageIndexStr12]);
=======
ui->But_Page_11->setText(gPageName[gPageIndexStr12]);
>>>>>>> f88b815723b08bbfe04dcdec05fc5555cef9352c
}
}
/* 1. 读写属性 */