update

README.md

@@ -4,7 +4,7 @@ emoji: 📚
 colorFrom: red
 colorTo: yellow
 sdk: gradio
-sdk_version: 3.0.5
+sdk_version: 3.30.0
 app_file: app.py
 pinned: false
 ---

app.py

@@ -139,44 +139,59 @@ def run_chm(
     for x, y in zip(tgt_points[0], tgt_points[1]):
         tgt_grid.append([int(((x + 1) / 2.0) * 7), int(((y + 1) / 2.0) * 7)])
 
+    # VISUALIZATION
     # PLOT
     fig, ax = plt.subplots(nrows=1, ncols=2, figsize=(12, 8))
 
+    # Source image plot
     ax[0].imshow(display_transform(source_image))
     ax[0].scatter(
         src_points_converted[:, 0],
         src_points_converted[:, 1],
-        c=colors[:number_src_points],
+        c="blue",
+        edgecolors="white",
+        s=50,
+        label="Source points",
     )
-    ax[0].set_title("Source")
+    ax[0].set_title("Source Image with Selected Points")
     ax[0].set_xticks([])
     ax[0].set_yticks([])
 
+    # Target image plot
     ax[1].imshow(display_transform(target_image))
     ax[1].scatter(
         tgt_points_converted[:, 0],
         tgt_points_converted[:, 1],
-        c=colors[:number_src_points],
+        c="red",
+        edgecolors="white",
+        s=50,
+        label="Target points",
     )
-    ax[1].set_title("Target")
+    ax[1].set_title("Target Image with Corresponding Points")
     ax[1].set_xticks([])
     ax[1].set_yticks([])
 
-    for TL in range(49):
-        ax[0].text(
-            x=src_points_converted[TL][0],
-            y=src_points_converted[TL][1],
-            s=str(TL),
-            fontdict=dict(color="red", size=11),
+    # Adding labels to points
+    for i, (src, tgt) in enumerate(zip(src_points_converted, tgt_points_converted)):
+        ax[0].text(*src, str(i), color="white", bbox=dict(facecolor="black", alpha=0.5))
+        ax[1].text(*tgt, str(i), color="black", bbox=dict(facecolor="white", alpha=0.7))
+
+    # Drawing lines between corresponding source and target points
+    for src, tgt in zip(src_points_converted, tgt_points_converted):
+        con = ConnectionPatch(
+            xyA=tgt,
+            xyB=src,
+            coordsA="data",
+            coordsB="data",
+            axesA=ax[1],
+            axesB=ax[0],
+            color="green",
         )
+        ax[1].add_artist(con)
 
-    for TL in range(49):
-        ax[1].text(
-            x=tgt_points_converted[TL][0],
-            y=tgt_points_converted[TL][1],
-            s=f"{str(TL)}",
-            fontdict=dict(color="orange", size=11),
-        )
+    # Adding legend
+    ax[0].legend()
+    ax[1].legend()
 
     plt.tight_layout()
     fig.suptitle("CHM Correspondences\nUsing $\it{pas\_psi.pt}$ Weights ", fontsize=16)
@@ -201,44 +216,41 @@ def generate_correspondences(
     )
 
 
-# Gradio App
-main = gr.Interface(
-    fn=generate_correspondences,
-    inputs=[
-        gr.Image(shape=(240, 240), type="pil"),
-        gr.Image(shape=(240, 240), type="pil"),
-        gr.Slider(minimum=1, maximum=240, step=1, default=15, label="Min X"),
-        gr.Slider(minimum=1, maximum=240, step=1, default=215, label="Max X"),
-        gr.Slider(minimum=1, maximum=240, step=1, default=15, label="Min Y"),
-        gr.Slider(minimum=1, maximum=240, step=1, default=215, label="Max Y"),
-    ],
-    allow_flagging="never",
-    outputs="plot",
-    examples=[
-        ["./examples/sample1.jpeg", "./examples/sample2.jpeg", 17, 223, 17, 223],
-        [
-            "./examples/Red_Winged_Blackbird_0012_6015.jpg",
-            "./examples/Red_Winged_Blackbird_0025_5342.jpg",
-            17,
-            223,
-            17,
-            223,
-        ],
-        [
-            "./examples/Yellow_Headed_Blackbird_0026_8545.jpg",
-            "./examples/Yellow_Headed_Blackbird_0020_8549.jpg",
-            17,
-            223,
-            17,
-            223,
-        ],
-    ],
-)
-
-
-blocks = gr.Blocks()
-with blocks:
-
+# # Gradio App
+# main = gr.Interface(
+#     fn=generate_correspondences,
+#     inputs=[
+#         gr.Image(shape=(240, 240), type="pil"),
+#         gr.Image(shape=(240, 240), type="pil"),
+#         gr.Slider(minimum=1, maximum=240, step=1, default=15, label="Min X"),
+#         gr.Slider(minimum=1, maximum=240, step=1, default=215, label="Max X"),
+#         gr.Slider(minimum=1, maximum=240, step=1, default=15, label="Min Y"),
+#         gr.Slider(minimum=1, maximum=240, step=1, default=215, label="Max Y"),
+#     ],
+#     allow_flagging="never",
+#     outputs="plot",
+#     examples=[
+#         ["./examples/sample1.jpeg", "./examples/sample2.jpeg", 17, 223, 17, 223],
+#         [
+#             "./examples/Red_Winged_Blackbird_0012_6015.jpg",
+#             "./examples/Red_Winged_Blackbird_0025_5342.jpg",
+#             17,
+#             223,
+#             17,
+#             223,
+#         ],
+#         [
+#             "./examples/Yellow_Headed_Blackbird_0026_8545.jpg",
+#             "./examples/Yellow_Headed_Blackbird_0020_8549.jpg",
+#             17,
+#             223,
+#             17,
+#             223,
+#         ],
+#     ],
+# )
+
+with gr.Blocks() as demo:
     gr.Markdown(
         """
 # Correspondence Matching with Convolutional Hough Matching Networks
@@ -247,10 +259,85 @@ Performs keypoint transform from a 7x7 gird on the source image to the target im
     """
     )
 
-    gr.TabbedInterface([main], ["Main"])
+    with gr.Row():
+        # Add an Image component to display the source image.
+        image1 = gr.Image(
+            shape=(240, 240),
+            type="pil",
+            label="Source Image",
+        )
+
+        # Add an Image component to display the target image.
+        image2 = gr.Image(
+            shape=(240, 240),
+            type="pil",
+            label="Target Image",
+        )
 
+    with gr.Row():
+        # Add a Slider component to adjust the minimum x-coordinate of the grid.
+        min_x = gr.Slider(
+            minimum=1,
+            maximum=240,
+            step=1,
+            default=15,
+            label="Min X",
+        )
 
-blocks.launch(
-    debug=True,
-    enable_queue=False,
-)
+        # Add a Slider component to adjust the maximum x-coordinate of the grid.
+        max_x = gr.Slider(
+            minimum=1,
+            maximum=240,
+            step=1,
+            default=215,
+            label="Max X",
+        )
+
+        # Add a Slider component to adjust the minimum y-coordinate of the grid.
+        min_y = gr.Slider(
+            minimum=1,
+            maximum=240,
+            step=1,
+            default=15,
+            label="Min Y",
+        )
+
+        # Add a Slider component to adjust the maximum y-coordinate of the grid.
+        max_y = gr.Slider(
+            minimum=1,
+            maximum=240,
+            step=1,
+            default=215,
+            label="Max Y",
+        )
+
+    with gr.Row():
+        output_plot = gr.Plot(
+            type="plot",
+            label="Output Plot",
+        )
+
+    gr.Examples(
+        [
+            ["./examples/sample1.jpeg", "./examples/sample2.jpeg", 17, 223, 17, 223],
+        ],
+        inputs=[
+            image1,
+            image2,
+            min_x,
+            max_x,
+            min_y,
+            max_y,
+        ],
+    )
+
+    # Add a Button component to run the app.
+    run_btn = gr.Button("Run")
+
+    run_btn.click(
+        generate_correspondences,
+        inputs=[image1, image2, min_x, max_x, min_y, max_y],
+        outputs=output_plot,
+    )
+
+    demo.launch(debug=True, enable_queue=False)

requirements.txt

@@ -1,4 +1,3 @@
-gradio==3.0.5
 pandas==1.3.4
 requests==2.26.0
 scipy==1.7.1