Update app.py

app.py

@@ -5,198 +5,95 @@ import pandas as pd
 import plotly.graph_objects as go
 from scipy.signal import square, sawtooth
 
-# Configuration for visual simulator
-DIODE_DROPS = {"Silicon": 0.7, "Germanium": 0.3, "Ideal": 0.0}
-COMPONENTS = {
-    "AC Source": {"symbol": "~", "orientation": True},
-    "DC Source": {"symbol": "⎓", "orientation": True},
-    "Resistor": {"symbol": "⬦", "orientation": True},
-    "Diode": {"symbol": "→", "orientation": True}
-}
+# Title of the app
+st.title("Circuit Simulator with Waveform Analysis")
 
-# Initialize session state for visual simulator
-if "circuit" not in st.session_state:
-    st.session_state.circuit = []
-if "connections" not in st.session_state:
-    st.session_state.connections = []
-if "selected_component" not in st.session_state:
-    st.session_state.selected_component = None
+# Embed CircuitJS1
+st.header("Build Your Circuit")
+circuitjs_html = """
+<div>
+    <iframe src="https://www.falstad.com/circuit/circuitjs.html" 
+            width="100%" 
+            height="600px" 
+            style="border:none;">
+    </iframe>
+</div>
+"""
+html(circuitjs_html, height=600)
 
-def draw_schematic():
-    fig = go.Figure()
-    
-    # Draw components
-    for idx, comp in enumerate(st.session_state.circuit):
-        x = comp["position"][0]
-        y = comp["position"][1]
-        fig.add_annotation(
-            x=x,
-            y=y,
-            text=COMPONENTS[comp["type"]]["symbol"],
-            showarrow=False,
-            font=dict(size=20),
-            xref="x",
-            yref="y"
-        )
-        if comp["type"] == "Diode":
-            fig.add_annotation(
-                x=x,
-                y=y,
-                text="|" if comp["orientation"] == "reverse" else "",
-                showarrow=False,
-                font=dict(size=20),
-                xshift=10
-            )
-    
-    # Draw connections
-    for connection in st.session_state.connections:
-        fig.add_trace(go.Scatter(
-            x=[connection[0][0], connection[1][0]],
-            y=[connection[0][1], connection[1][1]],
-            mode="lines",
-            line=dict(color="black", width=2)
-        ))
-    
-    fig.update_layout(
-        xaxis=dict(visible=False, range=[0, 10]),
-        yaxis=dict(visible=False, range=[0, 10]),
-        margin=dict(l=0, r=0, t=0, b=0),
-        height=400
-    )
-    return fig
+# Add a description or instructions
+st.markdown("""
+### Instructions:
+1. Use the CircuitJS1 simulator above to design and simulate electrical circuits.
+2. You can add components, connect them, and simulate the circuit in real-time.
+3. Explore the menu options in CircuitJS1 for advanced features.
+""")
+
+# Analysis and Waveform Section
+st.header("Circuit Analysis and Waveform Visualization")
 
+# Dummy analysis function (replace with actual analysis logic)
 def analyze_circuit():
-    # Simplified circuit analysis (series only)
-    voltage = 0
-    current = 0
-    results = []
-    
-    if not st.session_state.circuit:
-        return pd.DataFrame()
-    
-    # Find power source
-    source = next((c for c in st.session_state.circuit if c["type"] in ["AC Source", "DC Source"]), None)
-    if not source:
-        return pd.DataFrame()
-    
-    # Calculate parameters
-    total_resistance = sum(c["value"] for c in st.session_state.circuit if c["type"] == "Resistor")
-    diode_drop = 0
-    for comp in st.session_state.circuit:
-        if comp["type"] == "Diode":
-            if comp["orientation"] == "forward":
-                diode_drop += DIODE_DROPS[comp["subtype"]]
-    
-    if source["type"] == "DC Source":
-        voltage = source["value"] - diode_drop
-        current = voltage / total_resistance if total_resistance > 0 else 0
-    else:
-        pass  # AC analysis placeholder
-    
+    # Placeholder for analysis logic
+    # For now, we'll return dummy data
     return pd.DataFrame({
-        "Total Voltage": [voltage],
-        "Current": [current],
-        "Resistance": [total_resistance],
-        "Diode Drop": [diode_drop]
+        "Total Voltage (V)": [5.0],
+        "Current (A)": [0.01],
+        "Resistance (Ω)": [500],
+        "Diode Drop (V)": [0.7]
     })
 
