Update app.py

app.py

@@ -444,4 +444,72 @@ with gr.Blocks(theme=gr.themes.Soft(), title="CAD-Wizard") as demo:
                     gr.Markdown("### Obstacle (set all to 0 for none)")
                     cfd_ox1 = gr.Slider(0.0, 5.0, value=0.5, label="Obstacle X1")
                     cfd_oy1 = gr.Slider(0.0, 2.0, value=0.4, label="Obstacle Y1")
-                    cfd_ox2 = gr.Slider(0.0, 5.0, value=0
+                    cfd_ox2 = gr.Slider(0.0, 5.0, value=0.7, label="Obstacle X2")
+                    cfd_oy2 = gr.Slider(0.0, 2.0, value=0.6, label="Obstacle Y2")
+                    
+                    gr.Markdown("### Solver Settings")
+                    cfd_Nx = gr.Slider(31, 101, value=61, step=10, label="Grid Points (X)")
+                    cfd_Ny = gr.Slider(21, 81, value=41, step=10, label="Grid Points (Y)")
+                    
+                    cfd_button = gr.Button("Run Simulation", variant="primary")
+
+                with gr.Column(scale=2):
+                    cfd_plot_output = gr.Plot(label="CFD Results")
+                    cfd_summary_output = gr.Markdown(label="Simulation Summary")
+
+        # --- TAB 3: Text to CAD Model ---
+        with gr.TabItem("Text to CAD Model", id=2):
+            with gr.Row():
+                with gr.Column(scale=1):
+                    text_cad_input = gr.Textbox(lines=5, label="Describe the part you want to create", placeholder="e.g., A gear with radius 20 and thickness 5")
+                    text_cad_button = gr.Button("Generate CAD Model", variant="primary")
+                with gr.Column(scale=2):
+                    text_cad_drawing = gr.Plot(label="2D Technical Drawing")
+                    text_cad_3d_plot = gr.Plot(label="Interactive 3D Model")
+                    text_cad_file = gr.File(label="Download 3D Model (.stl)")
+            gr.Examples(
+                [["A plate with length 100, width 50, and thickness 10"],
+                 ["A pipe with radius 15, thickness 3 and length 120"]],
+                inputs=text_cad_input
+            )
+
+        # --- TAB 4: Text to G-Code ---
+        with gr.TabItem("Text to G-Code", id=3):
+            with gr.Row():
+                with gr.Column(scale=1):
+                    text_gcode_input = gr.Textbox(lines=5, label="Describe the 2D part to be cut", placeholder="A 150x75 plate with a 10mm hole at (30, 40)")
+                    text_gcode_button = gr.Button("Generate G-Code", variant="primary")
+                with gr.Column(scale=2):
+                    text_gcode_drawing = gr.Image(label="2D Part Drawing")
+                    text_gcode_output = gr.Code(label="Generated G-Code", language="gcode")
+                    text_gcode_file = gr.File(label="Download Drawing (.svg)")
+            gr.Examples(
+                [["A 100x50 plate with a 20mm hole at (50, 25) and a 10mm hole at (80, 25)"]],
+                inputs=text_gcode_input
+            )
+
+    # --- Button Click Handlers ---
+    cad_2d_button.click(generate_ortho_views, inputs=[cad_file_input], outputs=[cad_2d_output])
+    
+    cfd_button.click(run_cfd_simulation, 
+                     inputs=[cfd_Lx, cfd_Ly, cfd_Nx, cfd_Ny, cfd_u_in, cfd_rho, cfd_mu, cfd_ox1, cfd_oy1, cfd_ox2, cfd_oy2,
+                             gr.State(2000), gr.State(50), gr.State(1e-4)], 
+                     outputs=[cfd_plot_output, cfd_summary_output])
+
+    text_cad_button.click(text_to_cad_generator.run, 
+                          inputs=[text_cad_input], 
+                          outputs=[text_cad_drawing, text_cad_3d_plot, text_cad_file])
+
+    text_gcode_button.click(generate_text_to_gcode, 
+                            inputs=[text_gcode_input], 
+                            outputs=[text_gcode_drawing, text_gcode_output, text_gcode_file])
+
+
+if __name__ == "__main__":
+    # Create some example files for the first tab
+    if not os.path.exists("examples"):
+        os.makedirs("examples")
+    trimesh.creation.box(extents=[50,30,40]).export("examples/bracket.stl")
+    trimesh.creation.gear(tooth_number=12, radial_pitch=20).export("examples/gear.stl")
+
+    demo.launch()