From ceadb85674ae2be0b0fafd91655881c6030ecbf4 Mon Sep 17 00:00:00 2001
From: Angel <roangel@student.ethz.ch>
Date: Wed, 18 Oct 2017 12:41:04 +0200
Subject: [PATCH] fixed motors off button thing? need to test
---
.../GUI_Qt/studentGUI/src/MainWindow.cpp | 20 +++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
index 6415e0ef..66ded0c2 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/studentGUI/src/MainWindow.cpp
@@ -103,16 +103,18 @@ MainWindow::~MainWindow()
void MainWindow::disableGUI()
{
- // ui->groupBox_general->setEnabled(false);
- ui->groupBox_4->setEnabled(false);
+ ui->motors_OFF_button->setEnabled(false);
+ ui->take_off_button->setEnabled(false);
+ ui->land_button->setEnabled(false);
}
void MainWindow::enableGUI()
{
- // ui->groupBox_general->setEnabled(true);
+ ui->motors_OFF_button->setEnabled(true);
if(m_battery_state == BATTERY_STATE_NORMAL)
{
- ui->groupBox_4->setEnabled(true);
+ ui->take_off_button->setEnabled(true);
+ ui->land_button->setEnabled(true);
}
}
@@ -199,12 +201,18 @@ void MainWindow::batteryStateChangedCallback(const std_msgs::Int32& msg)
{
case BATTERY_STATE_LOW:
qstr.append("Low Battery!");
- ui->groupBox_4->setEnabled(false);
+ ui->take_off_button->setEnabled(false);
+ ui->land_button->setEnabled(false);
+ // ui->groupBox_4->setEnabled(false);
+
ui->label_battery->setText(qstr);
m_battery_state = BATTERY_STATE_LOW;
break;
case BATTERY_STATE_NORMAL:
- ui->groupBox_4->setEnabled(true);
+ // ui->groupBox_4->setEnabled(true);
+ ui->take_off_button->setEnabled(true);
+ ui->land_button->setEnabled(true);
+
ui->label_battery->clear();
m_battery_state = BATTERY_STATE_NORMAL;
break;
--
GitLab