Fixed type checks across the app

Author: RamesTheGeneric

BabbleApp/algo_settings_widget.py

@@ -147,34 +147,42 @@ def render(self, window, event, values):
         # If anything has changed in our configuration settings, change/update those.
         changed = False
 
-        if self.config.gui_multiply != float(values[self.gui_multiply]):
-            self.config.gui_multiply = float(values[self.gui_multiply])
-            changed = True
+        if str(self.config.gui_multiply) != values[self.gui_multiply]:
+            try: 
+                self.config.gui_multiply = float(values[self.gui_multiply])
+                changed = True
+            except: print("Not a Float")
 
         if self.config.gui_model_file != values[self.gui_model_file]:
             self.config.gui_model_file = values[self.gui_model_file]
             changed = True
 
-        if self.config.calib_deadzone != float(values[self.calib_deadzone]):
-            self.config.calib_deadzone = float(values[self.calib_deadzone])
-            changed = True
+        if str(self.config.calib_deadzone) != values[self.calib_deadzone]:
+            try: 
+                self.config.calib_deadzone = float(values[self.calib_deadzone])
+                changed = True
+            except: print("Not a Float")
 
         if self.config.gui_use_gpu != values[self.gui_use_gpu]:
             self.config.gui_use_gpu = values[self.gui_use_gpu]
             changed = True
         if values[self.gui_gpu_index] != '':
-            if self.config.gui_gpu_index != int(values[self.gui_gpu_index]):
-                self.config.gui_gpu_index = int(values[self.gui_gpu_index])
-                changed = True
+            if str(self.config.gui_gpu_index) != values[self.gui_gpu_index]:
+                try:
+                    self.config.gui_gpu_index = int(values[self.gui_gpu_index])
+                    changed = True
+                except: print("Not an Int")
 
         if self.config.gui_runtime != str(values[self.gui_runtime]):
             self.config.gui_runtime = str(values[self.gui_runtime])
             changed = True
 
         if values[self.gui_inference_threads] != '':
-            if self.config.gui_inference_threads != int(values[self.gui_inference_threads]):
-                self.config.gui_inference_threads = int(values[self.gui_inference_threads]) 
-                changed = True
+            if str(self.config.gui_inference_threads) != values[self.gui_inference_threads]:
+                try: 
+                    self.config.gui_inference_threads = int(values[self.gui_inference_threads]) 
+                    changed = True
+                except: print("Not an Int")
         if values[self.gui_min_cutoff] != '':
             if self.config.gui_min_cutoff != values[self.gui_min_cutoff]:
                 self.config.gui_min_cutoff = values[self.gui_min_cutoff]

BabbleApp/calib_settings_widget.py

@@ -196,7 +196,6 @@ def render(self, window, event, values):
             for count2, element2 in enumerate(element1):
                 if values[element2] != '':
                     try: 
-                        float(values[element2])
                         if float(self.array[count1][count2]) != float(values[element2]):
                             self.array[count1][count2] = float(values[element2])
                             changed = True

BabbleApp/general_settings_widget.py

@@ -225,17 +225,23 @@ def render(self, window, event, values):
             self.config.gui_osc_location = values[self.gui_osc_location]
             changed = True
         if values[self.gui_cam_resolution_x] != '':
-            if self.config.gui_cam_resolution_x != int(values[self.gui_cam_resolution_x]):
-                self.config.gui_cam_resolution_x = int(values[self.gui_cam_resolution_x])
-                changed = True
+            if str(self.config.gui_cam_resolution_x) != values[self.gui_cam_resolution_x]:
+                try: 
+                    self.config.gui_cam_resolution_x = int(values[self.gui_cam_resolution_x])
+                    changed = True
+                except: print("Not an Int")
         if values[self.gui_cam_resolution_y] != '':
-            if self.config.gui_cam_resolution_y != int(values[self.gui_cam_resolution_y]):
-                self.config.gui_cam_resolution_y = int(values[self.gui_cam_resolution_y])
-                changed = True
+            if str(self.config.gui_cam_resolution_y) != values[self.gui_cam_resolution_y]:
+                try: 
+                    self.config.gui_cam_resolution_y = int(values[self.gui_cam_resolution_y])
+                    changed = True
+                except: print("Not an Int")
         if values[self.gui_cam_framerate] != '':
-            if self.config.gui_cam_framerate != int(values[self.gui_cam_framerate]):
-                self.config.gui_cam_framerate = int(values[self.gui_cam_framerate])
-                changed = True
+            if str(self.config.gui_cam_framerate) != values[self.gui_cam_framerate]:
+                try: 
+                    self.config.gui_cam_framerate = int(values[self.gui_cam_framerate])
+                    changed = True
+                except: print("Not an Int")
 
         if self.config.gui_use_red_channel != bool(values[self.gui_use_red_channel]):
             self.config.gui_use_red_channel = bool(values[self.gui_use_red_channel])