Update app.py

app.py

@@ -1,10 +1,11 @@
 import streamlit as st
+from streamlit.components.v1 import html
 import numpy as np
 import pandas as pd
 import plotly.graph_objects as go
 from scipy.signal import square, sawtooth
 
-# Component configurations
+# Configuration for visual simulator
 DIODE_DROPS = {"Silicon": 0.7, "Germanium": 0.3, "Ideal": 0.0}
 COMPONENTS = {
     "AC Source": {"symbol": "~", "orientation": True},
@@ -13,7 +14,7 @@ COMPONENTS = {
     "Diode": {"symbol": "→", "orientation": True}
 }
 
-# Initialize session state
+# Initialize session state for visual simulator
 if "circuit" not in st.session_state:
     st.session_state.circuit = []
 if "connections" not in st.session_state:
@@ -90,8 +91,7 @@ def analyze_circuit():
         voltage = source["value"] - diode_drop
         current = voltage / total_resistance if total_resistance > 0 else 0
     else:
-        # AC analysis would require time-based simulation
-        pass
+        pass  # AC analysis placeholder
     
     return pd.DataFrame({
         "Total Voltage": [voltage],
@@ -100,82 +100,103 @@ def analyze_circuit():
         "Diode Drop": [diode_drop]
     })
 
-# Main UI
-st.title("🔌 Visual Circuit Simulator")
-st.markdown("Build your circuit by placing components and connecting them")
+# Main app
+st.title("Circuit Simulator Suite")
 
-# Toolbox
-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"
+# Create tabs
+tab1, tab2 = st.tabs(["CircuitJS Simulator", "Visual Circuit Simulator"])
 
-    if st.button("Add to Board"):
-        st.session_state.circuit.append({
-            "type": comp_type,
-            "value": value,
-            "subtype": subtype,
-            "orientation": orientation,
-            "position": [5, 5]
-        })
+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.
+    """)
 
-# Schematic Canvas
-st.subheader("Circuit Board")
-fig = draw_schematic()
-st.plotly_chart(fig, use_container_width=True)
+with tab2:
+    st.header("🔌 Visual Circuit Simulator")
+    st.markdown("Build your circuit by placing components and connecting them")
 
-# Simulation Controls
-if st.button("▶️ Run Analysis"):
-    results = analyze_circuit()
-    if not results.empty:
-        st.subheader("🔍 Analysis Results")
-        st.dataframe(results)
-        
-        # Waveform visualization
-        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)
+    # 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:
-                wave = sawtooth(2 * np.pi * 50 * t)
+                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]
+            })
+
+    st.subheader("Circuit Board")
+    fig = draw_schematic()
+    st.plotly_chart(fig, use_container_width=True)
+
+    if st.button("▶️ Run Analysis"):
+        results = analyze_circuit()
+        if not results.empty:
+            st.subheader("🔍 Analysis Results")
+            st.dataframe(results)
             
-            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")
+            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")
 
-# Instructions
-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
-    """)
+    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
+        """)