Update app.py

app.py

@@ -33,18 +33,66 @@ def calculate_directivity_and_gain(frequency):
     realized_gain = directivity - 1.5  # Efficiency loss
     return directivity, realized_gain
 
-def radiation_pattern(theta, frequency):
-    gain = 10 * np.log10(np.abs(np.sin(np.radians(theta))) + 1e-9)
+def radiation_pattern(theta, frequency, antenna_type):
+    if antenna_type == "Microstrip Patch":
+        gain = 10 * np.log10(np.abs(np.sin(np.radians(theta))) + 1e-9) * frequency / 1e9
+    elif antenna_type == "Dipole":
+        gain = 10 * np.log10(np.abs(np.cos(np.radians(theta))) ** 2 + 1e-9)
     return gain
 
 # Graphing Functions
 def plot_3d_microstrip_patch(patch_length, patch_width, thickness):
     fig = go.Figure()
+
+    # Substrate
+    fig.add_trace(go.Surface(
+        z=[[0, 0], [0, 0]], 
+        x=[[0, patch_width], [0, patch_width]],
+        y=[[0, 0], [patch_length, patch_length]],
+        colorscale="Blues", name="Substrate"
+    ))
+
+    # Patch (on upper layer of substrate)
     fig.add_trace(go.Surface(
-        z=[[0, 0], [0, 0]], x=[[0, patch_width], [0, patch_width]],
-        y=[[0, 0], [patch_length, patch_length]], colorscale="Viridis", name="Patch"
+        z=[[thickness, thickness], [thickness, thickness]],
+        x=[[0, patch_width], [0, patch_width]],
+        y=[[0, 0], [patch_length, patch_length]],
+        colorscale="Viridis", name="Radiation Patch"
     ))
-    fig.update_layout(title="3D Microstrip Patch Antenna")
+
+    # Ground (on lower layer of substrate)
+    fig.add_trace(go.Surface(
+        z=[[-thickness, -thickness], [-thickness, -thickness]],
+        x=[[0, patch_width], [0, patch_width]],
+        y=[[0, 0], [patch_length, patch_length]],
+        colorscale="Greens", name="Ground Plane"
+    ))
+
+    fig.update_traces(showscale=False)
+    fig.update_layout(title="3D Microstrip Patch Antenna", showlegend=True)
+    return fig
+
+def plot_3d_dipole(dipole_length):
+    fig = go.Figure()
+
+    # Dipole elements
+    fig.add_trace(go.Scatter3d(
+        x=[0, dipole_length / 2, 0, -dipole_length / 2],
+        y=[0, 0, 0, 0],
+        z=[0, 0, 0, 0],
+        mode="lines+markers",
+        line=dict(color="blue", width=5),
+        name="Dipole Elements"
+    ))
+
+    fig.update_layout(
+        title="3D Dipole Antenna",
+        scene=dict(
+            xaxis_title="X-axis",
+            yaxis_title="Y-axis",
+            zaxis_title="Z-axis"
+        )
+    )
     return fig
 
 def plot_s11_graph(frequencies, s11_values):
@@ -71,44 +119,35 @@ def plot_radiation_pattern(theta, gain_pattern):
 def design_antenna(antenna_type, frequency, permittivity, thickness, tangent_loss, impedance):
     frequency_hz = frequency * 1e9
     frequencies = np.linspace(frequency - 0.5, frequency + 0.5, 100) * 1e9  # Adjust to Hz
+    theta = np.linspace(-180, 180, 360)
 
     if antenna_type == "Microstrip Patch":
         patch_length, patch_width, thickness, tangent_loss = calculate_microstrip_patch(
             frequency_hz, permittivity, thickness, tangent_loss
         )
-        s11_values = [calculate_s11(f) for f in frequencies]
-        directivities, gains = zip(*[calculate_directivity_and_gain(f) for f in frequencies])
-        theta = np.linspace(-180, 180, 360)
-        gain_pattern = radiation_pattern(theta, frequency_hz)
-        s11_graph = plot_s11_graph(frequencies / 1e9, s11_values)  # Convert to GHz
-        directivity_gain_graph = plot_directivity_and_gain(frequencies / 1e9, directivities, gains)
-        radiation_graph = plot_radiation_pattern(theta, gain_pattern)
+        radiation_gain = radiation_pattern(theta, frequency_hz, antenna_type)
         antenna_3d = plot_3d_microstrip_patch(patch_length, patch_width, thickness)
-
         output = (
-            f"Design Type: Microstrip Patch Antenna\n"
-            f"Operating Frequency: {frequency:.2f} GHz\n"
+            f"Microstrip Patch Antenna\n"
             f"Patch Dimensions: {patch_length:.3f} m x {patch_width:.3f} m x {thickness:.3f} m\n"
             f"Tangent Loss: {tangent_loss}\n"
             f"Input Impedance: {impedance} Ohms"
         )
     elif antenna_type == "Dipole":
         dipole_length = calculate_dipole(frequency_hz)
-        s11_values = [calculate_s11(f) for f in frequencies]
-        directivities, gains = zip(*[calculate_directivity_and_gain(f) for f in frequencies])
-        theta = np.linspace(-180, 180, 360)
-        gain_pattern = radiation_pattern(theta, frequency_hz)
-        s11_graph = plot_s11_graph(frequencies / 1e9, s11_values)  # Convert to GHz
-        directivity_gain_graph = plot_directivity_and_gain(frequencies / 1e9, directivities, gains)
-        radiation_graph = plot_radiation_pattern(theta, gain_pattern)
-        antenna_3d = None  # No 3D visualization for dipole
-
+        radiation_gain = radiation_pattern(theta, frequency_hz, antenna_type)
+        antenna_3d = plot_3d_dipole(dipole_length)
         output = (
-            f"Design Type: Dipole Antenna\n"
-            f"Operating Frequency: {frequency:.2f} GHz\n"
+            f"Dipole Antenna\n"
             f"Dipole Length: {dipole_length:.3f} m\n"
             f"Input Impedance: {impedance} Ohms"
         )
+
+    s11_values = [calculate_s11(f) for f in frequencies]
+    directivities, gains = zip(*[calculate_directivity_and_gain(f) for f in frequencies])
+    s11_graph = plot_s11_graph(frequencies / 1e9, s11_values)
+    directivity_gain_graph = plot_directivity_and_gain(frequencies / 1e9, directivities, gains)
+    radiation_graph = plot_radiation_pattern(theta, radiation_gain)
     
     return output, s11_graph, directivity_gain_graph, radiation_graph, antenna_3d