add features: global size

src/modules/app.py

@@ -13,9 +13,10 @@ For more information, see
 - https://app.bitly.com/settings/api
 '''
 
-def calculate_layout(image_count, item_size=(40, 40), page_size=(91, 55), position=(30, 67)):
+def calculate_layout(image_count, item_size=(40, 40), page_size=(91, 55), pos=(300, 200), position=(30, 67)):
     layout = []
     x, y = 0, 0
+    pos_x, pos_y = pos
     pos_px, pos_py = position
     size_x, size_y = item_size
     size_px, size_py = item_size
@@ -31,7 +32,6 @@ def calculate_layout(image_count, item_size=(40, 40), page_size=(91, 55), positi
 
         layout.append((image_count, x, y, pos_px, pos_py, size_x, size_y, size_px, size_py))
         x += item_size[0] + pos_px
-    # print(layout)
     return layout
 
 with gr.Blocks() as demo:
@@ -57,6 +57,11 @@ with gr.Blocks() as demo:
             with gr.Row():
                 shorten_checkbox = gr.Checkbox(label="Shorten URL", value=False)
                 qr_checkbox = gr.Checkbox(label="Generate QR Code", value=True)
+
+            with gr.Row():
+                sx = gr.Number(label="Card Width", minimum=1, maximum=210, value=91, step=1)
+                sy = gr.Number(label="Card Height", minimum=1, maximum=297, value=55, step=1)
+
             with gr.Row():
                 clear_button = gr.ClearButton(txt_input)
                 submit_button = gr.Button("Process URLs", variant='primary')
@@ -112,7 +117,6 @@ with gr.Blocks() as demo:
     count_url.change(update_df, count_url, df)
     cm_img_input.change(update_df, cm_img_input, df)
     idv_img_input.change(update_df, idv_img_input, df)
-
     submit_button.click(
         UrlProcessor.shorten_and_generate_qr,
         inputs=[
@@ -123,7 +127,9 @@ with gr.Blocks() as demo:
             qr_checkbox,
             cm_img_input,
             idv_img_input,
-            df,
+            sx,
+            sy,
+            df
             ],
         outputs=[preview_output, gallery_output, file_output, json_output]
     )

src/modules/link.py

@@ -93,7 +93,7 @@ class UrlProcessor:
             return None, None, {"error": str(e)}
 
 
-    def shorten_and_generate_qr(access_token, api_url, text, shorten, generate_qr, common_images, individual_images, positions_df):
+    def shorten_and_generate_qr(access_token, api_url, text, shorten, generate_qr, common_images, individual_images, sx, sy, df):
         bitly = UrlProcessor(access_token, api_url)
 
         txt = ''
@@ -179,8 +179,10 @@ class UrlProcessor:
                 except Exception as e:
                     results.append((str(e), url))
 
+        size = (int(sx * 3.7795), int(sy * 3.7795))
+
+        processor = ImageProcessor(size)
 
-        processor = ImageProcessor()
         layer = processor.create_layer()
 
         os.makedirs(f'{tmpd}/img/cards', exist_ok=True)
@@ -215,17 +217,16 @@ class UrlProcessor:
 
             if qr or indv:
                 try:
-                    pos_x = int(positions_df.loc[idx, 'PosX'])
-                    pos_y = int(positions_df.loc[idx, 'PosY'])
-                    pos_px = int(positions_df.loc[idx, 'PosPx'])
-                    pos_py = int(positions_df.loc[idx, 'PosPy'])
+                    pos_x = int(df.loc[idx, 'PosX'])
+                    pos_y = int(df.loc[idx, 'PosY'])
+                    pos_px = int(df.loc[idx, 'PosPx'])
+                    pos_py = int(df.loc[idx, 'PosPy'])
 
-                    size_x = int(positions_df.loc[idx, 'SizeX'])
-                    size_y = int(positions_df.loc[idx, 'SizeY'])
-                    size_px = int(positions_df.loc[idx, 'SizePx'])
-                    size_py = int(positions_df.loc[idx, 'SizePy'])
+                    size_x = int(df.loc[idx, 'SizeX'])
+                    size_y = int(df.loc[idx, 'SizeY'])
+                    size_px = int(df.loc[idx, 'SizePx'])
+                    size_py = int(df.loc[idx, 'SizePy'])
 
-                    size = (int(91 * 3.7795), int(55 * 3.7795))
                     if common_images:
                         for common_img in common_images:
                             layer = processor.combine_images(layer, common_img, size, (0, 0))

src/modules/main.py

@@ -11,18 +11,16 @@ class TextProcessor:
 
 
 class ImageProcessor:
-    def __init__(self):
+    def __init__(self, size):
         _, self.temp_dir = Utils.get_tempdir()
+        self.size = size
 
-    def create_layer(layout='horizontal', size=(91 * 3.7795, 55 * 3.7795)):
+    def create_layer(self, layout='horizontal'):
         ts, temp_dir = Utils.get_tempdir()
-        size = (int(size[0]), int(size[1]))  # Convert to integers
+        size = (int(self.size[0]), int(self.size[1]))  # Convert to integers
         img = Image.new('RGBA', size, (255, 255, 255, 0))
         draw = ImageDraw.Draw(img)
-        if layout == 'vertical':
-            draw.rectangle([(0, 0), (size[0], size[1])], outline="lightgray")
-        elif layout == 'horizontal':
-            draw.rectangle([(0, 0), (size[0], size[1])], outline="lightgray")
+        draw.rectangle([(0, 0), (self.size[0], self.size[1])], outline="lightgray")
 
         return img