Relative scales.

app.py

@@ -80,8 +80,8 @@ with gr.Blocks() as demo:
 
     local_slots = gr.State(np.zeros((11, 64), dtype=np.float32))
 
-    local_orig_pos = gr.State(np.zeros((11, 2), dtype=np.float32))
-    local_orig_scale = gr.State(np.zeros((11, 2), dtype=np.float32))
+    local_orig_pos = gr.State(np.ones((11, 2), dtype=np.float32))
+    local_orig_scale = gr.State(np.ones((11, 2), dtype=np.float32))
 
     local_pos = gr.State(np.zeros((11, 2), dtype=np.float32))
     local_scale = gr.State(np.zeros((11, 2), dtype=np.float32))
@@ -96,7 +96,7 @@ with gr.Blocks() as demo:
 
     with gr.Row():
 
-      with gr.Column(min_width=600):
+      with gr.Column():
 
         with gr.Row():
           with gr.Column():
@@ -108,10 +108,10 @@ with gr.Blocks() as demo:
         gr_slot_slider = gr.Slider(1, 11, value=1, step=1, label="Slot Index",
                                    info="Change slot index too see the segmentation mask, position and scale of each slot.")
 
-        gr_y_slider = gr.Slider(-1, 1, value=0, step=0.01, label="x")
-        gr_x_slider = gr.Slider(-1, 1, value=0, step=0.01, label="y")
-        gr_sy_slider = gr.Slider(0.01, 1, value=0.1, step=0.01, label="width")
-        gr_sx_slider = gr.Slider(0.01, 1, value=0.1, step=0.01, label="height")
+        gr_y_slider = gr.Slider(-1, 1, value=0, step=0.01, label="X")
+        gr_x_slider = gr.Slider(-1, 1, value=0, step=0.01, label="Y")
+        gr_sy_slider = gr.Slider(0.5, 1.5, value=1., step=0.1, label="Width Multiplier")
+        gr_sx_slider = gr.Slider(0.5, 1.5, value=1., step=0.1, label="Height Multiplier")
 
         with gr.Row():
           with gr.Column():
@@ -139,13 +139,13 @@ with gr.Blocks() as demo:
       scale = slots_[0, 0, :, -2:]
 
       return (img * 255).astype(np.uint8), (probs[idx] * 255).astype(np.uint8), float(pos[idx, 0]), \
-             float(pos[idx, 1]), float(scale[idx, 0]), float(scale[idx, 1]), probs, slots, pos, scale, pos, scale
+             float(pos[idx, 1]), probs, slots, pos, np.ones((11, 2), dtype=np.float32), pos, scale
 
     gr_choose_image.change(
        fn=update_image_and_segmentation,
        inputs=[gr_choose_image, gr_slot_slider],
-       outputs=[gr_image_1, gr_image_2, gr_x_slider, gr_y_slider, gr_sx_slider, gr_sy_slider,
-                local_probs, local_slots, local_pos, local_scale, local_orig_pos, local_orig_scale]
+       outputs=[gr_image_1, gr_image_2, gr_x_slider, gr_y_slider, local_probs,
+                local_slots, local_pos, local_scale, local_orig_pos, local_orig_scale]
     )
 
     def update_sliders(idx, local_probs, local_pos, local_scale):
@@ -200,10 +200,10 @@ with gr.Blocks() as demo:
        outputs=local_scale
     )
 
-    def render(idx, local_slots, local_pos, local_scale):
+    def render(idx, local_slots, local_pos, local_scale, local_orig_scale):
       idx = idx - 1
 
-      slots = np.concatenate([local_slots, local_pos, local_scale], axis=-1)
+      slots = np.concatenate([local_slots, local_pos, local_scale * local_orig_scale], axis=-1)
       slots = jnp.array(slots)
 
       out = decoder_model.apply(
@@ -219,18 +219,18 @@ with gr.Blocks() as demo:
 
     gr_button_render.click(
         fn=render,
-        inputs=[gr_slot_slider, local_slots, local_pos, local_scale],
+        inputs=[gr_slot_slider, local_slots, local_pos, local_scale, local_orig_scale],
         outputs=[gr_image_1, gr_image_2, local_probs]
     )
 
-    def reset(idx, local_orig_pos, local_orig_scale):
+    def reset(idx, local_orig_pos):
        idx = idx - 1
-       return np.copy(local_orig_pos), np.copy(local_orig_scale), float(local_orig_pos[idx, 0]), \
-              float(local_orig_pos[idx, 1]), float(local_orig_scale[idx, 0]), float(local_orig_scale[idx, 1])
+       return np.copy(local_orig_pos), np.ones((11, 2), dtype=np.float32), float(local_orig_pos[idx, 0]), \
+              float(local_orig_pos[idx, 1]), 1., 1.
 
     gr_button_reset.click(
         fn=reset,
-        inputs=[gr_slot_slider, local_orig_pos, local_orig_scale],
+        inputs=[gr_slot_slider, local_orig_pos],
         outputs=[local_pos, local_scale, gr_x_slider, gr_y_slider, gr_sx_slider, gr_sy_slider]
     )