Merge pull request 'Bug_Fixing' (#13) from Bug_Fixing into main

Reviewed-on: http://192.168.178.135:3000/Fabelous/MPENN/pulls/13

Widgets/color_widget/ctk_color_picker.py

@@ -0,0 +1,265 @@
+# CTk Color Picker for Ctk
+# Original Author: Akash Bora (Akascape)
+# Contributers: Victor Vimbert-Guerlais (helloHackYnow)
+
+
+import customtkinter as Ctk
+from PIL import Image, ImageTk
+import os
+import math
+
+PATH = os.path.dirname(os.path.realpath(__file__))
+
+class AskColor(Ctk.CTkToplevel):
+
+    def __init__(self,
+                 master,
+                 width: int = 300,
+                 title: str = "Choose Color",
+                 initial_color: str = None,
+                 bg_color: str = None,
+                 fg_color: str = None,
+                 button_color: str = None,
+                 button_hover_color: str = None,
+                 text: str = "apply",
+                 corner_radius: int = 24,
+                 slider_border: int = 1,
+                 **button_kwargs):
+    
+        super().__init__(master, **button_kwargs)
+        
+        self.title(title)
+        WIDTH = width if width>=200 else 200
+        HEIGHT = WIDTH + 150
+        self.image_dimension = self._apply_window_scaling(WIDTH - 100)
+        self.target_dimension = self._apply_window_scaling(20)
+        self.initial_color = initial_color
+        self.maxsize(WIDTH, HEIGHT)
+        self.minsize(WIDTH, HEIGHT)
+        self.resizable(width=False, height=False)
+        self.transient(self.master)
+        self.lift()
+        self.grid_columnconfigure(0, weight=1)
+        self.grid_rowconfigure(0, weight=1)
+        self.after(10)
+        self.protocol("WM_DELETE_WINDOW", self._on_closing)
+        
+        self.default_hex_color = "#ffffff"  
+        self.default_rgb = [255, 255, 255]
+        self.rgb_color = self.default_rgb[:]
+        
+        self.bg_color = self._apply_appearance_mode(Ctk.ThemeManager.theme["CTkFrame"]["fg_color"]) if bg_color is None else bg_color
+        self.fg_color = self.fg_color = self._apply_appearance_mode(Ctk.ThemeManager.theme["CTkFrame"]["top_fg_color"]) if fg_color is None else fg_color
+        self.button_color = self._apply_appearance_mode(Ctk.ThemeManager.theme["CTkButton"]["fg_color"]) if button_color is None else button_color
+        self.button_hover_color = self._apply_appearance_mode(Ctk.ThemeManager.theme["CTkButton"]["hover_color"]) if button_hover_color is None else button_hover_color
+        self.button_text = text
+        self.corner_radius = corner_radius
+        self.slider_border = 10 if slider_border>=10 else slider_border
+        
+        self.config(bg=self.bg_color)
+        
+        self.frame = Ctk.CTkFrame(master=self, fg_color=self.fg_color, bg_color=self.bg_color)
+        self.frame.grid(padx=20, pady=20, sticky="nswe")
+          
+        self.canvas = Ctk.CTkCanvas(self.frame, height=self.image_dimension, width=self.image_dimension, highlightthickness=0, bg=self.fg_color)
+        self.canvas.pack(pady=20)
+        self.canvas.bind("<B1-Motion>", self.on_mouse_drag)
+
+        self.img1 = Image.open(os.path.join(PATH, 'color_wheel.png')).resize((self.image_dimension, self.image_dimension), Image.Resampling.LANCZOS)
+        self.img2 = Image.open(os.path.join(PATH, 'target.png')).resize((self.target_dimension, self.target_dimension), Image.Resampling.LANCZOS)
+
+        self.wheel = ImageTk.PhotoImage(self.img1)
+        self.target = ImageTk.PhotoImage(self.img2)
+        
+        self.canvas.create_image(self.image_dimension/2, self.image_dimension/2, image=self.wheel)
+        self.set_initial_color(initial_color)
+        
+        self.brightness_slider_value = Ctk.IntVar()
+        self.brightness_slider_value.set(255)
+        
+        self.slider = Ctk.CTkSlider(master=self.frame, height=20, border_width=self.slider_border,
+                                              button_length=15, progress_color=self.default_hex_color, from_=0, to=255,
+                                              variable=self.brightness_slider_value, number_of_steps=256,
+                                              button_corner_radius=self.corner_radius, corner_radius=self.corner_radius,
+                                              button_color=self.button_color, button_hover_color=self.button_hover_color,
+                                              command=lambda x:self.update_colors())
+        self.slider.pack(fill="both", pady=(0,15), padx=20-self.slider_border)
+
+        self.label = Ctk.CTkLabel(master=self.frame, text_color="#000000", height=50, fg_color=self.default_hex_color,
+                                            corner_radius=self.corner_radius, text=self.default_hex_color)
+        self.label.pack(fill="both", padx=10)
+        
+        self.button = Ctk.CTkButton(master=self.frame, text=self.button_text, height=50, corner_radius=self.corner_radius, fg_color=self.button_color,
+                                              hover_color=self.button_hover_color, command=self._ok_event, **button_kwargs)
+        self.button.pack(fill="both", padx=10, pady=20)
+                
+        self.after(150, lambda: self.label.focus())
+                
+        self.grab_set()
+        
+    def get(self):
+        self._color = self.label._fg_color
+        self.wait_window(self)
+        return self._color
+    
+    def _ok_event(self, event=None):
+        self._color = self.label._fg_color
+        self.grab_release()
+        self.destroy()
+        del self.img1
+        del self.img2
+        del self.wheel
+        del self.target
+        
+    def _on_closing(self):
+        self._color = None
+        self.grab_release()
+        self.destroy()
+        del self.img1
+        del self.img2
+        del self.wheel
+        del self.target
+        
+    def on_mouse_drag(self, event):
+        x = event.x
+        y = event.y
+        self.canvas.delete("all")
+        self.canvas.create_image(self.image_dimension/2, self.image_dimension/2, image=self.wheel)
+        
+        d_from_center = math.sqrt(((self.image_dimension/2)-x)**2 + ((self.image_dimension/2)-y)**2)
+        
+        if d_from_center < self.image_dimension/2:
+            self.target_x, self.target_y = x, y
+        else:
+            self.target_x, self.target_y = self.projection_on_circle(x, y, self.image_dimension/2, self.image_dimension/2, self.image_dimension/2 -1)
+
+        self.canvas.create_image(self.target_x, self.target_y, image=self.target)
+        
+        self.get_target_color()
+        self.update_colors()
+  
+    def get_target_color(self):
+        try:
+            self.rgb_color = self.img1.getpixel((self.target_x, self.target_y))
+            
+            r = self.rgb_color[0]
+            g = self.rgb_color[1]
+            b = self.rgb_color[2]    
+            self.rgb_color = [r, g, b]
+            
+        except AttributeError:
+            self.rgb_color = self.default_rgb
+    
+    def update_colors(self):
+        brightness = self.brightness_slider_value.get()
+
+        self.get_target_color()
+
+        r = int(self.rgb_color[0] * (brightness/255))
+        g = int(self.rgb_color[1] * (brightness/255))
+        b = int(self.rgb_color[2] * (brightness/255))
+        
+        self.rgb_color = [r, g, b]
+
+        self.default_hex_color = "#{:02x}{:02x}{:02x}".format(*self.rgb_color)
+        
+        self.slider.configure(progress_color=self.default_hex_color)
+        self.label.configure(fg_color=self.default_hex_color)
+        
+        self.label.configure(text=str(self.default_hex_color))
+        
+        if self.brightness_slider_value.get() < 70:
+            self.label.configure(text_color="white")
+        else:
+            self.label.configure(text_color="black")
+            
+        if str(self.label._fg_color)=="black":
+            self.label.configure(text_color="white")
+            
+    def projection_on_circle(self, point_x, point_y, circle_x, circle_y, radius):
+        angle = math.atan2(point_y - circle_y, point_x - circle_x)
+        projection_x = circle_x + radius * math.cos(angle)
+        projection_y = circle_y + radius * math.sin(angle)
+
+        return projection_x, projection_y
+    
+    def set_initial_color(self, initial_color):
+        """
+        Sets the initial color of the target if it matches the specified `initial_color`.
+        Falls back to the center of the image if no matching color is found or `initial_color` is invalid.
+
+        Parameters:
+        - initial_color (str): The hexadecimal color value (e.g., '#RRGGBB') to match in the image.
+
+        Note: This method is in beta stage and may not accurately handle all colors.
+        """
+        if not initial_color or not initial_color.startswith("#"):
+            self._place_image_at_center()
+            return
+
+        r, g, b = self._hex_to_rgb(initial_color)
+
+        for i in range(self.image_dimension):
+            for j in range(self.image_dimension):
+                if self._pixel_matches_color(i, j, (r, g, b)):
+                    self._place_image_at(i, j)
+                    return
+
+        self._place_image_at_center()
+
+    def _hex_to_rgb(self, hex_color):
+        """
+        Converts a hexadecimal color to an RGB tuple.
+
+        Parameters:
+        - hex_color (str): The hexadecimal color string (e.g., '#RRGGBB').
+
+        Returns:
+        (tuple): A tuple containing the RGB values (r, g, b).
+        """
+        try:
+            return tuple(int(hex_color.lstrip('#')[i:i+2], 16) for i in (0, 2, 4))
+        except ValueError:
+            return None
+
+    def _pixel_matches_color(self, x, y, color):
+        """
+        Checks if the pixel at (x, y) matches the specified `color`.
+
+        Parameters:
+        - x (int): The x-coordinate of the pixel.
+        - y (int): The y-coordinate of the pixel.
+        - color (tuple): The RGB tuple to match.
+
+        Returns:
+        (bool): True if the pixel matches the `color`; False otherwise.
+        """
+        try:
+            return self.img1.getpixel((x, y))[:3] == color
+        except IndexError:
+            # Outside the image bounds
+            return False
+
+    def _place_image_at(self, x, y):
+        """
+        Places the image at the specified (x, y) coordinates.
+
+        Parameters:
+        - x (int): The x-coordinate where the image should be placed.
+        - y (int): The y-coordinate where the image should be placed.
+        """
+        self.default_hex_color = self.initial_color
+        self.canvas.create_image(x, y, image=self.target)
+        self.target_x = x
+        self.target_y = y
+
+    def _place_image_at_center(self):
+        """
+        Places the image at the center of the canvas.
+        """
+        center = self.image_dimension // 2
+        self.canvas.create_image(center, center, image=self.target)
+        
+if __name__ == "__main__":
+    app = AskColor()
+    app.mainloop()

main.py

@@ -215,7 +215,7 @@ class App(Ctk.CTk):
         return (
             (self.open_folder is not None and self.open_folder.winfo_ismapped()) or
             (self.create_folder is not None and self.create_folder.winfo_ismapped()) or
-            (self.Switch_folder is not None and self.Switch_folder.winfo_ismapped() and self.last_frame != self.buttons_frame)
+            (self.Switch_folder is not None and self.Switch_folder.winfo_ismapped() and self.last_opened_labeling_frame == self.labeling)
         )
 
     def switch_to_labeling(self):

scripts/settings.py

@@ -1,6 +1,6 @@
 import customtkinter as Ctk
 import scripts.get_sys_info as system_code
-from CTkColorPicker import AskColor
+from Widgets.color_widget.ctk_color_picker import AskColor
 
 class Settings(Ctk.CTkFrame):
     def __init__(self,master, **kwargs):
@@ -47,6 +47,16 @@ class Settings(Ctk.CTkFrame):
             self.thread_count_switch.set(system_code.used_threads)
         # Position of the Frame
         self.align()  
+
+    def enable_keybinding(self):
+        # this function has to be in all Functions but is only needed in
+        # some Classes
+        pass
+
+    def disable_keybinding(self):
+        # this function has to be in all Functions but is only needed in
+        # some Classes
+        pass
     
     def change_skipped_frame(self,value):
         value = int(value)
@@ -59,12 +69,11 @@ class Settings(Ctk.CTkFrame):
         self.thickness_slider_value.configure(text=value)
          
     def ask_color(self):
-        pick_color = AskColor(initial_color=system_code.color) # open the color picker
-        if pick_color.get() is not None:
-            system_code.color = pick_color.get() # get the color string
-            self.color_btn.configure(fg_color=system_code.color)
-
-    # set the wanted image format
+        self.pick_color = AskColor(master=self.master, initial_color=system_code.color)
+        self.color = self.pick_color.get() # get the color string 
+        if self.color is not None:
+            self.color_btn.configure(fg_color=self.color)
+            # set the wanted image format
     def set_img_format(self, value):
         system_code.img_format = value