-# Main app
-st.title("Circuit Simulator Suite")
-
-# Create tabs
-tab1, tab2 = st.tabs(["CircuitJS Simulator", "Visual Circuit Simulator"])
-
-with tab1:
-    st.header("Interactive Circuit Simulator (CircuitJS1)")
-    circuitjs_html = """
-    <div>
-        <iframe src="https://www.falstad.com/circuit/circuitjs.html" 
-                width="100%" 
-                height="600px" 
-                style="border:none;">
-        </iframe>
-    </div>
-    """
-    html(circuitjs_html, height=600)
-    st.markdown("""
-    ### Instructions:
-    1. Use the CircuitJS1 simulator above to design and simulate electrical circuits.
-    2. You can add components, connect them, and simulate the circuit in real-time.
-    3. Explore the menu options in CircuitJS1 for advanced features.
-    """)
-
-with tab2:
-    st.header("🔌 Visual Circuit Simulator")
-    st.markdown("Build your circuit by placing components and connecting them")
-
-    # Visual simulator components
-    with st.expander("🛠️ Component Toolbox"):
-        col1, col2, col3 = st.columns(3)
-        with col1:
-            comp_type = st.selectbox("Component Type", list(COMPONENTS.keys()))
-        with col2:
-            if comp_type in ["Resistor"]:
-                value = st.number_input("Value (Ω)", 1, 1000, 1000)
-            elif comp_type in ["DC Source"]:
-                value = st.number_input("Voltage (V)", 1.0, 24.0, 5.0)
-            else:
-                value = None
-        with col3:
-            if comp_type == "Diode":
-                subtype = st.selectbox("Diode Type", list(DIODE_DROPS.keys()))
-                orientation = st.selectbox("Orientation", ["forward", "reverse"])
-            else:
-                subtype = None
-                orientation = "forward"
-
-        if st.button("Add to Board"):
-            st.session_state.circuit.append({
-                "type": comp_type,
-                "value": value,
-                "subtype": subtype,
-                "orientation": orientation,
-                "position": [5, 5]
-            })
+# Waveform generation function
+def generate_waveform(waveform_type):
+    t = np.linspace(0, 0.05, 1000)  # Time vector
+    if waveform_type == "Sine":
+        wave = np.sin(2 * np.pi * 50 * t)  # 50 Hz sine wave
+    elif waveform_type == "Square":
+        wave = square(2 * np.pi * 50 * t)  # 50 Hz square wave
+    elif waveform_type == "Triangular":
+        wave = sawtooth(2 * np.pi * 50 * t)  # 50 Hz triangular wave
+    else:
+        wave = np.zeros_like(t)  # Default to zero
+    return t, wave
 
-    st.subheader("Circuit Board")
-    fig = draw_schematic()
-    st.plotly_chart(fig, use_container_width=True)
+# Run Analysis Button
+if st.button("▶️ Run Analysis"):
+    # Perform circuit analysis
+    results = analyze_circuit()
+    
+    # Display analysis results
+    st.subheader("🔍 Analysis Results")
+    st.dataframe(results)
 
-    if st.button("▶️ Run Analysis"):
-        results = analyze_circuit()
-        if not results.empty:
-            st.subheader("🔍 Analysis Results")
-            st.dataframe(results)
-            
-            if "AC Source" in [c["type"] for c in st.session_state.circuit]:
-                st.subheader("📈 Waveform Visualization")
-                waveform_type = st.selectbox("Select Waveform Type", ["Sine", "Square", "Triangular"])
-                t = np.linspace(0, 0.05, 1000)
-                if waveform_type == "Sine":
-                    wave = np.sin(2 * np.pi * 50 * t)
-                elif waveform_type == "Square":
-                    wave = square(2 * np.pi * 50 * t)
-                else:
-                    wave = sawtooth(2 * np.pi * 50 * t)
-                
-                fig_wave = go.Figure()
-                fig_wave.add_trace(go.Scatter(x=t, y=wave))
-                st.plotly_chart(fig_wave)
-        else:
-            st.error("Invalid circuit configuration")
+    # Waveform visualization
+    st.subheader("📈 Waveform Visualization")
+    waveform_type = st.selectbox("Select Waveform Type", ["Sine", "Square", "Triangular"])
+    t, wave = generate_waveform(waveform_type)
+    
+    # Plot waveform
+    fig = go.Figure()
+    fig.add_trace(go.Scatter(x=t, y=wave, mode="lines", name=waveform_type))
+    fig.update_layout(
+        title=f"{waveform_type} Waveform",
+        xaxis_title="Time (s)",
+        yaxis_title="Amplitude",
+        template="plotly_white"
+    )
+    st.plotly_chart(fig)
 
-    with st.expander("❓ How to use"):
-        st.markdown("""
-        1. **Add Components**:
-           - Select component type and parameters
-           - Click 'Add to Board'
-           - Drag components on the canvas (positioning not fully implemented)
-           
-        2. **Connect Components**:
-           - Click on component terminals to connect them
-           - Create complete circuits with power sources
-           
-        3. **Run Analysis**:
-           - Get voltage, current, and resistance values
-           - View waveforms for AC circuits
-        """)
+# Instructions for Analysis
+with st.expander("❓ How to use"):
+    st.markdown("""
+    1. **Build Your Circuit**:
+       - Use the CircuitJS1 simulator above to design your circuit.
+       - Add components like resistors, capacitors, diodes, etc.
+       - Simulate the circuit to ensure it works as expected.
+       
+    2. **Run Analysis**:
+       - Click the "Run Analysis" button to get the circuit's electrical properties.
+       - View the observation table for voltage, current, and resistance.
+       
+    3. **Waveform Visualization**:
+       - Select a waveform type (Sine, Square, Triangular) to visualize.
+       - The waveform will be displayed based on the circuit's AC behavior.
+    """)