Use hide unmonitored again

Signed-off-by: Blake McHale <[email protected]>

Author: bmchalenv

greenwave_monitor/greenwave_monitor/ncurses_frontend.py

@@ -41,7 +41,7 @@
 class GreenwaveNcursesFrontend(Node):
     """Ncurses frontend for Greenwave Monitor."""
 
-    def __init__(self, show_only_monitored: bool = False):
+    def __init__(self, hide_unmonitored: bool = False):
         """Initialize the ncurses frontend node."""
         super().__init__('greenwave_ncurses_frontend')
 
@@ -60,7 +60,7 @@ def __init__(self, show_only_monitored: bool = False):
         self.input_buffer = ''
         self.status_message = ''
         self.status_timeout = 0
-        self.show_only_monitored = show_only_monitored
+        self.hide_unmonitored = hide_unmonitored
 
         # Initialize UI adaptor
         self.ui_adaptor = GreenwaveUiAdaptor(self)
@@ -99,7 +99,7 @@ def update_visible_topics(self):
         """Update the visible topics list based on current filters."""
         all_topic_names = list(self.all_topics)
 
-        if self.show_only_monitored and self.ui_adaptor:
+        if self.hide_unmonitored and self.ui_adaptor:
             # Filter to only show topics that have diagnostic data (are being monitored)
             filtered_topics = []
             for topic_name in all_topic_names:
@@ -290,10 +290,10 @@ def curses_main(stdscr, node):
                         status_message = f'Error: {msg}'
                     status_timeout = current_time + 3.0
             elif key == ord('h') or key == ord('H'):
-                node.show_only_monitored = not node.show_only_monitored
+                node.hide_unmonitored = not node.hide_unmonitored
                 with node.topics_lock:
                     node.update_visible_topics()
-                mode_text = 'monitored only' if node.show_only_monitored else 'all topics'
+                mode_text = 'monitored only' if node.hide_unmonitored else 'all topics'
                 status_message = f'Showing {mode_text}'
                 status_timeout = current_time + 3.0
 
@@ -435,7 +435,7 @@ def curses_main(stdscr, node):
             status_line = ("Format: Hz [tolerance%] - Examples: '30' (30Hz±5% default) "
                            "or '30 10' (30Hz±10%) - ESC=cancel, Enter=confirm")
         else:
-            if node.show_only_monitored:
+            if node.hide_unmonitored:
                 mode_text = 'monitored only'
                 mode_help_text = 'show unmonitored'
             else:
@@ -460,9 +460,9 @@ def parse_args(args=None):
         description='Ncurses-based frontend for Greenwave Monitor'
     )
     parser.add_argument(
-        '--show-only-monitored',
+        '--hide-unmonitored',
         action='store_true',
-        help='Show only monitored topics on initialization'
+        help='Hide unmonitored topics on initialization'
     )
     return parser.parse_known_args(args)
 
@@ -471,7 +471,7 @@ def main(args=None):
     """Entry point for the ncurses frontend application."""
     parsed_args, ros_args = parse_args(args)
     rclpy.init(args=ros_args)
-    node = GreenwaveNcursesFrontend(show_only_monitored=parsed_args.show_only_monitored)
+    node = GreenwaveNcursesFrontend(hide_unmonitored=parsed_args.hide_unmonitored)
     thread = None
 
     def signal_handler(signum, frame):

greenwave_monitor/scripts/ncurses_dashboard

@@ -23,7 +23,7 @@
 # Parse command line arguments
 DEMO_MODE=false
 LOG_DIR=""
-SHOW_ONLY_MONITORED=false
+HIDE_UNMONITORED=false
 MONITOR_ARGS=()
 
 show_help() {
@@ -34,7 +34,7 @@ show_help() {
     echo "OPTIONS:"
     echo "  --demo, --test             Launch demo publisher nodes for testing"
     echo "  --log-dir DIR              Enable logging to specified directory"
-    echo "  --show-only-monitored      Show only monitored topics on initialization"
+    echo "  --hide-unmonitored         Hide unmonitored topics on initialization"
     echo "  --help, -h                 Show this help message"
     echo ""
     echo "MONITOR_ARGS are passed directly to the greenwave_monitor node"
@@ -58,8 +58,8 @@ while [[ $# -gt 0 ]]; do
             LOG_DIR="$2"
             shift 2
             ;;
-        --show-only-monitored)
-            SHOW_ONLY_MONITORED=true
+        --hide-unmonitored)
+            HIDE_UNMONITORED=true
             shift
             ;;
         --help|-h)
@@ -123,8 +123,8 @@ echo "Starting ncurses TUI..."
 echo "Controls: a=Add Topic, r=Remove, f=Set Frequency, c=Clear Freq, q=Quit"
 # NOTE: add proper argument parsing to the ncurses frontend if more than one argument is added here
 FRONTEND_ARGS=()
-if [ "$SHOW_ONLY_MONITORED" = "true" ]; then
-    FRONTEND_ARGS+=("--show-only-monitored")
+if [ "$HIDE_UNMONITORED" = "true" ]; then
+    FRONTEND_ARGS+=("--hide-unmonitored")
 fi
 python3 -m greenwave_monitor.ncurses_frontend "${FRONTEND_ARGS[@]}"
 

greenwave_monitor/test/test_ncurses_frontend_argparse.py

@@ -25,22 +25,22 @@
 class TestParseArgs:
     """Test argument parsing for ncurses frontend."""
 
-    def test_default_show_only_monitored_false(self):
-        """Test that show_only_monitored defaults to False."""
+    def test_default_hide_unmonitored_false(self):
+        """Test that hide_unmonitored defaults to False."""
         parsed_args, _ = parse_args([])
-        assert parsed_args.show_only_monitored is False
+        assert parsed_args.hide_unmonitored is False
 
-    def test_show_only_monitored_long_flag(self):
-        """Test --show-only-monitored flag enables show_only_monitored."""
-        parsed_args, _ = parse_args(['--show-only-monitored'])
-        assert parsed_args.show_only_monitored is True
+    def test_hide_unmonitored_long_flag(self):
+        """Test --hide-unmonitored flag enables hide_unmonitored."""
+        parsed_args, _ = parse_args(['--hide-unmonitored'])
+        assert parsed_args.hide_unmonitored is True
 
     def test_ros_args_passthrough(self):
         """Test that ROS arguments are passed through."""
         parsed_args, ros_args = parse_args(
-            ['--show-only-monitored', '--ros-args', '-r', '__node:=my_node']
+            ['--hide-unmonitored', '--ros-args', '-r', '__node:=my_node']
         )
-        assert parsed_args.show_only_monitored is True
+        assert parsed_args.hide_unmonitored is True
         assert '--ros-args' in ros_args
         assert '-r' in ros_args
         assert '__node:=my_node' in ros_args