Batch B: #12 blowby, #1 split plots, #13 modebar, #2 export

murphy_unified/tabs/simulation.py

@@ -269,7 +269,7 @@ def run_simulation(
         )
         ef = _empty_fig()
         sim_state["_engine_ok"] = False
-        return err_html, params_html, ef, ef, ef, ef, err_html, sim_state
+        return err_html, params_html, ef, ef, ef, ef, ef, err_html, sim_state, None
 
     # ── Extract scalars (prefer hist dict) ───────────────────────────────
     mdot = hist.get("mdot_kgpm", 0.0)
@@ -308,6 +308,9 @@ def run_simulation(
     eff_accent = "green" if mass_eff > 0.5 else "amber"
     kWh_str = f"{kWh_ext:.3f}" if kWh_ext is not None else "N/A"
 
+    bb_kgpm = hist.get("bb_kgpm")
+    bb_str = f"{bb_kgpm:.4f}" if bb_kgpm is not None else "N/A"
+
     metrics_html = (
         '<div class="metric-row">'
         + metric_html("MASS FLOW", f"{mdot:.3f}", "kg/min")
@@ -317,37 +320,38 @@ def run_simulation(
         + '<div class="metric-row">'
         + metric_html("PEAK PRESSURE", f"{pc_peak:.0f}", "barg")
         + metric_html("SPECIFIC ENERGY", kWh_str, "kWh/kg")
+        + metric_html("BLOWBY", bb_str, "kg/min")
         + metric_html("CPU TIME", f"{cpu_s:.2f}", "s")
         + "</div>"
     )
 
-    # ── P-T overlay plot ─────────────────────────────────────────────────
+    # ── Pressure plot (issue #1: separate plots, not cluttered overlay) ──
     angle = hist.get("angle_deg", np.array([]))
-    fig_pt = go.Figure()
-    fig_pt.add_trace(go.Scatter(
+    fig_pressure = go.Figure()
+    fig_pressure.add_trace(go.Scatter(
         x=angle, y=hist.get("pc", []),
         name="Chamber P",
         line=dict(color=TRACE_COLORS[0], width=1.5),
     ))
-    fig_pt.add_trace(go.Scatter(
+    fig_pressure.update_layout(
+        title=f"Chamber Pressure — {actual_engine} @ {Pexit:.0f} barg",
+        xaxis_title="Crank angle [deg]",
+        yaxis_title="Pressure [barg]",
+        height=320,
+    )
+
+    # ── Temperature plot ────────────────────────────────────────────────
+    fig_temp = go.Figure()
+    fig_temp.add_trace(go.Scatter(
         x=angle, y=hist.get("Tc_K", []),
-        name="Chamber T [K]",
-        yaxis="y2",
+        name="Chamber T",
         line=dict(color=TRACE_COLORS[1], width=1.5),
     ))
-    fig_pt.update_layout(
-        title=f"{actual_engine} @ {Pexit:.0f} barg, speed={speed:.2f}",
+    fig_temp.update_layout(
+        title=f"Chamber Temperature — {actual_engine} @ {Pexit:.0f} barg",
         xaxis_title="Crank angle [deg]",
-        yaxis_title="Pressure [barg]",
-        yaxis2=dict(
-            title="Temperature [K]",
-            overlaying="y",
-            side="right",
-            tickfont=dict(family=FONT_MONO, size=10,
-                          color=TRACE_COLORS[1]),
-        ),
-        height=380,
-        legend=dict(x=0.01, y=0.99, bgcolor="rgba(0,0,0,0)"),
+        yaxis_title="Temperature [K]",
+        height=320,
     )
 
     # ── Valve dynamics plot ──────────────────────────────────────────────
@@ -436,8 +440,27 @@ def run_simulation(
 
     status_html = f'<div class="status-bar">{" | ".join(parts)}</div>'
 
-    return (metrics_html, params_html, fig_pt, fig_valves,
-            extra_figs[0], extra_figs[1], status_html, sim_state)
+    # Store results for export (issue #2)
+    results_bundle = {
+        "scalars": {
+            "mdot_kgpm": mdot,
+            "mass_eff": mass_eff,
+            "Tc_peak_K": Tc_peak,
+            "pc_peak_barg": pc_peak,
+            "kWh_extend": kWh_ext,
+            "bb_kgpm": hist.get("bb_kgpm"),
+            "cpu_s": cpu_s,
+            "steps": steps,
+            "engine": actual_engine,
+        },
+        "time_series": {k: v for k, v in hist.items()
+                        if isinstance(v, np.ndarray)},
+        "params": {k: v for k, v in sim_state.items()
+                   if not k.startswith("_")},
+    }
+
+    return (metrics_html, params_html, fig_pressure, fig_temp, fig_valves,
+            extra_figs[0], extra_figs[1], status_html, sim_state, results_bundle)
 
 
 # ── Builder ──────────────────────────────────────────────────────────────────
@@ -637,13 +660,30 @@ def build_simulation_tab(sim_params_state: gr.State):
         with gr.Column(scale=3):
             metrics_out = gr.HTML(label="Metrics")
             params_out = gr.HTML(label="Parameter Summary")
-            fig_pt_out = gr.Plot(label="P-T Overlay")
+            with gr.Row():
+                fig_pressure_out = gr.Plot(label="Chamber Pressure")
+                fig_temp_out = gr.Plot(label="Chamber Temperature")
             fig_valves_out = gr.Plot(label="Valve Dynamics")
             with gr.Row():
                 fig_extra1_out = gr.Plot(label="Extra Plot 1")
                 fig_extra2_out = gr.Plot(label="Extra Plot 2")
             status_out = gr.HTML(label="Status")
 
+            # ── Results export (issue #2) ───────────────────────────────
+            with gr.Accordion("Export Results", open=False):
+                export_sections_cb = gr.CheckboxGroup(
+                    choices=["Key Results", "Time Series", "Parameters"],
+                    value=["Key Results", "Time Series"],
+                    label="Sections to include",
+                )
+                export_results_btn = gr.DownloadButton(
+                    "Export selected sections (CSV)",
+                    size="sm",
+                )
+
+    # ── Hidden state for last run results ───────────────────────────────
+    sim_results_state = gr.State(None)
+
     # ── Wire click event ─────────────────────────────────────────────────
     run_btn.click(
         fn=run_simulation,
@@ -666,8 +706,9 @@ def build_simulation_tab(sim_params_state: gr.State):
             # Output selector
             extras_cb,
         ],
-        outputs=[metrics_out, params_out, fig_pt_out, fig_valves_out,
-                 fig_extra1_out, fig_extra2_out, status_out, sim_params_state],
+        outputs=[metrics_out, params_out, fig_pressure_out, fig_temp_out,
+                 fig_valves_out, fig_extra1_out, fig_extra2_out,
+                 status_out, sim_params_state, sim_results_state],
     )
 
     # ── Widget list (order must match _WIDGET_KEYS_IN_ORDER) ─────────────
@@ -712,3 +753,42 @@ def build_simulation_tab(sim_params_state: gr.State):
         inputs=_all_widgets,
         outputs=[sim_params_state],
     )
+
+    # ── Results export handler (issue #2) ────────────────────────────────
+    import pandas as pd
+
+    def _export_results(results: dict | None, sections: list[str]) -> str | None:
+        if results is None:
+            return None
+        stamp = datetime.now(timezone.utc).strftime("%Y%m%d-%H%M%S")
+        path = os.path.join(tempfile.gettempdir(), f"murphy_results_{stamp}.xlsx")
+        with pd.ExcelWriter(path, engine="openpyxl") as writer:
+            if "Key Results" in sections and "scalars" in results:
+                s = results["scalars"]
+                df = pd.DataFrame([
+                    {"Metric": k, "Value": v} for k, v in s.items()
+                    if v is not None
+                ])
+                df.to_excel(writer, sheet_name="Key Results", index=False)
+            if "Time Series" in sections and "time_series" in results:
+                ts = results["time_series"]
+                max_len = max((len(v) for v in ts.values()), default=0)
+                ts_df = pd.DataFrame({
+                    k: np.pad(v, (0, max_len - len(v)),
+                              constant_values=np.nan)
+                    for k, v in ts.items()
+                })
+                ts_df.to_excel(writer, sheet_name="Time Series", index=False)
+            if "Parameters" in sections and "params" in results:
+                p = results["params"]
+                df = pd.DataFrame([
+                    {"Parameter": k, "Value": str(v)} for k, v in p.items()
+                ])
+                df.to_excel(writer, sheet_name="Parameters", index=False)
+        return path
+
+    export_results_btn.click(
+        fn=_export_results,
+        inputs=[sim_results_state, export_sections_cb],
+        outputs=[export_results_btn],
+    )

murphy_unified/theme.py

@@ -50,6 +50,11 @@ CSS = """
     --body: 'DM Sans', sans-serif;
 }
 
+/* ── Plotly modebar — always visible on hover (issue #13) ──────────── */
+.js-plotly-plot .modebar { opacity: 0.7 !important; }
+.js-plotly-plot:hover .modebar { opacity: 1 !important; }
+.js-plotly-plot .modebar-btn { font-size: 16px; }
+
 /* ── body / dark-mode override ──────────────────────────────────────── */
 body, .dark {
     background: var(--bg) !important;
@@ -259,6 +264,17 @@ FORCE_DARK = """
 function FORCE_DARK() {
     document.body.classList.add('dark');
     document.documentElement.style.colorScheme = 'dark';
+
+    /* Issue #13: ensure Plotly modebar (download/copy buttons) is visible */
+    const observer = new MutationObserver(() => {
+        document.querySelectorAll('.js-plotly-plot').forEach(plot => {
+            if (plot._fullLayout && !plot._modebarPatched) {
+                Plotly.relayout(plot, {'modebar.orientation': 'v'});
+                plot._modebarPatched = true;
+            }
+        });
+    });
+    observer.observe(document.body, {childList: true, subtree: true});
 }
 """
 
@@ -328,8 +344,26 @@ _template = go.layout.Template(
         yaxis=_axis,
         colorway=TRACE_COLORS,
         margin=dict(l=56, r=16, t=44, b=44),
+        modebar=dict(
+            bgcolor="rgba(0,0,0,0)",
+            color=TEXT_DIM,
+            activecolor=ACCENT,
+            orientation="v",
+        ),
     )
 )
 
+# Plotly config applied to all figures — ensures modebar with download/copy
+# button is visible (issue #13).
+PLOTLY_CONFIG = {
+    "displayModeBar": True,
+    "modeBarButtonsToAdd": ["toImage"],
+    "toImageButtonOptions": {
+        "format": "png",
+        "filename": "murphy_plot",
+        "scale": 2,
+    },
+}
+
 pio.templates["murphy"] = _template
 pio.templates.default = "murphy"