Skip to content
Snippets Groups Projects
Commit ddf3f968 authored by Paul Beuchat's avatar Paul Beuchat
Browse files

Corrected small error in the implemation of setstatus for the controller status banner

parent ee6ac0f6
No related branches found
No related tags found
No related merge requests found
...@@ -33,6 +33,9 @@ void ControllerStatusBanner::setStatus(int new_status) ...@@ -33,6 +33,9 @@ void ControllerStatusBanner::setStatus(int new_status)
// CHECK IF THE "new_status" IS DIFFERENT FROM THE "m_current_status" // CHECK IF THE "new_status" IS DIFFERENT FROM THE "m_current_status"
if (new_status!=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 BETWEEN THE POSSIBLE STATUS VALUES
switch (new_status) switch (new_status)
{ {
......
...@@ -428,7 +428,7 @@ void ControllerTabs::poseDataReceivedCallback(const dfall_pkg::ViconData& viconD ...@@ -428,7 +428,7 @@ void ControllerTabs::poseDataReceivedCallback(const dfall_pkg::ViconData& viconD
// > For the controller currently operating, received on "controllerUsedSubscriber" // > For the controller currently operating, received on "controllerUsedSubscriber"
void ControllerTabs::controllerUsedChangedCallback(const std_msgs::Int32& msg) 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); setControllerEnabled(msg.data);
} }
#endif #endif
...@@ -438,9 +438,6 @@ void ControllerTabs::setControllerEnabled(int new_controller) ...@@ -438,9 +438,6 @@ void ControllerTabs::setControllerEnabled(int new_controller)
{ {
// Define the tab text highlight colour locally // Define the tab text highlight colour locally
const static QColor tab_text_colour_highlight = QColor(40,120,40); 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 // First set everything back to normal colouring
setAllTabLabelsToNormalColouring(); setAllTabLabelsToNormalColouring();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment