make views combineable

frontend/__main__.py

@@ -10,7 +10,7 @@ from python_toolkit.serial_reader import SerialReader
 from python_toolkit.serial_mock import SerialMock
 from python_toolkit.gui.connect import ConnectFrame
 from .config import DEFAULT_CALIB_WEIGHT, DEFAULT_CALIB, DISPLAY_TYPES, MOV_AVG_DEFAULTS
-from .views import *
+from .views import CombinedView
 
 class WeightApp(tk.Tk):
     def __init__(self, weight_reader: SerialReader):
@@ -19,7 +19,7 @@ class WeightApp(tk.Tk):
         self.record_start = None
         self.record_window = []
         self.weight_reader = weight_reader
-        self.view = None
+        self.view = None 
         
         self.toolbar = tk.Frame(self, padx=10)
         self.toolbar.pack(side=tk.LEFT)
@@ -50,10 +50,18 @@ class WeightApp(tk.Tk):
         self.view_type = tk.Frame(self.toolbar, pady=20)
         self.view_type.pack()
         self.view_type_label = ttk.Label(self.view_type, text="Visual:")
-        self.view_type_label.pack(side=tk.LEFT)
-        self.view_type_select = ttk.Combobox(self.view_type, values=[t.value for t in DISPLAY_TYPES])
-        self.view_type_select.set(DISPLAY_TYPES.NUMBER.value)
-        self.view_type_select.pack(side=tk.LEFT)
+        self.view_type_label.pack()
+        
+        # Checkboxes for multiple view selection
+        self.view_vars = {}
+        for display_type in DISPLAY_TYPES:
+            var = tk.BooleanVar()
+            if display_type == DISPLAY_TYPES.NUMBER:
+                var.set(True)  # Default to NUMBER view
+            checkbox = ttk.Checkbutton(self.view_type, text=display_type.name, variable=var)
+            checkbox.pack()
+            self.view_vars[display_type] = var
+            
         self.view_type_update = ttk.Button(self.view_type, text="Refresh", command=self.update_view)
         self.view_type_update.pack()
 
@@ -90,6 +98,7 @@ class WeightApp(tk.Tk):
         self.view_type.pack_forget()
         self.recording_frame.pack_forget()
         self.view.pack_forget()
+
         self.connection_settings.pack()
         
     
@@ -111,32 +120,30 @@ class WeightApp(tk.Tk):
         self.weight_reader.calib_factor = float(self.calib_weight.get()) / float(self.calib_measurements.get())
     
     def update_view(self):
-        selected_view = self.view_type_select.get()
-        
-        if self.view is not None:
-            self.view.pack_forget()
+        # Get selected display types using logical AND operator
+        selected_types = DISPLAY_TYPES(0)  # Start with empty flags
+        for display_type, var in self.view_vars.items():
+            if var.get():  # If checkbox is checked
+                selected_types |= display_type  # Combine using bitwise OR
 
-        
-        if selected_view == DISPLAY_TYPES.NUMBER.value:
-            self.view = NumberView(self,
-                                tare_command=self.weight_reader.tare,
-                                calibrate_command=self.calibrate,
-                                padx=50)
-            self.view.pack(side=tk.RIGHT)
-        elif selected_view == DISPLAY_TYPES.CIRCLE.value:
-            self.view = CircleView(self,
-                                   tare_command=self.weight_reader.tare,
-                                   calibrate_command=self.calibrate,
-                                   padx=50)
-            self.view.pack(side=tk.RIGHT)
+        # Remove existing views
+        if self.view is not None:
+            self.view.update_views(selected_types)
         else:
-            raise Exception(f"View {selected_view} not found.")
+            self.view = CombinedView(self, 
+                                     tare_command=self.weight_reader.tare,
+                                     calibrate_command=self.calibrate)
+        
+        self.update_weight_display()
+        
 
     def update_weight_display(self):
         weight = self.weight_reader.value
         if self.recording:
             self.record_window.append((time() - self.record_start, weight))
+
         self.view.refresh(weight)
+
         self.after(20, self.update_weight_display)
     
     def calibrate(self):