Update app.py

app.py

@@ -227,12 +227,26 @@ with gradio.Blocks() as demo:
             with gradio.Column():
                 download = gradio.HTML("<a href=\"https://huggingface.co/spaces/cmudrc/wecnet/resolve/main/McComb2019_Chapter_TowardTheRapidDesignOfEngineer.pdf\" style=\"width: 60%; display: block; margin: auto;\"><img src=\"https://huggingface.co/spaces/cmudrc/wecnet/resolve/main/coverpage.png\"></a>")
     
-    with gradio.Tab("Analysis"):
-        with gradio.Tab("Spectrum from Dataset"):                    
+    
+    
+    with gradio.Tab("Analysis"):        
+        with gradio.Tab("Geometry from Dataset"):                 
             with gradio.Row():
                 with gradio.Column():
-                    num = gradio.Number(42, label="data index")
-                    btn1 = gradio.Button("Select")    
+                    with gradio.Row("Label"):
+                        num = gradio.Number(42, label="data index")
+                        btn1 = gradio.Button("Select")    
+                    with gradio.Row():                        
+                        radio = gradio.Radio(
+                            ["box", "cone", "cylinder", "sphere", "wedge"], label="What kind of shape would you like to generate?", value="box"
+                        )
+                        height = gradio.Slider(label="Height", interactive=True, minimum=3.0, maximum=10.0, value=6.5)
+                        width = gradio.Slider(label="Width", interactive=True, minimum=3.0, maximum=10.0, value=6.5)
+                        diameter = gradio.Slider(label="Diameter", interactive=True, minimum=3.0, maximum=10.0, value=6.5, visible=False)
+                        length = gradio.Slider(label="Length", interactive=True, minimum=3.0, maximum=10.0, value=6.5)
+                    
+                        radio.change(fn=change_textbox, inputs=radio, outputs=[height, width, diameter, length])                      
+                        
                 with gradio.Column():
                     geo = gradio.Plot(label="Geometry")
         
@@ -248,21 +262,39 @@ with gradio.Blocks() as demo:
         
             btn1.click(fn=geometry, inputs=[num], outputs=[geo])
             btn2.click(fn=simple_analysis, inputs=[num], outputs=[pred, true])
-            
-        with gradio.Tab("Spectrum from DataFrame"):
+                 
+        with gradio.Tab("Geometry from Parameters"):
             with gradio.Row():
-                perf = gradio.Timeseries(x="Frequency", y=['Surge', 'Heave', 'Pitch'], label="Performance")
+                with gradio.Column():
+                    radio = gradio.Radio(
+                        ["box", "cone", "cylinder", "sphere", "wedge"], label="What kind of shape would you like to generate?", value="box"
+                    )
+                    height = gradio.Slider(label="Height", interactive=True, minimum=3.0, maximum=10.0, value=6.5)
+                    width = gradio.Slider(label="Width", interactive=True, minimum=3.0, maximum=10.0, value=6.5)
+                    diameter = gradio.Slider(label="Diameter", interactive=True, minimum=3.0, maximum=10.0, value=6.5, visible=False)
+                    length = gradio.Slider(label="Length", interactive=True, minimum=3.0, maximum=10.0, value=6.5)
+                
+                    radio.change(fn=change_textbox, inputs=radio, outputs=[height, width, diameter, length])
+                  
+                with gradio.Column():
+                    geo = gradio.Plot(label="Geometry")
         
             with gradio.Row():
-                btn2 = gradio.Button("Synthesize Geometry")
+                btn2 = gradio.Button("Estimate Spectrum")
         
             with gradio.Row():
-                pred = gradio.Plot(label="Predicted")
+              with gradio.Column():
+                  pred = gradio.Timeseries(x="Frequency", y=['Surge', 'Heave', 'Pitch'], label="Predicted")
         
-            btn2.click(fn=synthesis_from_spectrum, inputs=[perf], outputs=[pred])
+              with gradio.Column():
+                  true = gradio.Timeseries(x="Frequency", y=['Surge', 'Heave', 'Pitch'], label="True")
+        
+            btn1.click(fn=geometry, inputs=[num], outputs=[geo])
+            btn2.click(fn=simple_analysis, inputs=[num], outputs=[pred, true])
     
-    with gradio.Tab("Synthesis"):        
-        with gradio.Tab("Geometry from Dataset"):                    
+    with gradio.Tab("Synthesis"):
+        with gradio.Tab("Spectrum from Dataset"):    
+                      
             with gradio.Row():
                 with gradio.Column():
                     num = gradio.Number(42, label="data index")
@@ -282,33 +314,16 @@ with gradio.Blocks() as demo:
         
             btn1.click(fn=performance, inputs=[num], outputs=[perf])
             btn2.click(fn=simple_synthesis, inputs=[num], outputs=[pred, true])
-        with gradio.Tab("Geometry from Parameters"):
+        with gradio.Tab("Spectrum from DataFrame"):
             with gradio.Row():
-                with gradio.Column():
-                    radio = gradio.Radio(
-                        ["box", "cone", "cylinder", "sphere", "wedge"], label="What kind of shape would you like to generate?", value="box"
-                    )
-                    height = gradio.Slider(label="Height", interactive=True, minimum=3.0, maximum=10.0, value=6.5)
-                    width = gradio.Slider(label="Width", interactive=True, minimum=3.0, maximum=10.0, value=6.5)
-                    diameter = gradio.Slider(label="Diameter", interactive=True, minimum=3.0, maximum=10.0, value=6.5, visible=False)
-                    length = gradio.Slider(label="Length", interactive=True, minimum=3.0, maximum=10.0, value=6.5)
-                
-                    radio.change(fn=change_textbox, inputs=radio, outputs=[height, width, diameter, length])
-                  
-                with gradio.Column():
-                    geo = gradio.Plot(label="Geometry")
+                perf = gradio.Timeseries(x="Frequency", y=['Surge', 'Heave', 'Pitch'], label="Performance")
         
             with gradio.Row():
-                btn2 = gradio.Button("Estimate Spectrum")
+                btn2 = gradio.Button("Synthesize Geometry")
         
             with gradio.Row():
-              with gradio.Column():
-                  pred = gradio.Timeseries(x="Frequency", y=['Surge', 'Heave', 'Pitch'], label="Predicted")
-        
-              with gradio.Column():
-                  true = gradio.Timeseries(x="Frequency", y=['Surge', 'Heave', 'Pitch'], label="True")
+                pred = gradio.Plot(label="Predicted")
         
-            btn1.click(fn=geometry, inputs=[num], outputs=[geo])
-            btn2.click(fn=simple_analysis, inputs=[num], outputs=[pred, true])
+            btn2.click(fn=synthesis_from_spectrum, inputs=[perf], outputs=[pred])
     
 demo.launch()