Merge remote-tracking branch 'origin/main'

# Conflicts:
# app.py
# density_gk.csv
# density_veytel.csv

app.py

@@ -104,6 +104,7 @@ def new__cxr(max_dense_0, max_dense_1, max_dense_2):
         label1.update(visible=False)
         count = 1
         image_id = 1
+        index = 1
         csv_content = ""
         for row in csv_data:
             csv_content += ",".join(row) + "\n"
@@ -129,17 +130,13 @@ def new__cxr(max_dense_0, max_dense_1, max_dense_2):
     thresh1 = 50
     thresh2 = 100
     thresh3 = 150
-    scaled_thresh1 = thresh1 * max_val / 255
-    scaled_thresh2 = thresh2 * max_val / 255
-    scaled_thresh3 = thresh3 * max_val / 255
-    dense_0 = np.where(textured_cxr < scaled_thresh1, textured_cxr, 0)
-    dense_1 = np.where(((textured_cxr < scaled_thresh2) & (textured_cxr >= scaled_thresh1)), textured_cxr, 0)
-    dense_2 = np.where(((textured_cxr < scaled_thresh3) & (textured_cxr >= scaled_thresh2)), textured_cxr, 0)
-    dense_3 = np.where(((textured_cxr < 255) & (textured_cxr >= scaled_thresh3)), textured_cxr, 0)
-
-    # Update the progress slider value
-    #progress_log.update(value=count)
-
+    scaled_thresh1 = thresh1 * max_val/255
+    scaled_thresh2 = thresh2 * max_val/255
+    scaled_thresh3 = thresh3 * max_val/255
+    dense_0 = np.where(textured_cxr<scaled_thresh1, textured_cxr, 0)
+    dense_1 = np.where(((textured_cxr<scaled_thresh2) & (textured_cxr>=scaled_thresh1)), textured_cxr, 0)
+    dense_2 = np.where(((textured_cxr<scaled_thresh3) & (textured_cxr>=scaled_thresh2)), textured_cxr, 0)
+    dense_3 = np.where(((textured_cxr<255) & (textured_cxr>=scaled_thresh3)), textured_cxr, 0)
     return cxr, textured_cxr, lung_noised, dense_0, dense_1, dense_2, dense_3, count
 
 
@@ -210,7 +207,7 @@ with gr.Blocks() as demo:
     dense_2 = np.where(((textured_cxr<scaled_thresh3) & (textured_cxr>=scaled_thresh2)), textured_cxr, 0)
     dense_3 = np.where(((textured_cxr<255) & (textured_cxr>=scaled_thresh3)), textured_cxr, 0)
     # open csv in append mode
-    with gr.Row():
+    with gr.Row():     
         with gr.Column():
             im1 = gr.Image(cxr, label="Original CXR")
         with gr.Column():
@@ -219,9 +216,7 @@ with gr.Blocks() as demo:
             im3 = gr.Image(lung_noised, label="Synthetic CXR")
         with gr.Column():
             label1 = gr.Label("Completed! Please close window", visible=False)
-            progress_log =  gr.Slider(1, 30, value=1, step = 1, label="progress")
-            button1 = gr.Button(value="Save & continue", visible=True)
-
+            
     with gr.Row():
         with gr.Column():
             dense0 = gr.Image(dense_0, label="Dense 0")
@@ -234,25 +229,32 @@ with gr.Blocks() as demo:
             with gr.Row():
                 min_dense_1 = gr.Textbox(value='50', label="Min")
                 max_dense_1 = gr.Slider(0, 255, value=100, step = 1, label="Max")
-                max_dense_0.change(set_min_dense_1, inputs=max_dense_0, outputs=[min_dense_1, dense0, dense1])
+                max_dense_0.change(set_min_dense_1, inputs=max_dense_0, outputs=[min_dense_1, dense0, dense1]).then(set_min_dense_1, inputs=max_dense_0, outputs=[min_dense_1, dense0, dense1])
 
+        with gr.Column():
+            progress_log =  gr.Slider(1, 30, value=1, step = 1, label="progress")
+            button1 = gr.Button(value="Save & continue", visible=True)
+
+    with gr.Row():
         with gr.Column():
             dense2 = gr.Image(dense_2, label="Dense 2")
             with gr.Row():
                 min_dense_2 = gr.Textbox(value='100', label="Min")
                 max_dense_2 = gr.Slider(0, 255, value=150, step = 1, label="Max")
-                max_dense_1.change(set_min_dense_2, inputs=max_dense_1, outputs=[min_dense_2, dense1, dense2])
+                max_dense_1.change(set_min_dense_2, inputs=max_dense_1, outputs=[min_dense_2, dense1, dense2]).then(set_min_dense_2, inputs=max_dense_1, outputs=[min_dense_2, dense1, dense2])
 
         with gr.Column():
             dense3 = gr.Image(dense_3, label="Dense 3")
             with gr.Row():
                 min_dense_3 = gr.Textbox(value='150', label="Min")
                 max_dense_3 = gr.Textbox(value='255', label="Max")
-                max_dense_2.change(set_min_dense_3, inputs=max_dense_2, outputs=[min_dense_3, dense2, dense3])
+                max_dense_2.change(set_min_dense_3, inputs=max_dense_2, outputs=[min_dense_3, dense2, dense3]).then(set_min_dense_3, inputs=max_dense_2, outputs=[min_dense_3, dense2, dense3])
 
-    button1.click(new__cxr, inputs = [max_dense_0, max_dense_1, max_dense_2], outputs = [im1, im2, im3, dense0, dense1, dense2, dense3, progress_log])
-    button1.click(change_vis,outputs=[label1, button1])
+        with gr.Column(): # adding additional for better visualization
+            im3_1 = gr.Image(lung_noised, label="Synthetic CXR")
 
+    button1.click(new__cxr, inputs = [max_dense_0, max_dense_1, max_dense_2], outputs = [im1, im2, im3, im3_1, dense0, dense1, dense2, dense3, progress_log])
+    button1.click(change_vis,outputs=[label1, button1])    
 if __name__ == "__main__":
     demo.launch(auth=check_auth)