GUI update for SEQ status flow

camerad/astrocam.cpp

@@ -67,6 +67,21 @@ namespace AstroCam {
   /***** AstroCam::Interface::handletopic_snapshot ****************************/
 
 
+  /***** AstroCam::Interface::handletopic_snapshot ****************************/
+  /**
+   * @brief      what to do when the topic is Topic::SNAPSHOT
+   * @details    This publishes a JSON message containing a snapshot of my
+   *             telemetry info when the subscriber receives the Topic::SNAPSHOT
+   *             topic and the payload contains my name.
+   * @param[in]  jmessage_in  subscribed-received JSON message
+   *
+   */
+  void Interface::handletopic_snapshot( const nlohmann::json &jmessage_in ) {
+    if ( jmessage_in.contains( Topic::CAMERAD ) ) this->publish_snapshot();
+  }
+  /***** AstroCam::Interface::handletopic_snapshot ****************************/
+
+
   long NewAstroCam::new_expose( std::string nseq_in ) {
     logwrite( "NewAstroCam::new_expose", nseq_in );
     return( NO_ERROR );

pygui/layout_service.py

@@ -6,6 +6,7 @@
 from control_tab import ControlTab
 from instrument_status_tab import InstrumentStatusTab
 import re
+import subprocess
 
 class LayoutService:
     def __init__(self, parent):
@@ -193,15 +194,31 @@ def create_system_status_group(self):
 
         # Create a mapping for status colors
         status_map = {
-            "stopped": QColor(169, 169, 169),  # Grey
-            "idle": QColor(255, 255, 0),       # Yellow
-            "paused": QColor(255, 165, 0),     # Orange
-            "exposing": QColor(0, 255, 0),     # Green
-            "readout": QColor(0, 255, 0),      # Green
-            "acquire": QColor(255, 255, 0),    # Yellow           
-            "focus": QColor(255, 255, 0),      # Yellow     
-            "calib": QColor(255, 255, 0),      # Yellow     
-            "user": QColor(255, 255, 0),      # Yellow     
+            "stopped": QColor(169, 169, 169),
+            "not_ready": QColor(255, 0, 0),
+            "idle": QColor(255, 255, 0),
+            "paused": QColor(255, 165, 0),
+            "exposing": QColor(0, 255, 0),
+            "readout": QColor(0, 255, 0),
+
+            "moveto": QColor(255, 255, 0),
+            "acam_acquire": QColor(255, 255, 0),
+            "slicecam_fineacquire": QColor(255, 255, 0),
+
+            "focus": QColor(255, 255, 0),
+            "calib": QColor(255, 255, 0),
+            "camera": QColor(255, 255, 0),
+            "flexure": QColor(255, 255, 0),
+            "power": QColor(255, 255, 0),
+            "slit": QColor(255, 255, 0),
+            "tcs": QColor(255, 255, 0),
+            "tcsop": QColor(255, 255, 0),
+            "user": QColor(255, 255, 0),
+
+            # transitional / backward compatibility
+            "acam": QColor(255, 255, 0),
+            "slicecam": QColor(255, 255, 0),
+            "acquire": QColor(255, 255, 0),
         }
 
         # Create a dictionary to hold the status widgets, which we will enable/disable
@@ -223,7 +240,7 @@ def create_system_status_group(self):
             status_color_rect.setStyleSheet(f"background-color: {color.name()};")
 
             # Label showing the status
-            status_label = QLabel(status.capitalize())
+            status_label = QLabel(status.replace("_", " ").title())
             status_label.setMargin(0)  # Remove extra margin around the label
 
             # Layout for each status (color + label)
@@ -359,14 +376,73 @@ def create_sequencer_mode_group(self):
         sequencer_mode_layout.addWidget(self.parent.sequencer_mode_single)
         sequencer_mode_layout.addWidget(self.parent.sequencer_mode_all)
 
+        # Fine acquire toggle
+        self.parent.fine_acquire_toggle = QPushButton("Fine Acquire: Disabled")
+        self.parent.fine_acquire_toggle.setCheckable(True)
+        self.parent.fine_acquire_toggle.setToolTip("Enable or disable sequencer fine acquire")
+        self.parent.fine_acquire_toggle.setMaximumWidth(200)
+        self.parent.fine_acquire_toggle.setStyleSheet("""
+            QPushButton {
+                background-color: #D3D3D3;
+                color: black;
+                font-weight: bold;
+                border-radius: 6px;
+                padding: 6px;
+            }
+            QPushButton:checked {
+                background-color: #4CAF50;
+                color: white;
+            }
+        """)
+        self.parent.fine_acquire_toggle.toggled.connect(self.on_fine_acquire_toggled)
+        sequencer_mode_layout.addWidget(self.parent.fine_acquire_toggle)
+
         sequencer_mode_group.setLayout(sequencer_mode_layout)
 
         # Set maximum width and height for the sequencer mode group
         sequencer_mode_group.setMaximumWidth(300)  # Maximum width
-        sequencer_mode_group.setMaximumHeight(100)  # Maximum height
+        sequencer_mode_group.setMaximumHeight(145)  # Maximum height
 
         return sequencer_mode_group
 
+    def on_fine_acquire_toggled(self, checked):
+        """Enable/disable the sequencer fine-acquire step."""
+        action = "enable" if checked else "disable"
+        command = ["seq", "fineacquire", action]
+        button = getattr(self.parent, "fine_acquire_toggle", None)
+
+        if button is not None:
+            button.setText(f"Fine Acquire: {'Enabled' if checked else 'Disabled'}")
+
+        try:
+            result = subprocess.run(
+                command,
+                check=True,
+                capture_output=True,
+                text=True,
+            )
+
+            if hasattr(self.parent, "message_log") and self.parent.message_log:
+                self.update_message_log(f"Ran command: {' '.join(command)}")
+                if result.stdout.strip():
+                    self.update_message_log(result.stdout.strip())
+
+        except Exception as exc:
+            # Revert the UI if the command failed.
+            if button is not None:
+                with QSignalBlocker(button):
+                    button.setChecked(not checked)
+                    button.setText(f"Fine Acquire: {'Disabled' if checked else 'Enabled'}")
+
+            QMessageBox.warning(
+                self.parent,
+                "Fine Acquire Command Failed",
+                f"Could not run: {' '.join(command)}\n\n{exc}",
+            )
+
+            if hasattr(self.parent, "message_log") and self.parent.message_log:
+                self.update_message_log(f"Fine acquire command failed: {' '.join(command)} — {exc}")
+
     def create_progress_and_image_group(self):
         progress_and_image_group = QGroupBox("Progress and Image Info")
         progress_and_image_layout = QVBoxLayout()

pygui/ngps_gui.py

@@ -54,6 +54,7 @@ def __init__(self):
         self.current_owner = None
         self.current_target_list_name = None
         self.zmq_status_service = None
+        self.zmq_debug_messages = False
 
         # Login status flag
         self.logged_in = False
@@ -178,7 +179,10 @@ def initialize_services(self):
         self.status_service.shutter_status_signal.connect(self.layout_service.update_shutter_status)
 
         # Initialize the ZMQStatusService
-        self.zmq_status_service = ZmqStatusService(self)
+        self.zmq_status_service = ZmqStatusService(
+            self,
+            emit_debug_messages=self.zmq_debug_messages,
+        )
         self.zmq_status_service.connect()
 
         # # Start the ZMQStatusService in a separate thread
@@ -189,6 +193,7 @@ def initialize_services(self):
         self.zmq_status_service.subscribe_to_topic("tcsd")
         self.zmq_status_service.subscribe_to_topic("acamd")
         self.zmq_status_service.subscribe_to_topic("seq_waitstate")
+        self.zmq_status_service.subscribe_to_topic("seq_seqstate")
 
         # Connect the message_received signal from ZMQStatusService to the update_message_log slot
         self.zmq_status_service.new_message_signal.connect(self.layout_service.update_message_log)
@@ -490,6 +495,16 @@ def update_etc_target(self, target_data):
 
             self.etc_popup.set_target_info(name, ra, dec)
 
+    def set_zmq_debug_messages(self, enabled: bool):
+        """Enable or disable raw ZMQ messages in the GUI message log."""
+        self.zmq_debug_messages = bool(enabled)
+
+        if self.zmq_status_service is not None:
+            self.zmq_status_service.set_debug_messages(enabled)
+
+        state = "enabled" if enabled else "disabled"
+        self.layout_service.update_message_log(f"ZMQ debug messages {state}.")
+
 
 if __name__ == '__main__':
     app = QApplication(sys.argv)