From ddf3f9680e54be1cf36159752030c5499952645c Mon Sep 17 00:00:00 2001
From: Paul Beuchat <beuchatp@control.ee.ethz.ch>
Date: Fri, 27 Mar 2020 12:06:28 +0100
Subject: [PATCH] Corrected small error in the implemation of setstatus for the
controller status banner
---
.../GUI_Qt/flyingAgentGUI/src/controllerstatusbanner.cpp | 3 +++
.../dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllertabs.cpp | 5 +----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllerstatusbanner.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllerstatusbanner.cpp
index 0ad01ec5..5063c21c 100644
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllerstatusbanner.cpp
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllerstatusbanner.cpp
@@ -33,6 +33,9 @@ void ControllerStatusBanner::setStatus(int new_status)
// CHECK IF THE "new_status" IS DIFFERENT FROM THE "m_current_status"
if (new_status!=m_current_status)
{
+ // UPDATE THE CLASS VARIABLE TO THE NEW STATUS
+ m_current_status = new_status;
+
// SWITCH BETWEEN THE POSSIBLE STATUS VALUES
switch (new_status)
{
diff --git a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllertabs.cpp b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllertabs.cpp
index 52d7c5f3..c29d10d6 100644
--- a/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllertabs.cpp
+++ b/dfall_ws/src/dfall_pkg/GUI_Qt/flyingAgentGUI/src/controllertabs.cpp
@@ -428,7 +428,7 @@ void ControllerTabs::poseDataReceivedCallback(const dfall_pkg::ViconData& viconD
// > For the controller currently operating, received on "controllerUsedSubscriber"
void ControllerTabs::controllerUsedChangedCallback(const std_msgs::Int32& msg)
{
- //ROS_INFO_STEAM("[COORDINATOR ROW GUI] Controller Used Changed Callback called for agentID = " << m_agentID);
+ //ROS_INFO_STREAM("[COORDINATOR ROW GUI] Controller Used Changed Callback called with msg.data = " << msg.data);
setControllerEnabled(msg.data);
}
#endif
@@ -438,9 +438,6 @@ void ControllerTabs::setControllerEnabled(int new_controller)
{
// Define the tab text highlight colour locally
const static QColor tab_text_colour_highlight = QColor(40,120,40);
- // Define the on string and style sheet setting locally
- const static QString style_sheet_string_for_on = "background-color:rgb(40,120,40);";
- const static QString text_for_controller_isOn = "A\nC\nT\nI\nV\nE";
// First set everything back to normal colouring
setAllTabLabelsToNormalColouring();
--
GitLab