Update app.py

app.py

@@ -1,15 +1,16 @@
 import streamlit as st
-import matplotlib.pyplot as plt
 import numpy as np
+import pandas as pd
 
 from core import simulate_loudspeaker
-from visualization import plot_loudspeaker_response
+from visualization import plotly_full_figure
 from config import (
     load_config,
     load_loudspeaker_config,
-    AcousticalConstantsConfig,
 )
 
+st.set_page_config(layout="wide")
+
 config_path = "configs/config.yaml"
 default_loudspeaker_path = "configs/default_loudspeaker.yaml"
 
@@ -22,113 +23,229 @@ freq_array = np.logspace(
 
 angular_freq_array = 2 * np.pi * freq_array
 
-st.sidebar.title("Thiele Small parameters")
-
-### Sliders
-slider_Re = st.sidebar.slider(
-    "Electrical Coil Resistance (Re) [Ohm]",
-    0.0,
-    10.0,
-    loudspeaker_cfg.electrical.coil_resistance,
-)
-slider_Le = st.sidebar.slider(
-    "Electrical Coil Inductance (Le) [mH]",
-    0.0,
-    10.0,
-    loudspeaker_cfg.electrical.coil_inductance * 1e3,
-)
-slider_Le /= 1e3
-slider_Bl = st.sidebar.slider(
-    "Electromechanical factor (Bl) [N/A]",
-    0.0,
-    10.0,
-    loudspeaker_cfg.electromechanical_factor,
-)
-slider_Mm = st.sidebar.slider(
-    "Mechanical Mass (Mm) [mg]",
-    0.0,
-    50.0,
-    loudspeaker_cfg.mechanical.mass * 1e3,
-)
-slider_Mm /= 1e3
-slider_Cm = st.sidebar.slider(
-    "Mechanical Compliance (Cm) [mm/N]",
-    0.0,
-    5.0,
-    loudspeaker_cfg.mechanical.compliance * 1e3,
-)
-slider_Cm /= 1e3
-slider_Rm = st.sidebar.slider(
-    "Mechanical Resistance (Rm) [kg/s]",
-    0.0,
-    10.0,
-    loudspeaker_cfg.mechanical.resistance,
-)
-slider_diam = st.sidebar.slider(
-    "Effective diameter of radiation [cm]",
-    0.0,
-    50.0,
-    loudspeaker_cfg.acoustical.effective_diameter * 1e2,
-)
-slider_diam /= 1e2
-
-default_params = st.sidebar.button("Set default parameters")
-
-if default_params:
-    st.rerun(scope="app")
-
-
-freq_array = np.logspace(
-    np.log10(cfg.frequency.min), np.log10(cfg.frequency.max), num=cfg.frequency.n_bins
-)
-
-angular_freq_array = 2 * np.pi * freq_array
-
-thiele_small_params = {
-    "Re": slider_Re,
-    "Le": slider_Le,
-    "Bl": slider_Bl,
-    "Mm": slider_Mm,
-    "Cm": slider_Cm,
-    "Rm": slider_Rm,
-    "effective_diameter": slider_diam,
-}
-
-loudspeaker_responses = simulate_loudspeaker(
-    thiele_small_params, angular_freq_array, cfg.acoustical_constants
-)
-
-
-# Electrical impedance
-electrical_impedance_plot = plot_loudspeaker_response(
-    response_array=loudspeaker_responses["electrical_impedance"],
-    freq_array=freq_array,
-    title="Electrical Impedance",
-    magnitude_in_db=False,
-    magnitude_units="Ohm",
-    shift_phase=False,
-)
-
-
-mechanical_velocity_plot = plot_loudspeaker_response(
-    response_array=loudspeaker_responses["mechanical_velocity"],
-    freq_array=freq_array,
-    title="Mechanical Velocity",
-    magnitude_in_db=False,
-    magnitude_units="m/s",
-    shift_phase=True,
-)
-
-
-acoustical_pressure = plot_loudspeaker_response(
-    response_array=loudspeaker_responses["acoustical_pressure"],
-    freq_array=freq_array,
-    title="Acoustical Pressure",
-    magnitude_in_db=True,
-    magnitude_units="dB",
-    shift_phase=False,
+left, right = st.columns([0.7, 0.3])
+left.title("Loudspeaker simulation")
+right.image(
+    "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRNvst-DPEbpMwDGUlCmaW2WlSEDUHsQxJjkDBUa6T9scpbHohQZK6UjS77cnq8VYcb_Q&usqp=CAU"
 )
 
-st.pyplot(electrical_impedance_plot)
-st.pyplot(mechanical_velocity_plot)
-st.pyplot(acoustical_pressure)
+single_speaker, two_speakers = st.tabs(["Single speaker", "Two speakers comparison"])
+
+with single_speaker:
+    col1, col2 = st.columns([0.2, 0.8])
+    with col1:
+        st.title("Thielle small parameters")
+        ### Sliders
+        slider_spk1_Re = st.slider(
+            "Electrical Coil Resistance (Re) [Ohm] .",
+            1.0,
+            20.0,
+            loudspeaker_cfg.electrical.coil_resistance,
+        )
+        slider_spk1_Le = st.slider(
+            "Electrical Coil Inductance (Le) [mH] .",
+            0.0,
+            5.0,
+            loudspeaker_cfg.electrical.coil_inductance * 1e3,
+        )
+        slider_spk1_Le /= 1e3
+        slider_spk1_Bl = st.slider(
+            "Electromechanical factor (Bl) [N/A] .",
+            1.0,
+            20.0,
+            loudspeaker_cfg.electromechanical_factor,
+        )
+        slider_spk1_Mm = st.slider(
+            "Mechanical Mass (Mm) [g] .",
+            1.0,
+            100.0,
+            loudspeaker_cfg.mechanical.mass * 1e3,
+        )
+        slider_spk1_Mm /= 1e3
+        slider_spk1_Cm = st.slider(
+            "Mechanical Compliance (Cm) [mm/N] .",
+            0.0,
+            5.0,
+            loudspeaker_cfg.mechanical.compliance * 1e3,
+        )
+        slider_spk1_Cm /= 1e3
+        slider_spk1_Rm = st.slider(
+            "Mechanical Resistance (Rm) [kg/s] .",
+            0.0,
+            10.0,
+            loudspeaker_cfg.mechanical.resistance,
+        )
+        slider_spk1_diam = st.slider(
+            "Effective diameter of radiation [cm] .",
+            1.0,
+            50.0,
+            loudspeaker_cfg.acoustical.effective_diameter * 1e2,
+        )
+        slider_spk1_diam /= 1e2
+
+    thiele_small_params_1 = {
+        "Re": slider_spk1_Re,
+        "Le": slider_spk1_Le,
+        "Bl": slider_spk1_Bl,
+        "Mm": slider_spk1_Mm,
+        "Cm": slider_spk1_Cm,
+        "Rm": slider_spk1_Rm,
+        "effective_diameter": slider_spk1_diam,
+    }
+
+    loudspeaker_responses_1 = simulate_loudspeaker(
+        thiele_small_params_1, angular_freq_array, cfg.acoustical_constants
+    )
+
+    plotly_fig = plotly_full_figure(
+        freq_array, loudspeaker_responses_1, single_speaker=True
+    )
+    with col2:
+        selectivity_factors = loudspeaker_responses_1["selectivity_params"]
+
+        st.dataframe(
+            pd.DataFrame([selectivity_factors]),
+            hide_index=True,
+            use_container_width=True,
+        )
+        st.plotly_chart(plotly_fig, use_container_width=True, theme=None)
+
+
+with two_speakers:
+    spk1, plots, spk2 = st.columns([0.17, 0.66, 0.17])
+
+    with spk1:
+        st.title("Speaker 1")
+        ### Sliders
+        slider_spk1_Re = st.slider(
+            "Electrical Coil Resistance (Re) [Ohm]",
+            1.0,
+            20.0,
+            loudspeaker_cfg.electrical.coil_resistance,
+        )
+        slider_spk1_Le = st.slider(
+            "Electrical Coil Inductance (Le) [mH]",
+            0.0,
+            5.0,
+            loudspeaker_cfg.electrical.coil_inductance * 1e3,
+        )
+        slider_spk1_Le /= 1e3
+        slider_spk1_Bl = st.slider(
+            "Electromechanical factor (Bl) [N/A]",
+            1.0,
+            20.0,
+            loudspeaker_cfg.electromechanical_factor,
+        )
+        slider_spk1_Mm = st.slider(
+            "Mechanical Mass (Mm) [g]",
+            1.0,
+            100.0,
+            loudspeaker_cfg.mechanical.mass * 1e3,
+        )
+        slider_spk1_Mm /= 1e3
+        slider_spk1_Cm = st.slider(
+            "Mechanical Compliance (Cm) [mm/N]",
+            0.0,
+            5.0,
+            loudspeaker_cfg.mechanical.compliance * 1e3,
+        )
+        slider_spk1_Cm /= 1e3
+        slider_spk1_Rm = st.slider(
+            "Mechanical Resistance (Rm) [kg/s]",
+            0.0,
+            10.0,
+            loudspeaker_cfg.mechanical.resistance,
+        )
+        slider_spk1_diam = st.slider(
+            "Effective diameter of radiation [cm]",
+            1.0,
+            50.0,
+            loudspeaker_cfg.acoustical.effective_diameter * 1e2,
+        )
+        slider_spk1_diam /= 1e2
+
+    with spk2:
+        st.title("Speaker 2")
+        ### Sliders
+        slider_spk2_Re = st.slider(
+            "Electrical Coil Resistance (Re) [Ohm].",
+            1.0,
+            20.0,
+            loudspeaker_cfg.electrical.coil_resistance,
+        )
+        slider_spk2_Le = st.slider(
+            "Electrical Coil Inductance (Le) [mH].",
+            0.0,
+            5.0,
+            loudspeaker_cfg.electrical.coil_inductance * 1e3,
+        )
+        slider_spk2_Le /= 1e3
+        slider_spk2_Bl = st.slider(
+            "Electromechanical factor (Bl) [N/A].",
+            1.0,
+            20.0,
+            loudspeaker_cfg.electromechanical_factor,
+        )
+        slider_spk2_Mm = st.slider(
+            "Mechanical Mass (Mm) [g].",
+            1.0,
+            100.0,
+            loudspeaker_cfg.mechanical.mass * 1e3,
+        )
+        slider_spk2_Mm /= 1e3
+        slider_spk2_Cm = st.slider(
+            "Mechanical Compliance (Cm) [mm/N].",
+            0.0,
+            5.0,
+            loudspeaker_cfg.mechanical.compliance * 1e3,
+        )
+        slider_spk2_Cm /= 1e3
+        slider_spk2_Rm = st.slider(
+            "Mechanical Resistance (Rm) [kg/s].",
+            0.0,
+            10.0,
+            loudspeaker_cfg.mechanical.resistance,
+        )
+        slider_spk2_diam = st.slider(
+            "Effective diameter of radiation [cm].",
+            1.0,
+            50.0,
+            loudspeaker_cfg.acoustical.effective_diameter * 1e2,
+        )
+        slider_spk2_diam /= 1e2
+
+    # Speaker 1 simulation
+    thiele_small_params_1 = {
+        "Re": slider_spk1_Re,
+        "Le": slider_spk1_Le,
+        "Bl": slider_spk1_Bl,
+        "Mm": slider_spk1_Mm,
+        "Cm": slider_spk1_Cm,
+        "Rm": slider_spk1_Rm,
+        "effective_diameter": slider_spk1_diam,
+    }
+
+    loudspeaker_responses_1 = simulate_loudspeaker(
+        thiele_small_params_1, angular_freq_array, cfg.acoustical_constants
+    )
+
+    # Speaker 2 simulation
+    thiele_small_params_2 = {
+        "Re": slider_spk2_Re,
+        "Le": slider_spk2_Le,
+        "Bl": slider_spk2_Bl,
+        "Mm": slider_spk2_Mm,
+        "Cm": slider_spk2_Cm,
+        "Rm": slider_spk2_Rm,
+        "effective_diameter": slider_spk2_diam,
+    }
+
+    loudspeaker_responses_2 = simulate_loudspeaker(
+        thiele_small_params_2, angular_freq_array, cfg.acoustical_constants
+    )
+
+    with plots:
+        plotly_fig = plotly_full_figure(
+            freq_array, loudspeaker_responses_1, loudspeaker_responses_2
+        )
+        st.plotly_chart(plotly_fig)