cambios interfaz

app.py

@@ -51,11 +51,14 @@ def load_img(file):
     
     return sitk, mri_image
 
-def show_img(img, mri_slice):
+def show_img(img, mri_slice, update):
     fig = plt.figure()
     plt.imshow(img[mri_slice,:,:], cmap='gray')
     
-    return fig, gr.update(visible=True)
+    if update == True:
+        return fig, gr.update(visible=True), gr.update(visible=True)
+    else:
+        return fig
 
 # def show_brain(brain, brain_slice):
 #     fig = plt.figure()
@@ -63,13 +66,15 @@ def show_img(img, mri_slice):
     
 #     return fig, gr.update(visible=True)
 
-def process_img(img, brain_slice):
+def process_img(img, brain_slice, progress=gr.Progress()):
+    progress(880,desc="Processing...")
+    
     with tf.device("cpu:0"):
         brain = utils.brain_stripping(img, model_unet)
         
-        fig, update = show_img(brain, brain_slice)
+        fig, update_slider, _ = show_img(brain, brain_slice, update=True)
         
-    return brain, fig, update
+    return brain, fig, update_slider
 
 def clear():
     return gr.File.update(value=None), gr.Plot.update(value=None), gr.update(visible=False)
@@ -82,15 +87,9 @@ def clear():
 #                     # outputs='text'
 #                     )
 
-theme = gr.themes.Base(primary_hue="teal").set(block_background_fill="#235784",)
-
-css="""
-        () => {
-            document.body.classList.toggle('dark', shouldAdd);
-        }
-        """
+# theme = gr.themes.Base().load('css_new.json')
 
-with gr.Blocks(theme="base", css=css) as demo:
+with gr.Blocks(theme=gr.themes.Base()) as demo:
     with gr.Row():
         # gr.HTML(r"""<center><img src='https://user-images.githubusercontent.com/66338785/233529518-33e8bcdb-146f-49e8-94c4-27d6529ce4f7.png' width="30%" height="30%"></center>""")
         gr.HTML(r"""<center><img src='https://user-images.githubusercontent.com/66338785/233531457-f368e04b-5099-42a8-906d-6f1250ea0f1e.png' width="40%" height="40%"></center>""")
@@ -101,22 +100,40 @@ with gr.Blocks(theme="base", css=css) as demo:
     
     # Inputs
     with gr.Row():
-        with gr.Column(scale=1):
+        with gr.Column(variant="panel", scale=1):
+            gr.Markdown('<h2 style="text-align: center; color:#235784;">Patient Information</h2>')
             with gr.Tab("Personal data"):
                 # Objeto para subir archivo nifti
-                input_name = gr.Textbox(placeholder='Ingrese nombre del paciente', label='Name')
-                input_sex = gr.Dropdown(["Male", "Female"], label="Sex")
+                input_name = gr.Textbox(placeholder='Enter the patient name', label='Patient name')
                 input_age = gr.Number(label='Age')
+                input_phone_num = gr.Number(label='Phone number')
+                input_emer_name = gr.Textbox(placeholder='Enter the emergency contact name', label='Emergency contact name')
+                input_emer_phone_num = gr.Number(label='Emergency contact name phone number')
+                input_sex = gr.Dropdown(["Male", "Female"], label="Sex")
                 
             with gr.Tab("Clinical data"):
                 input_MMSE = gr.Number(label='MMSE')
                 input_GDSCALE = gr.Number(label='GDSCALE')
                 input_CDR = gr.Number(label='Global CDR')
                 input_FAQ = gr.Number(label='FAQ Total Score')
-                input_NPI_Q = gr.Number(label='NPI-Q Total Score')
-            
-            input_file = gr.File(file_count="single", file_type=[".nii"], label="Archivo Imagen MRI")
+                input_NPI_Q = gr.Number(label='NPI-Q Total Score')      
                 
