From 6aa0c6dbef36a66bce4d4a733bb22e36e33b54cd Mon Sep 17 00:00:00 2001 From: Jasper-Harvey0 Date: Fri, 13 Mar 2026 09:02:19 +1100 Subject: [PATCH 1/2] Fix ret_value checks --- src/fixate/ui_cmdline/cmd_line.py | 4 ++-- src/fixate/ui_gui_qt/ui_gui_qt.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/fixate/ui_cmdline/cmd_line.py b/src/fixate/ui_cmdline/cmd_line.py index dabf0384..509a5085 100644 --- a/src/fixate/ui_cmdline/cmd_line.py +++ b/src/fixate/ui_cmdline/cmd_line.py @@ -184,7 +184,7 @@ def _user_choices(msg, q, choices, target, attempts=5): print("\a") ret_val = input(reformat_text(msg + choicesstr)) ret_val = target(ret_val, choices) - if ret_val: + if ret_val is not None: q.put(("Result", ret_val)) return q.put( @@ -227,7 +227,7 @@ def _user_input(msg, q, target=None, attempts=5, kwargs=None): q.put(ret_val) return ret_val = target(ret_val, **kwargs) - if ret_val: + if ret_val is not None: q.put(("Result", ret_val)) return # Display failure of target and send exception diff --git a/src/fixate/ui_gui_qt/ui_gui_qt.py b/src/fixate/ui_gui_qt/ui_gui_qt.py index a5e03564..c2c7fb2d 100644 --- a/src/fixate/ui_gui_qt/ui_gui_qt.py +++ b/src/fixate/ui_gui_qt/ui_gui_qt.py @@ -780,7 +780,7 @@ def _topic_UI_req_choices(self, msg, q, choices, target, attempts=5): # This will change based on the interface ret_val = self.gui_user_input(self.reformat_text(msg), choices) ret_val = target(ret_val, choices) - if ret_val: + if ret_val is not None: q.put(("Result", ret_val)) return q.put( @@ -821,7 +821,7 @@ def _topic_UI_req_input(self, msg, q, target=None, attempts=5, kwargs=None): q.put(ret_val) return ret_val = target(ret_val, **kwargs) - if ret_val: + if ret_val is not None: q.put(("Result", ret_val)) return # Display failure of target and send exception From cd84052c5dd91caa3422d281bce3635b02329691 Mon Sep 17 00:00:00 2001 From: Jasper-Harvey0 Date: Fri, 13 Mar 2026 09:06:45 +1100 Subject: [PATCH 2/2] Update release notes. --- docs/release-notes.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes.rst b/docs/release-notes.rst index f67c605d..cb28aa0e 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -25,6 +25,7 @@ Improvements - Created a new FixateError base class for all exceptions raised by fixate to use. It inherits from Exception instead of BaseExcepetion to improve error handling. - DSO Driver function 'waveform_values' now returns a single channels x and y data as two separate lists, without re-acquiring the signal. This function should now be called after performing signal acquisition. +- Fix user input validation. Inputting a float value of 0.0 or 0 now works as expected. ************* Version 0.6.4