galvo frequency

Author: annie-xd-wang

src/navigate/controller/sub_controllers/waveform_popup_controller.py

@@ -161,7 +161,9 @@ def __init__(self, view, parent_controller, waveform_constants_path):
         self.variables["Delay"].trace_add("write", self.update_waveform_parameters)
         self.variables["Duty"].trace_add("write", self.update_waveform_parameters)
         self.variables["Smoothing"].trace_add("write", self.update_waveform_parameters)
-        self.variables["Ramp_falling"].trace_add("write", self.update_waveform_parameters)
+        self.variables["Ramp_falling"].trace_add(
+            "write", self.update_waveform_parameters
+        )
 
         # Save waveform constants
         self.view.get_buttons()["Save"].configure(command=self.save_waveform_constants)
@@ -205,19 +207,29 @@ def configure_widget_range(self):
         0.01 for low mode.
 
         """
-        self.laser_min = self.configuration_controller.remote_focus_dict["hardware"]["min"]
-        self.laser_max = self.configuration_controller.remote_focus_dict["hardware"]["max"]
-        
-        precision = int(self.configuration_controller.remote_focus_dict["hardware"].get("precision", 0))
-        increment = int(self.configuration_controller.remote_focus_dict["hardware"].get("step", 0))
+        self.laser_min = self.configuration_controller.remote_focus_dict["hardware"][
+            "min"
+        ]
+        self.laser_max = self.configuration_controller.remote_focus_dict["hardware"][
+            "max"
+        ]
+
+        precision = int(
+            self.configuration_controller.remote_focus_dict["hardware"].get(
+                "precision", 0
+            )
+        )
+        increment = int(
+            self.configuration_controller.remote_focus_dict["hardware"].get("step", 0)
+        )
         if precision == 0:
             precision = -4 if self.laser_max < 1 else -3
         elif precision > 0:
-            precision = - precision
+            precision = -precision
         if increment == 0:
             increment = 0.0001 if self.laser_max < 1 else 0.001
         elif increment < 0:
-            increment = - increment
+            increment = -increment
 
         # set ranges of value for those lasers
         for laser in self.lasers:
@@ -375,7 +387,9 @@ def show_laser_info(self, *args):
             self.resolution_info["other_constants"].get("percent_smoothing", 0)
         )
         self.widgets["Smoothing"].widget.trigger_focusout_validation()
-        self.widgets["Delay"].set(self.resolution_info["other_constants"].get("remote_focus_delay", 7.5))
+        self.widgets["Delay"].set(
+            self.resolution_info["other_constants"].get("remote_focus_delay", 7.5)
+        )
         self.widgets["Delay"].widget.trigger_focusout_validation()
         self.widgets["Duty"].set(
             self.resolution_info["other_constants"]["remote_focus_settle_duration"]
@@ -430,7 +444,7 @@ def func_laser(*args):
                 # tell parent controller (the device)
                 if self.event_id:
                     self.view.popup.after_cancel(self.event_id)
-                
+
                 try:
                     value = float(variable_value)
                 except ValueError:
@@ -468,7 +482,7 @@ def update_waveform_parameters(self, *args, **wargs):
         """
         if not self.update_waveform_parameters_flag:
             return
-        
+
         if self.event_id:
             self.view.popup.after_cancel(self.event_id)
         # Get the values from the widgets.
@@ -485,7 +499,9 @@ def update_waveform_parameters(self, *args, **wargs):
         self.resolution_info["other_constants"][
             "remote_focus_settle_duration"
         ] = duty_cycle
-        self.resolution_info["other_constants"]["remote_focus_ramp_falling"] = ramp_falling
+        self.resolution_info["other_constants"][
+            "remote_focus_ramp_falling"
+        ] = ramp_falling
         self.resolution_info["other_constants"]["remote_focus_delay"] = delay
         self.resolution_info["other_constants"]["percent_smoothing"] = smoothing
 
@@ -587,18 +603,21 @@ def func_galvo(*args):
                 # change any galvo parameters as one event
                 if self.event_id:
                     self.view.popup.after_cancel(self.event_id)
-                
+
                 try:
                     value = float(variable_value)
                 except ValueError:
                     return
-                if value < self.galvo_min[galvo_name] or value > self.galvo_max[galvo_name]:
+                if "Freq" not in widget_name and (
+                    value < self.galvo_min[galvo_name]
+                    or value > self.galvo_max[galvo_name]
+                ):
                     return
                 self.galvo_setting[galvo_name][self.resolution][self.mag][
                     parameter
                 ] = variable_value
                 logger.debug(f"Galvo parameter {parameter} changed: {variable_value}")
-                
+
                 self.event_id = self.view.popup.after(
                     500,
                     lambda: self.parent_controller.execute("update_setting", "galvo"),