fix ordnum issue

src/modules/app.py

@@ -14,25 +14,31 @@ For more information, see
 - https://app.bitly.com/settings/api
 '''
 
-def calculate_layout(image_count, item_size=(40, 40), page_size=(91, 55), pos=(280, 20), position=(30, 67)):
+def calculate_layout(item_size=(40, 40), pos=(280, 20), pos_p=(30, 67)):
     layout = []
     pos_x, pos_y = pos
-    pos_px, pos_py = position
+    pos_px, pos_py = pos_p
     size_x, size_y = item_size
     size_px, size_py = item_size
 
-    for i in range(image_count):
-        if pos_x + item_size[0] > page_size[0]:  # Check for horizontal overflow
-            pos_x = 0
-            pos_y += item_size[1] + pos_py
+    return layout, pos_x, pos_y, pos_px, pos_py, size_x, size_y, size_px, size_py
 
-        if pos_y + item_size[1] > page_size[1]:  # Check for vertical overflow
-            pos_x = 0
-            pos_y = 0
+def update_df(*items):
+    items = [item for item in items if item is not None]
 
-        layout.append((image_count, pos_x, pos_y, pos_px, pos_py, size_x, size_y, size_px, size_py))
-        pos_x += item_size[0] + pos_px
-    return layout
+    if len(items) >= 2 and all(items):
+        image_count = len(items[0]) * len(items[1])
+    else:
+        image_count = 1
+
+    if image_count:
+        layout, pos_x, pos_y, pos_px, pos_py, size_x, size_y, size_px, size_py = calculate_layout()
+        positions = [(pos_x, pos_y, pos_px, pos_py, size_x, size_y, size_px, size_py) for _ in range(image_count)]
+
+        df = pd.DataFrame(positions, columns=headers)
+        df.insert(0, 'ImageId', range(1, image_count + 1))
+
+        return df
 
 with gr.Blocks() as demo:
     gr.Markdown(description)
@@ -74,18 +80,7 @@ with gr.Blocks() as demo:
                     cm_img_input = gr.Files(file_types=img_formats, label='Insert common images')
                     idv_img_input = gr.Files(file_types=img_formats, label='Insert individual images')
 
-                headers = ['ImageId', 'PosX', 'PosY', 'PosPx', 'PosPy', 'SizeX', 'SizeY', 'SizePx', 'SizePy']
-
-                @gr.render(inputs=[count_url,  idv_img_input])
-                def update_df(*items): # TODO
-                    items = 1 if items is None else items
-                    image_count = math.prod(len(item) for item in items if item is not None)
-
-                    if image_count is not None:
-                        positions = calculate_layout(image_count)
-                    df = pd.DataFrame(positions, columns=headers)
-                    # df.insert(0, 'ImageId', range(1, image_count + 1))
-                    return df
+                headers = ['PosX', 'PosY', 'PosPx', 'PosPy', 'SizeX', 'SizeY', 'SizePx', 'SizePy']
 
         with gr.Column():
             file_output = gr.File(label="Download ZIP")
@@ -114,7 +109,7 @@ with gr.Blocks() as demo:
         gr.Examples(examples, inputs)
 
     with gr.Row():
-        df = gr.Dataframe(headers=headers, label="Positions")
+        df = gr.Dataframe(headers=['ImageId'] + headers, label="Positions")
 
     count_items = [count_url, idv_img_input]
     txt_input.change(update_cnt, txt_input, count_url)