From 41f9058f079f6c19c7bb9a05b0887e4e7c7508da Mon Sep 17 00:00:00 2001
From: Paul Beuchat <beuchatp@control.ee.ethz.ch>
Date: Sun, 3 Feb 2019 11:26:35 +0100
Subject: [PATCH] Picker GUI was missing name for the current mass LineEdit
---
.../GUI_Qt/flyingAgentGUI/forms/pickercontrollertab.ui | 2 +-
.../d_fall_pps/GUI_Qt/flyingAgentGUI/src/topbanner.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/pickercontrollertab.ui b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/pickercontrollertab.ui
index e12164b6..ad7dea1b 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/pickercontrollertab.ui
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/forms/pickercontrollertab.ui
@@ -2132,7 +2132,7 @@
</widget>
</item>
<item row="18" column="9">
- <widget class="QLineEdit" name="lineEdit">
+ <widget class="QLineEdit" name="lineEdit_current_mass">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
diff --git a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/topbanner.cpp b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/topbanner.cpp
index 5f58fcdf..1c8f5232 100644
--- a/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/topbanner.cpp
+++ b/pps_ws/src/d_fall_pps/GUI_Qt/flyingAgentGUI/src/topbanner.cpp
@@ -110,14 +110,14 @@ TopBanner::TopBanner(QWidget *parent) :
else if (m_type == TYPE_COORDINATOR)
{
// Set the label appropriate for a cooridnator
- QString qstr_title = "Flying Device GUI: for COORDINATOR ID ";
+ QString qstr_title = "Flying Agent GUI: for COORDINATOR ID ";
qstr_title.append( QString::number(m_ID) );
ui->top_banner_label->setText(qstr_title);
}
else
{
// Set the label to inform the user of the error
- QString qstr_title = "Flying Device GUI: for UNKNOWN NODE TYPE";
+ QString qstr_title = "Flying Agent GUI: for UNKNOWN NODE TYPE";
ui->top_banner_label->setText(qstr_title);
}
@@ -225,7 +225,7 @@ void TopBanner::loadCrazyflieContext(int ID_to_request_from_database , int emit_
#endif
// Construct and set the string for the checkbox label
- QString qstr_title = "Flying Device GUI: for AGENT ID ";
+ QString qstr_title = "Flying Agent GUI: for AGENT ID ";
qstr_title.append( QString::number(m_ID) );
qstr_title.append(", connected to ");
qstr_title.append(qstr_crazyflie_name);
@@ -298,7 +298,7 @@ void TopBanner::setAgentIDsToCoordinate(QVector<int> agentIDs , bool shouldCoord
else
{
// Set the label appropriate for a cooridnator
- QString qstr_title = "Flying Device GUI: for COORDINATOR ID ";
+ QString qstr_title = "Flying Agent GUI: for COORDINATOR ID ";
qstr_title.append( QString::number(m_ID) );
ui->top_banner_label->setText(qstr_title);
--
GitLab