add neutral face calibration, adjust checkbox pos

Author: RedHawk989

BabbleApp/camera_widget.py

@@ -35,6 +35,7 @@ def __init__(self, widget_id: Tab, main_config: BabbleConfig, osc_queue: Queue):
         self.gui_vertical_flip = f"-VERTICALFLIP{widget_id}-"
         self.gui_horizontal_flip = f"-HORIZONTALFLIP{widget_id}-"
         self.use_calibration = f"-USECALIBRATION{widget_id}-"
+        self.use_n_calibration = f"-USENCALIBRATION{widget_id}-"
         self.osc_queue = osc_queue
         self.main_config = main_config
         self.cam_id = widget_id
@@ -106,8 +107,17 @@ def __init__(self, widget_id: Tab, main_config: BabbleConfig, osc_queue: Queue):
             [
                 sg.Button("Start Calibration", key=self.gui_restart_calibration, button_color='#539e8a', tooltip = "Start calibration. Look all arround to all extreams without blinking until sound is heard.",),
                 sg.Button("Stop Calibration", key=self.gui_stop_calibration, button_color='#539e8a', tooltip = "Stop calibration manualy.",),
+            ],
+            [
+                sg.Checkbox(
+                    "Use Neurtal Calibration:",
+                    default=self.config.use_n_calibration,
+                    key=self.use_n_calibration,
+                    background_color='#424042',
+                    tooltip="Toggle use of calibration using minimum values found during a neutral pose calibration step.",
+                ),
                 sg.Checkbox(
-                    "Use Calibration:",
+                    "Use Full Calibration:",
                     default=self.config.use_calibration,
                     key=self.use_calibration,
                     background_color='#424042',
@@ -239,6 +249,9 @@ def render(self, window, event, values):
             self.config.use_calibration = values[self.use_calibration]
             changed = True
 
+        if self.config.use_n_calibration != values[self.use_n_calibration]:
+            self.config.use_n_calibration = values[self.use_n_calibration]
+            changed = True
 
         if changed:
             self.main_config.save()

BabbleApp/config.py

@@ -17,6 +17,7 @@ class BabbleCameraConfig(BaseModel):
     roi_window_h: int = 0
     capture_source: Union[int, str, None] = None
     use_calibration: bool = False
+    use_n_calibration: bool = True
     gui_vertical_flip: bool = False
     gui_horizontal_flip: bool = False
 

BabbleApp/osc_calibrate_filter.py

@@ -62,4 +62,18 @@ def cal_osc(self, array):
                 calibrated_array[i] = calibrated_value
             array = calibrated_array
 
+        if self.settings.calib_array is not None and self.config.use_n_calibration:
+            self.min_max_array = np.fromstring(self.settings.calib_array.replace('[', '').replace(']', ''), sep=',')
+            self.min_max_array = self.min_max_array.reshape((2, 45))
+
+            calibrated_array = np.zeros_like(array)
+            for i, value in enumerate(array):
+                min_value = self.min_max_array[0, i]
+
+
+                calibrated_value = (value - min_value) / (1.0 - min_value)
+
+                calibrated_array[i] = calibrated_value
+            array = calibrated_array
+
         return array