+            with gr.Tab("Vital Signs"):
+                input_Diastolic_blood_pressure = gr.Number(label='Diastolic Blood Pressure(mm Hg)')
+                input_Systolic_blood_pressure = gr.Number(label='Systolic Blood Pressure(mm Hg)')
+                input_Body_heigth = gr.Number(label='Body heigth (cm)')
+                input_Body_weight = gr.Number(label='Body weigth (kg)')
+                input_Heart_rate = gr.Number(label='Heart rate (bpm)')
+                input_Respiratory_rate = gr.Number(label='Respiratory rate (bpm)')
+                input_Body_temperature = gr.Number(label='Body temperature (°C)')
+                input_Pluse_oximetry = gr.Number(label='Pluse oximetry (%)')
+                
+            with gr.Tab("Medications"):
+                input_medications = gr.Textbox(label='Medications', lines=5)
+                input_allergies = gr.Textbox(label='Allergies', lines=5)
+             
+            input_file = gr.File(file_count="single", label="MRI Image File (.nii)")
+            
             with gr.Row():
                 # Botón para cargar imagen
                 load_img_button = gr.Button(value="Load")
@@ -125,10 +142,12 @@ with gr.Blocks(theme="base", css=css) as demo:
                 clear_button = gr.Button(value="Clear")
             
             # Botón para procesar imagen
-            process_button = gr.Button(value="Procesar")
+            process_button = gr.Button(value="Procesar", visible=False)
     
         # Outputs 
-        with gr.Column(scale=1):
+        with gr.Column(variant="panel", scale=1):
+            gr.Markdown('<h2 style="text-align: center; color:#235784;">MRI visualization</h2>')
+            
             # Plot para imágen original
             plot_img_original = gr.Plot(label="Imagen MRI original")
             
@@ -141,7 +160,7 @@ with gr.Blocks(theme="base", css=css) as demo:
                                     visible=False) 
 
             # Plot para imágen procesada
-            plot_brain = gr.Plot(label="Imagen MRI procesada")
+            plot_brain = gr.Plot(label="Imagen MRI procesada", visible=True)
             
             # Slider para imágen procesada
             brain_slider = gr.Slider(minimum=0,
@@ -158,16 +177,19 @@ with gr.Blocks(theme="base", css=css) as demo:
     original_input_img = gr.State()
     brain_img = gr.State()
     
+    update_true = gr.State(True)
+    update_false = gr.State(False)
+    
     # Cambios
     # Cargar imagen nueva
     input_file.change(load_img, 
                       input_file, 
-                      [original_input_sitk, original_input_img],)
+                      [original_input_sitk, original_input_img])
     
     # Mostrar imagen nueva
     load_img_button.click(show_img, 
-                          [original_input_img, mri_slider], 
-                          [plot_img_original, mri_slider])
+                          [original_input_img, mri_slider, update_true], 
+                          [plot_img_original, mri_slider, process_button])
     
     # Limpiar campos
     clear_button.click(fn=clear, 
@@ -175,8 +197,8 @@ with gr.Blocks(theme="base", css=css) as demo:
     
     # Actualizar imagen original
     mri_slider.change(show_img, 
-                      [original_input_img, mri_slider], 
-                      [plot_img_original,mri_slider])
+                      [original_input_img, mri_slider, update_false], 
+                      [plot_img_original])
     
     # Procesar imagen
     process_button.click(fn=process_img, 
@@ -185,11 +207,12 @@ with gr.Blocks(theme="base", css=css) as demo:
     
     # Actualizar imagen procesada
     brain_slider.change(show_img,
-                        [brain_img, brain_slider], 
-                        [plot_brain,brain_slider])
+                        [brain_img, brain_slider, update_false], 
+                        [plot_brain])
 
 
 if __name__ == "__main__":
+    demo.queue(concurrency_count=20)
     demo.launch()
 
 # # Visualización resultados 

requirements.txt

@@ -1,4 +1,4 @@
-gradio==3.27.0
+gradio==3.28.3
 keras==2.10.0
 matplotlib==3.5.2
 numpy==1.21.5