fixed ratio

copaint/gradio_ui.py

@@ -69,54 +69,56 @@ def add_grid_to_image(image, h_cells, w_cells):
     return image
 
 
-def get_canvas_ratio_message(h_cells, w_cells):
-    # Calculate aspect ratio
-    ratio = w_cells / h_cells if h_cells > w_cells else w_cells / h_cells
-    closest_ratio = None
-    closest_ratio_str = None
-    min_diff = float('inf')
-    
-    # Common aspect ratios
-    ratios = {
-        "1:1": 1,
-        "5:6": 5/6,
-        "3:4": 3/4,
-        "2:3": 2/3
-    }
+def get_canvas_ratio_message(image, h_cells, w_cells):
+    w,h = image.size
+    aspect_ratio = w/h
+    if aspect_ratio > 1:
+        aspect_ratio = 1/aspect_ratio
     
-    # Find closest ratio
-    for ratio_str, r in ratios.items():
-        diff = abs(ratio - r)
+    # find nearest aspect ratio in the list of predefined ones 
+    predefined_aspect_ratios = [1/2, 2/3, 1/1, 5/6, 4/5, 5/7]
+    predefined_aspect_ratios_str = ["1:2", "2:3", "1:1", "5:6", "4:5", "5:7"]
+    min_diff = float('inf')
+    closest_ratio_idx = None
+    for idx, ratio in enumerate(predefined_aspect_ratios):
+        diff = abs(aspect_ratio - ratio)
         if diff < min_diff:
             min_diff = diff
-            closest_ratio = r
-            closest_ratio_str = ratio_str
+            closest_ratio_idx = idx
+    closest_ratio_str = predefined_aspect_ratios_str[closest_ratio_idx]
     
-    example_str = ""
-    
-    if closest_ratio_str == "1:1":
-        if h_cells == 2 and h_cells == 2:
-            example_str = ' (for example, a 6" by 6" canvas)'
-        if h_cells == 3 and h_cells == 3:
-            example_str = ' (for example, an 8" by 8" canvas)'
-    elif closest_ratio_str == "5:6":
-        example_str = ' (for example, a 10" by 12" canvas)'
-    elif closest_ratio_str == "3:4":
-        if (h_cells == 3 and w_cells == 4) or (h_cells == 4 and w_cells == 3):
-            example_str = ' (for example, a 6" by 8" canvas)'
-        if (h_cells == 4 and w_cells == 6) or (h_cells == 6 and w_cells == 4):
-            example_str = ' (for example, an 18" by 24", or a 12" by 16" canvas)'
-    elif closest_ratio_str == "2:3" and ((h_cells == 6 and w_cells == 9) or (h_cells == 9 and w_cells == 6)):
-        example_str = ' (for example, a 24" by 36" canvas)'
+    if min_diff > 0.2:
+        return None
+    else:
+
+        example_str = ""
+
+        if closest_ratio_str == "1:1":
+            if h_cells == 2 and h_cells == 2:
+                example_str = " for example, a 6” by 6” canvas."
+            if h_cells == 3 and h_cells == 3:
+                example_str = " for example, an 8” by 8” canvas."
+        elif closest_ratio_str == "5:6":
+                example_str = " for example, a 10” by 12” canvas."
+        elif closest_ratio_str == "3:4":
+            if (h_cells == 3 and w_cells == 4) or (h_cells == 4 and w_cells == 3):
+                example_str = " for example, a 6” by 8” canvas."
+            if (h_cells == 4 and w_cells == 6) or (h_cells == 6 and w_cells == 4):
+                example_str = " for example, an 18” by 24”, or a 12” by 16” canvas."
+        elif closest_ratio_str == "2:3" and ((h_cells == 6 and w_cells == 9) or (h_cells == 9 and w_cells == 6)):
+            example_str = " for example, a 24” by 36” canvas."
+        elif closest_ratio_str == "1:2":
+            example_str = " for example, a 12” by 24” canvas."
 
     return_str = f"You have chosen a <b>{h_cells}x{w_cells} Grid ({h_cells*w_cells} squares)</b>.\n\n"
-    return_str += f"Preparing your canvas: <b>choose a canvas with a {closest_ratio_str} ratio</b> to respect your design's size{example_str}."
+    return_str += f"Preparing your canvas: <b>choose a canvas with a {closest_ratio_str} ratio</b> to respect your design's size ({w}x{h}pixels),{example_str}."
+    print(f"return_str: {return_str}")
     return f"<div style='font-size: 1.2em; line-height: 1.5;'>{return_str}</div>"
 
 def add_grid_and_display_ratio(image, h_cells, w_cells):
     if image is None:
         return None, gr.update(visible=False)    
-    return add_grid_to_image(image, h_cells, w_cells), gr.update(visible=True, value=get_canvas_ratio_message(h_cells, w_cells))
+    return add_grid_to_image(image, h_cells, w_cells), gr.update(visible=True, value=get_canvas_ratio_message(image, h_cells, w_cells))
 
 
 def process_copaint(