Enable variable number of sides on hexes

future implementation of squares and hexes and other shapes

app.py

@@ -141,7 +141,7 @@ def end_session(req: gr.Request):
 # Register the cleanup function
 atexit.register(end_session)
 
-def hex_create(hex_size, border_size, input_image_path, start_x, start_y, end_x, end_y, rotation, background_color_hex, background_opacity, border_color_hex, border_opacity, fill_hex, excluded_colors_var, filter_color, x_spacing, y_spacing, add_hex_text_option=None, custom_text_list=None, custom_text_color_list=None):
+def hex_create(hex_size, border_size, input_image_path, start_x, start_y, end_x, end_y, rotation, background_color_hex, background_opacity, border_color_hex, border_opacity, fill_hex, excluded_colors_var, filter_color, x_spacing, y_spacing, add_hex_text_option=None, custom_text_list=None, custom_text_color_list=None, sides=6):
     global input_image_palette
 
     try:
@@ -211,7 +211,7 @@ def hex_create(hex_size, border_size, input_image_path, start_x, start_y, end_x,
         y_spacing,
         add_hex_text_option,
         custom_text_list,
-        custom_text_color_list
+        custom_text_color_list, sides
     )    
     _,_, name, _, new_ext = get_file_parts(input_image_path)
     grid_image_path = save_image_to_temp_png(grid_image, user_dir, "hexgrid_" + name)

utils/hex_grid.py

@@ -33,7 +33,7 @@ def calculate_font_size(hex_size, padding=0.6, size_ceil=20, min_font_size=8):
         return None  # Hex is too small for text
     return min(font_size, size_ceil)
 
-def generate_hexagon_grid(hex_size, border_size, input_image=None, image_width=0, image_height=0, start_x=0, start_y=0, end_x=0, end_y=0, rotation=0, background_color="#ede9ac44", border_color="#12165380", fill_hex=True, excluded_color_list=excluded_color_list, filter_color=False, x_spacing=0, y_spacing=0):
+def generate_hexagon_grid(hex_size, border_size, input_image=None, image_width=0, image_height=0, start_x=0, start_y=0, end_x=0, end_y=0, rotation=0, background_color="#ede9ac44", border_color="#12165380", fill_hex=True, excluded_color_list=excluded_color_list, filter_color=False, x_spacing=0, y_spacing=0, sides=6):
     if input_image:
         image_width, image_height = input_image.size
     # Use half hex_size, thus do not double border size
