From d73457062ca7e0e41867bafb1b48d04ae0d25874 Mon Sep 17 00:00:00 2001
From: Giuseppe Carboni <giuseppecarboni89@live.com>
Date: Sun, 12 Jan 2025 18:30:46 +0000
Subject: [PATCH] Some minor AS GUI updates
---
.../src/SRTActiveSurfaceCore.cpp | 5 +++++
.../src/SRTActiveSurfaceGUIui.cpp | 9 +++++++++
2 files changed, 14 insertions(+)
diff --git a/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceCore.cpp b/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceCore.cpp
index d33ae2c26..fcc38d7a4 100644
--- a/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceCore.cpp
+++ b/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceCore.cpp
@@ -361,6 +361,11 @@ void SRTActiveSurfaceCore::setactuator(int circle, int actuator)
else {
active = false;
statusColor = true;
+ ActuatorStatusRunLabelCode = -1;
+ ActuatorStatusEnblLabelCode = -1;
+ ActuatorStatusCammLabelCode = 0;
+ ActuatorStatusLoopLabelCode = 0;
+ ActuatorStatusCalLabelCode = 0;
}
emit setGUIActuatorStatusLabels();
emit setGUIActuatorColor(circle, actuator, active, statusColor, false);
diff --git a/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceGUIui.cpp b/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceGUIui.cpp
index b672cbfb5..42e1e878f 100644
--- a/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceGUIui.cpp
+++ b/SRT/Clients/SRTActiveSurfaceGUIClient/src/SRTActiveSurfaceGUIui.cpp
@@ -740,6 +740,9 @@ void SRTActiveSurfaceGUI::changeGUIActuatorStatusLabels()
ActuatorStatusCammLabel->clear();
switch (mySRTActiveSurfaceCore.ActuatorStatusCammLabelCode) {
+ case (0):
+ ActuatorStatusCammLabel->setText("");
+ break;
case (-1):
ActuatorStatusCammLabel->setText("NO CAMM");
break;
@@ -750,6 +753,9 @@ void SRTActiveSurfaceGUI::changeGUIActuatorStatusLabels()
ActuatorStatusLoopLabel->clear();
switch (mySRTActiveSurfaceCore.ActuatorStatusLoopLabelCode) {
+ case (0):
+ ActuatorStatusLoopLabel->setText("");
+ break;
case (-1):
ActuatorStatusLoopLabel->setText("NO LOOP");
break;
@@ -760,6 +766,9 @@ void SRTActiveSurfaceGUI::changeGUIActuatorStatusLabels()
ActuatorStatusCalLabel->clear();
switch (mySRTActiveSurfaceCore.ActuatorStatusCalLabelCode) {
+ case (0):
+ ActuatorStatusCalLabel->setText("");
+ break;
case (-1):
ActuatorStatusCalLabel->setText("UNCALIBRATED");
break;
--
GitLab