hm/gcs-nf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改测试出现界面一些不合理的地方

Browse Source
This commit is contained in:
hm
2020-11-20 09:00:59 +08:00
parent 7471798382
commit 47743acfa6
17 changed files with 420 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/MenuBarUI/MenuBarUI.cpp
+27 -18
View File
@@ -47,6 +47,8 @@ MenuBarUI::MenuBarUI(QWidget *parent) :
state::unSelected);
CurrentIndex = 3;
//setArm(true);
}
@@ -87,9 +89,6 @@ void MenuBarUI::setPushButtonState(uint8_t state1,uint8_t state2,uint8_t state3,
ui->pushButton_Info->style()->unpolish(ui->pushButton_Info);
ui->pushButton_Info->style()->polish(ui->pushButton_Info);
ui->pushButton_Base->setProperty("state",state6);
ui->pushButton_Base->style()->unpolish(ui->pushButton_Base);
ui->pushButton_Base->style()->polish(ui->pushButton_Base);
}
@@ -105,7 +104,8 @@ void MenuBarUI::onClicked()
void MenuBarUI::on_pushButton_Setting_clicked()
{
ui->pushButton_Base->hide();
CurrentIndex = 0;
setPushButtonState(state::Selected,
state::unSelected,
state::unSelected,
@@ -114,12 +114,13 @@ void MenuBarUI::on_pushButton_Setting_clicked()
state::unSelected);
update();
emit IndexChanged(0);
emit IndexChanged(CurrentIndex);
}
void MenuBarUI::on_pushButton_SelfTest_clicked()
{
ui->pushButton_Base->hide();
CurrentIndex = 1;
setPushButtonState(state::unSelected,
state::Selected,
state::unSelected,
@@ -127,12 +128,13 @@ void MenuBarUI::on_pushButton_SelfTest_clicked()
state::unSelected,
state::unSelected);
update();
emit IndexChanged(1);
emit IndexChanged(CurrentIndex);
}
void MenuBarUI::on_pushButton_Mission_clicked()
{
ui->pushButton_Base->hide();
CurrentIndex = 2;
setPushButtonState(state::unSelected,
state::unSelected,
state::Selected,
@@ -140,12 +142,23 @@ void MenuBarUI::on_pushButton_Mission_clicked()
state::unSelected,
state::unSelected);
update();
emit IndexChanged(2);
emit IndexChanged(CurrentIndex);
}
void MenuBarUI::on_pushButton_Flight_clicked()
{
ui->pushButton_Base->show();
if(CurrentIndex == 3)
{
CurrentIndex = 5;
ui->pushButton_Flight->setText(tr("Base"));
}
else
{
CurrentIndex = 3;
ui->pushButton_Flight->setText(tr("Flight"));
}
setPushButtonState(state::unSelected,
state::unSelected,
state::unSelected,
@@ -153,12 +166,13 @@ void MenuBarUI::on_pushButton_Flight_clicked()
state::unSelected,
state::unSelected);
update();
emit IndexChanged(3);
emit IndexChanged(CurrentIndex);
}
void MenuBarUI::on_pushButton_Info_clicked()
{
ui->pushButton_Base->hide();
CurrentIndex = 4;
setPushButtonState(state::unSelected,
state::unSelected,
state::unSelected,
@@ -167,14 +181,9 @@ void MenuBarUI::on_pushButton_Info_clicked()
state::unSelected);
update();
emit IndexChanged(4);
emit IndexChanged(CurrentIndex);
}
void MenuBarUI::on_pushButton_Base_clicked()
{
update();
emit IndexChanged(5);
}
void MenuBarUI::showMessage(const QString &message, int TimeOut)
{