From a6e1b43d4960b415064d1b44288c2cd62e85d482 Mon Sep 17 00:00:00 2001 From: Markus Koller Date: Sun, 29 Jan 2023 12:32:34 +0100 Subject: [PATCH] Added units to calibration frames --- src/globals.py | 2 +- src/user_interface.py | 27 +++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/globals.py b/src/globals.py index 064a7ca..89bdac6 100644 --- a/src/globals.py +++ b/src/globals.py @@ -52,4 +52,4 @@ SOCKET_PORT = 6677 SOCKET_MAX_CONNECTIONS = 5 # Hardware safety limits -MAG_MAG_FIELD = 3*37*1e-6 # [µT=A*µT/A] min coil constant x PSU current limit +MAG_MAG_FIELD = 5*37*1e-6 # [µT=A*µT/A] min coil constant x PSU current limit diff --git a/src/user_interface.py b/src/user_interface.py index ed78682..5e5b23e 100644 --- a/src/user_interface.py +++ b/src/user_interface.py @@ -1072,20 +1072,33 @@ class CalibrateMagnetometerSimple(Frame): controls_frame = Frame(self.left_column) controls_frame.grid(row=row_counter, column=0, sticky="nw") # Magnitude of magnetic field - mag_field_magnitude_label = Label(controls_frame, text="Magnetic field magnitude [µT]") + mag_field_magnitude_label = Label(controls_frame, text="Magnetic field magnitude") mag_field_magnitude_label.grid(row=0, column=0, pady=5, sticky="nw") mag_field_magnitude_entry = Entry(controls_frame, textvariable=self.mag_field_magnitude_var) mag_field_magnitude_entry.grid(row=0, column=1, pady=5, sticky="nw") + mag_field_magnitude_unit = Label(controls_frame, text="µT (0 to {:.0f} µT)".format(g.MAG_MAG_FIELD * 1e6)) + mag_field_magnitude_unit.grid(row=0, column=2, pady=5, sticky="nw") # Number of calibration points calibration_point_nr_label = Label(controls_frame, text="# of calibration points") calibration_point_nr_label.grid(row=1, column=0, pady=5, sticky="nw") calibration_point_nr_entry = Entry(controls_frame, textvariable=self.calibration_points_var) calibration_point_nr_entry.grid(row=1, column=1, pady=5, sticky="nw") + calibration_point_nr__unit = Label(controls_frame, text="- (> 8 points)") + calibration_point_nr__unit.grid(row=1, column=2, pady=5, sticky="nw") # Measurement interval calibration_point_nr_label = Label(controls_frame, text="Measurement interval [s]") calibration_point_nr_label.grid(row=2, column=0, pady=5, sticky="nw") calibration_point_nr_entry = Entry(controls_frame, textvariable=self.calibration_interval_var) calibration_point_nr_entry.grid(row=2, column=1, pady=5, sticky="nw") + calibration_point_nr_unit = Label(controls_frame, text="s (> 2 s)") + calibration_point_nr_unit.grid(row=2, column=2, pady=5, sticky="nw") + # Measurement interval + calibration_point_nr_label = Label(controls_frame, text="Measurement interval [s]") + calibration_point_nr_label.grid(row=2, column=0, pady=5, sticky="nw") + calibration_point_nr_entry = Entry(controls_frame, textvariable=self.calibration_interval_var) + calibration_point_nr_entry.grid(row=2, column=1, pady=5, sticky="nw") + calibration_point_nr_unit = Label(controls_frame, text="s (> 2 s)") + calibration_point_nr_unit.grid(row=2, column=2, pady=5, sticky="nw") # Calibration start buttons start_button_frame = Frame(controls_frame) start_button_frame.grid(row=3, column=0, columnspan=1, sticky="nw") @@ -1361,7 +1374,7 @@ class CalibrateMagnetometerSimple(Frame): calibration_points = self.calibration_points_var.get() calibration_interval = self.calibration_interval_var.get() calibration_mag_field = self.mag_field_magnitude_var.get() * 1e-6 # converted to micro Tesla - if calibration_mag_field <= 0 or calibration_mag_field > MAG_MAG_FIELD: + if calibration_mag_field <= 0 or calibration_mag_field > g.MAG_MAG_FIELD: raise MagFieldOutOfBounds self.calibration_thread = MagnetometerCalibrationSimple(self.view_mpi_queue, calibration_points, @@ -1552,20 +1565,26 @@ class CalibrateMagnetometerComplete(Frame): controls_frame = Frame(self.left_column) controls_frame.grid(row=row_counter, column=0, sticky="nw") # Magnitude of magnetic field - mag_field_magnitude_label = Label(controls_frame, text="Magnetic field magnitude [µT]") + mag_field_magnitude_label = Label(controls_frame, text="Magnetic field magnitude") mag_field_magnitude_label.grid(row=0, column=0, pady=5, sticky="nw") mag_field_magnitude_entry = Entry(controls_frame, textvariable=self.mag_field_magnitude_var) mag_field_magnitude_entry.grid(row=0, column=1, pady=5, sticky="nw") + mag_field_magnitude_unit = Label(controls_frame, text="µT (0 to {:.0f} µT)".format(g.MAG_MAG_FIELD * 1e6)) + mag_field_magnitude_unit.grid(row=0, column=2, pady=5, sticky="nw") # Number of calibration points calibration_point_nr_label = Label(controls_frame, text="# of calibration points") calibration_point_nr_label.grid(row=1, column=0, pady=5, sticky="nw") calibration_point_nr_entry = Entry(controls_frame, textvariable=self.calibration_points_var) calibration_point_nr_entry.grid(row=1, column=1, pady=5, sticky="nw") + calibration_point_nr__unit = Label(controls_frame, text="- (> 8 points)") + calibration_point_nr__unit.grid(row=1, column=2, pady=5, sticky="nw") # Measurement interval calibration_point_nr_label = Label(controls_frame, text="Measurement interval [s]") calibration_point_nr_label.grid(row=2, column=0, pady=5, sticky="nw") calibration_point_nr_entry = Entry(controls_frame, textvariable=self.calibration_interval_var) calibration_point_nr_entry.grid(row=2, column=1, pady=5, sticky="nw") + calibration_point_nr_unit = Label(controls_frame, text="s (> 2 s)") + calibration_point_nr_unit.grid(row=2, column=2, pady=5, sticky="nw") # Calibration start buttons start_button_frame = Frame(controls_frame) start_button_frame.grid(row=3, column=0, columnspan=1, sticky="nw") @@ -1857,7 +1876,7 @@ class CalibrateMagnetometerComplete(Frame): calibration_points = self.calibration_points_var.get() calibration_interval = self.calibration_interval_var.get() calibration_mag_field = self.mag_field_magnitude_var.get() * 1e-6 # converted to micro Tesla - if calibration_mag_field <= 0 or calibration_mag_field > MAG_MAG_FIELD: + if calibration_mag_field <= 0 or calibration_mag_field > g.MAG_MAG_FIELD: raise MagFieldOutOfBounds self.calibration_thread = MagnetometerCalibrationComplete(self.view_mpi_queue, calibration_points,