Update app.py

app.py

@@ -48,31 +48,31 @@ with single_speaker:
         )
         slider_spk1_Le /= 1e3
         slider_spk1_Bl = st.slider(
-            "Electromechanical factor (Bl) [N/A] .",
+            "Electromechanical factor (Bl) [T*m] .",
             1.0,
             20.0,
             loudspeaker_cfg.electromechanical_factor,
         )
+        slider_spk1_Rm = st.slider(
+            "Mechanical Resistance (Rms) [kg/s] .",
+            0.0,
+            10.0,
+            loudspeaker_cfg.mechanical.resistance,
+        )
         slider_spk1_Mm = st.slider(
-            "Mechanical Mass (Mm) [g] .",
+            "Mechanical Mass (Mms) [g] .",
             1.0,
             100.0,
             loudspeaker_cfg.mechanical.mass * 1e3,
         )
         slider_spk1_Mm /= 1e3
         slider_spk1_Cm = st.slider(
-            "Mechanical Compliance (Cm) [mm/N] .",
+            "Mechanical Compliance (Cms) [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,
@@ -98,7 +98,7 @@ with single_speaker:
     plotly_fig = plotly_full_figure(
         freq_array, loudspeaker_responses_1, single_speaker=True
     )
-    with col2:
+    with col1:
         selectivity_factors = loudspeaker_responses_1["selectivity_params"]
 
         st.dataframe(
@@ -106,6 +106,7 @@ with single_speaker:
             hide_index=True,
             use_container_width=True,
         )
+    with col2:
         st.plotly_chart(plotly_fig, use_container_width=True, theme=None)
 
 
@@ -129,31 +130,31 @@ with two_speakers:
         )
         slider_spk1_Le /= 1e3
         slider_spk1_Bl = st.slider(
-            "Electromechanical factor (Bl) [N/A]",
+            "Electromechanical factor (Bl) [T*m]",
             1.0,
             20.0,
             loudspeaker_cfg.electromechanical_factor,
         )
+        slider_spk1_Rm = st.slider(
+            "Mechanical Resistance (Rms) [kg/s]",
+            0.0,
+            10.0,
+            loudspeaker_cfg.mechanical.resistance,
+        )
         slider_spk1_Mm = st.slider(
-            "Mechanical Mass (Mm) [g]",
+            "Mechanical Mass (Mms) [g]",
             1.0,
             100.0,
             loudspeaker_cfg.mechanical.mass * 1e3,
         )
         slider_spk1_Mm /= 1e3
         slider_spk1_Cm = st.slider(
-            "Mechanical Compliance (Cm) [mm/N]",
+            "Mechanical Compliance (Cms) [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,
@@ -179,31 +180,31 @@ with two_speakers:
         )
         slider_spk2_Le /= 1e3
         slider_spk2_Bl = st.slider(
-            "Electromechanical factor (Bl) [N/A].",
+            "Electromechanical factor (Bl) [T*m].",
             1.0,
             20.0,
             loudspeaker_cfg.electromechanical_factor,
         )
+        slider_spk2_Rm = st.slider(
+            "Mechanical Resistance (Rms) [kg/s].",
+            0.0,
+            10.0,
+            loudspeaker_cfg.mechanical.resistance,
+        )
         slider_spk2_Mm = st.slider(
-            "Mechanical Mass (Mm) [g].",
+            "Mechanical Mass (Mms) [g].",
             1.0,
             100.0,
             loudspeaker_cfg.mechanical.mass * 1e3,
         )
         slider_spk2_Mm /= 1e3
         slider_spk2_Cm = st.slider(
-            "Mechanical Compliance (Cm) [mm/N].",
+            "Mechanical Compliance (Cms) [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,
@@ -242,6 +243,24 @@ with two_speakers:
         thiele_small_params_2, angular_freq_array, cfg.acoustical_constants
     )
 
+    with spk1:
+        selectivity_factors = loudspeaker_responses_1["selectivity_params"]
+
+        st.dataframe(
+            pd.DataFrame([selectivity_factors]),
+            hide_index=True,
+            use_container_width=True,
+        )
+
+    with spk2:
+        selectivity_factors = loudspeaker_responses_2["selectivity_params"]
+
+        st.dataframe(
+            pd.DataFrame([selectivity_factors]),
+            hide_index=True,
+            use_container_width=True,
+        )
+
     with plots:
         plotly_fig = plotly_full_figure(
             freq_array, loudspeaker_responses_1, loudspeaker_responses_2