Update app.py

app.py

@@ -1,59 +1,73 @@
 import gradio as gr
 import numpy as np
 import matplotlib.pyplot as plt
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.ShapeFactory import make_box
-
-# Function to process the STEP file
-def process_step_file(step_file):
-    try:
-        # Load STEP file using pythonOCC
-        step_path = step_file.name
-        shape = read_step_file(step_path)
-        
-        # Generate G-code (simple mock-up)
-        gcode = "G21 ; Set units to millimeters\n"
-        gcode += "G17 ; Select XY plane\n"
-        gcode += "G90 ; Absolute positioning\n"
-        gcode += "G0 Z5 ; Move Z axis up\n"
-        gcode += "G0 X0 Y0 ; Move to origin\n"
-        gcode += "G1 Z-1 F100 ; Start cutting\n"
-        gcode += "G1 X10 Y0 F200 ; Linear move\n"
-        gcode += "G1 X10 Y10 ; Linear move\n"
-        gcode += "G1 X0 Y10 ; Linear move\n"
-        gcode += "G1 X0 Y0 ; Return to origin\n"
-        gcode += "G0 Z5 ; Move Z axis up\n"
-        gcode += "M30 ; End of program"
-        
-        # 2D Visualization (simple projection using matplotlib)
-        fig, ax = plt.subplots()
-        ax.plot([0, 10, 10, 0, 0], [0, 0, 10, 10, 0], marker="o")  # Basic square for placeholder
-        ax.set_title("2D Visualization (Placeholder)")
-        ax.set_xlabel("X Axis")
-        ax.set_ylabel("Y Axis")
-        plt_path = "2d_visualization.png"
-        plt.savefig(plt_path)
-        
-        # Return 2D Visualization image, G-code, and a simple 3D SVG (for demonstration)
-        return plt_path, "Projection.svg", gcode
-    except Exception as e:
-        return f"Error: {str(e)}", None, None
+from matplotlib.patches import Rectangle, Ellipse
+
+# Function for basic G-code generation (simple circles and rectangles)
+def generate_gcode(shape_type, size):
+    gcode = []
+
+    if shape_type == "Circle":
+        # Generate a simple circle G-code (assuming radius as size)
+        gcode.append(f"G17 G21 G90")  # Select XY plane, units in mm, absolute positioning
+        gcode.append(f"G0 Z5.0")  # Move tool to safe height
+        gcode.append(f"G0 X0 Y0")  # Move to start position
+        gcode.append(f"G2 X0 Y0 I{size} J0")  # Circle in clockwise direction
+        gcode.append(f"G0 Z5.0")  # Return to safe height
+
+    elif shape_type == "Rectangle":
+        # Generate a simple rectangle G-code (using size for length and width)
+        width, height = size, size / 2
+        gcode.append(f"G17 G21 G90")  # Select XY plane, units in mm, absolute positioning
+        gcode.append(f"G0 Z5.0")  # Move tool to safe height
+        gcode.append(f"G0 X0 Y0")  # Move to start position
+        gcode.append(f"G1 X{width} Y0")  # Move to the right side of the rectangle
+        gcode.append(f"G1 X{width} Y{height}")  # Move upwards
+        gcode.append(f"G1 X0 Y{height}")  # Move to the left side
+        gcode.append(f"G1 X0 Y0")  # Close the rectangle
+        gcode.append(f"G0 Z5.0")  # Return to safe height
+
+    return "\n".join(gcode)
+
+# Function for 2D Visualization
+def visualize_2d(shape_type, size):
+    fig, ax = plt.subplots()
+
+    if shape_type == "Circle":
+        # Visualize a circle
+        circle = Ellipse((0, 0), width=2*size, height=2*size, edgecolor='blue', facecolor='none')
+        ax.add_patch(circle)
+
+    elif shape_type == "Rectangle":
+        # Visualize a rectangle
+        width, height = size, size / 2
+        rect = Rectangle((-width/2, -height/2), width, height, linewidth=2, edgecolor='green', facecolor='none')
+        ax.add_patch(rect)
+
+    ax.set_xlim(-size*1.5, size*1.5)
+    ax.set_ylim(-size*1.5, size*1.5)
+    ax.set_aspect('equal', 'box')
+    plt.grid(True)
+    plt.title(f"2D Visualization: {shape_type}")
+    return fig
 
 # Gradio Interface
-with gr.Blocks() as app:
-    gr.Markdown("# STEP File Processor: G-code Generator & Visualizer")
-    
-    # Upload Section
-    step_input = gr.File(label="Upload STEP File (.step)")
-    submit_btn = gr.Button("Submit")
-    
-    # Outputs
-    gcode_output = gr.Textbox(label="Generated G-code")
-    visualization_2d = gr.Image(label="2D Visualization")
-    visualization_3d = gr.HTML(label="3D Projection (SVG)")
-
-    # Events
-    submit_btn.click(process_step_file, inputs=step_input, outputs=[visualization_2d, visualization_3d, gcode_output])
-
-# Launch the Gradio app
-app.launch(share=True)
+def interface(shape_type, size):
+    # Generate G-code and visualization
+    gcode = generate_gcode(shape_type, size)
+    fig = visualize_2d(shape_type, size)
+    return gcode, fig
+
+# Define Gradio Interface
+gr.Interface(
+    fn=interface, 
+    inputs=[
+        gr.Dropdown(choices=["Circle", "Rectangle"], label="Shape Type"),
+        gr.Slider(minimum=1, maximum=100, step=0.1, label="Size")
+    ], 
+    outputs=[
+        gr.Textbox(label="G-code Output", lines=20),
+        gr.Plot(label="2D Visualization")
+    ], 
+    live=True
+).launch()