@@ -72,7 +72,8 @@ def generate_hexagon_grid(hex_size, border_size, input_image=None, image_width=0
     col = 0
     row = 0
     def draw_hexagon(x, y, color="#FFFFFFFF", rotation=0, outline_color="#12165380", outline_width=0, sides=6):
-        side_length = (hex_size * 2) / math.sqrt(3)
+        #side_length = (hex_size * 2) / math.sqrt(3)
+        side_length = 2 * hex_size * math.tan(math.pi / sides)
         points = [(x + side_length * math.cos(math.radians(angle + rotation)), y + side_length * math.sin(math.radians(angle + rotation))) for angle in range(0, 360, (360 // sides))]
         draw.polygon(points, fill=color, outline=outline_color, width=max(-5, outline_width))
     # Function to range a floating number
@@ -120,12 +121,12 @@ def generate_hexagon_grid(hex_size, border_size, input_image=None, image_width=0
                     else:
                         print(f"color found: {avg_color}")
                         #draw_hexagon(x + x_offset, y + y_offset, color="#{:02x}{:02x}{:02x}{:02x}".format(*avg_color if fill_hex else (0,0,0,0)), outline_color=border_color, outline_width=hex_border_size)
-                        draw_hexagon(x + x_offset, y + y_offset, color="#{:02x}{:02x}{:02x}{:02x}".format(*avg_color), outline_color=border_color, outline_width=hex_border_size)
+                        draw_hexagon(x + x_offset, y + y_offset, color="#{:02x}{:02x}{:02x}{:02x}".format(*avg_color), outline_color=border_color, outline_width=hex_border_size, sides=sides)
                 else:
-                    draw_hexagon(x + x_offset, y + y_offset, color="#000000", outline_color=border_color, outline_width=hex_border_size)
+                    draw_hexagon(x + x_offset, y + y_offset, color="#000000", outline_color=border_color, outline_width=hex_border_size, sides=sides)
             else:
                 color = "#%02x%02x%02x%02x" % (128, math.ceil(y) % 255, math.ceil(x) % 255, 255) if fill_hex else (0,0,0,0)
-                draw_hexagon(x + x_offset, y + y_offset, color=color, outline_color=border_color, outline_width=hex_border_size)
+                draw_hexagon(x + x_offset, y + y_offset, color=color, outline_color=border_color, outline_width=hex_border_size, sides=sides)
     if rotation != 0:
         #image.show()
         # Rotate the final image
@@ -140,7 +141,7 @@ def generate_hexagon_grid(hex_size, border_size, input_image=None, image_width=0
         final_image = image
     return final_image
 
-def generate_hexagon_grid_with_text(hex_size, border_size, input_image=None, image_width=0, image_height=0, start_x=0, start_y=0, end_x=0, end_y=0, rotation=0, background_color="#ede9ac44", border_color="#12165380", fill_hex=True, excluded_color_list=excluded_color_list, filter_color=False, x_spacing=0, y_spacing=0, 
+def generate_hexagon_grid_with_text(hex_size, border_size, input_image=None, image_width=0, image_height=0, start_x=0, start_y=0, end_x=0, end_y=0, rotation=0, background_color="#ede9ac44", border_color="#12165380", fill_hex=True, excluded_color_list=excluded_color_list, filter_color=False, x_spacing=0, y_spacing=0, sides=6,
         add_hex_text_option=None, custom_text_list=None, custom_text_color_list=None):
 
     if input_image:
@@ -212,7 +213,8 @@ def generate_hexagon_grid_with_text(hex_size, border_size, input_image=None, ima
             pass
     hex_index = -1  # Initialize hex index
     def draw_hexagon(x, y, color="#FFFFFFFF", rotation=0, outline_color="#12165380", outline_width=0, sides=6):
-        side_length = (hex_size * 2) / math.sqrt(3)
+        #side_length = (hex_size * 2) / math.sqrt(3)
+        side_length = 2 * hex_size * math.tan(math.pi / sides)
         points = [(x + side_length * math.cos(math.radians(angle + rotation)), y + side_length * math.sin(math.radians(angle + rotation))) for angle in range(0, 360, (360 // sides))]
         draw.polygon(points, fill=color, outline=outline_color, width=max(-5, outline_width))
     # Function to range a floating number
@@ -260,13 +262,13 @@ def generate_hexagon_grid_with_text(hex_size, border_size, input_image=None, ima
                         avg_color = (0,0,0,0)
                     else:
                         print(f"color found: {avg_color}")
-                        #draw_hexagon(x + x_offset, y + y_offset, color="#{:02x}{:02x}{:02x}{:02x}".format(*avg_color if fill_hex else (0,0,0,0)), outline_color=border_color, outline_width=hex_border_size)
-                        draw_hexagon(x + x_offset, y + y_offset, color="#{:02x}{:02x}{:02x}{:02x}".format(*avg_color), outline_color=border_color, outline_width=hex_border_size)
+                        #draw_hexagon(x + x_offset, y + y_offset, color="#{:02x}{:02x}{:02x}{:02x}".format(*avg_color if fill_hex else (0,0,0,0)), outline_color=border_color, outline_width=hex_border_size, sides=sides)
+                        draw_hexagon(x + x_offset, y + y_offset, color="#{:02x}{:02x}{:02x}{:02x}".format(*avg_color), outline_color=border_color, outline_width=hex_border_size, sides=sides)
                 else:
-                    draw_hexagon(x + x_offset, y + y_offset, color="#00000000", outline_color=border_color, outline_width=hex_border_size)
+                    draw_hexagon(x + x_offset, y + y_offset, color="#00000000", outline_color=border_color, outline_width=hex_border_size, sides=sides)
             else:
                 color = "#%02x%02x%02x%02x" % (128, math.ceil(y) % 255, math.ceil(x) % 255, 255) if fill_hex else (0,0,0,0)
-                draw_hexagon(x + x_offset, y + y_offset, color=color, outline_color=border_color, outline_width=hex_border_size)
+                draw_hexagon(x + x_offset, y + y_offset, color=color, outline_color=border_color, outline_width=hex_border_size, sides=sides)
             # Draw text in hexagon
             if add_hex_text_option != None:
                 font_size = calculate_font_size(hex_size, 0.333, 20, 7)
@@ -393,7 +395,7 @@ def generate_hexagon_grid_with_text(hex_size, border_size, input_image=None, ima
         final_image = image
     return final_image
 
-def generate_hexagon_grid_interface(hex_size, border_size, image, start_x, start_y, end_x, end_y, rotation, background_color, border_color, fill_hex, excluded_color_list, filter_color, x_spacing, y_spacing, add_hex_text_option=None, custom_text_list=None, custom_text_color_list=None):
+def generate_hexagon_grid_interface(hex_size, border_size, image, start_x, start_y, end_x, end_y, rotation, background_color, border_color, fill_hex, excluded_color_list, filter_color, x_spacing, y_spacing, add_hex_text_option=None, custom_text_list=None, custom_text_color_list=None, sides=6):
     print(f"Generating Hexagon Grid with Parameters: Hex Size: {hex_size}, Border Size: {border_size}, Start X: {start_x}, Start Y: {start_y}, End X: {end_x}, End Y: {end_y}, Rotation: {rotation}, Background Color: {background_color}, Border Color: {border_color}, Fill Hex: {fill_hex}, Excluded Color List: {excluded_color_list}, Filter Color: {filter_color}, X Spacing: {x_spacing}, Y Spacing: {y_spacing}, add Text Option {add_hex_text_option}\n")
     hexagon_grid_image = generate_hexagon_grid_with_text(
         hex_size=abs(hex_size),
@@ -413,7 +415,7 @@ def generate_hexagon_grid_interface(hex_size, border_size, image, start_x, start
         y_spacing = y_spacing if abs(hex_size) > abs(y_spacing) else (hex_size if y_spacing >= 0 else -hex_size),
         add_hex_text_option = add_hex_text_option,
         custom_text_list = custom_text_list,
-        custom_text_color_list= custom_text_color_list
+        custom_text_color_list= custom_text_color_list, sides=sides
     )
     overlay_image = multiply_and_blend_images(image, hexagon_grid_image, 50)
     return hexagon_grid_image, overlay_image