Update app.py

app.py

@@ -6,19 +6,17 @@ import os
 from datetime import datetime, time
 from typing import Union, Optional, Tuple, Dict, List
 import plotly.graph_objects as go
-from functools import partial
 
+# ====== 常數與預設 ======
 EXCEL_LETTERS = ["A", "B", "K", "L", "M", "V", "W", "X", "Y"]
 TARGET_NAMES  = ["data", "time", "⊿Ptop", "⊿Pmid", "⊿Pbot", "H2%", "CO%", "CO2%", "CH4%"]
 
-# 預設顏色/線型
 DEFAULT_COLORS = [
     "#1f77b4","#ff7f0e","#2ca02c","#d62728","#9467bd",
     "#8c564b","#e377c2","#7f7f7f","#bcbd22","#17becf"
 ]
 DASH_OPTIONS = ["solid","dot","dash","longdash","dashdot","longdashdot"]
 
-# 色盤（含色弱友善方案）
 PALETTES = {
     "Plotly10": DEFAULT_COLORS,
     "Tableau10": ["#4E79A7","#F28E2B","#E15759","#76B7B2","#59A14F","#EDC948","#B07AA1","#FF9DA7","#9C755F","#BAB0AC"],
@@ -27,8 +25,9 @@ PALETTES = {
     "Okabe-Ito (CB-safe)": ["#0072B2","#E69F00","#009E73","#D55E00","#CC79A7","#F0E442","#56B4E9","#000000"]
 }
 
-MAX_SERIES_FOR_PICKER = 10  # 最多顯示 10 個顏色挑選器
+MAX_SERIES = 10  # 最多顯示 10 組（顏色 + 線型）
 
+# ====== 工具函式 ======
 def letters_to_index_zero_based(letter: str) -> int:
     idx = 0
     for ch in letter.upper():
@@ -47,7 +46,6 @@ def get_lower_name(file_input: Union[str, os.PathLike, io.BytesIO, bytes, object
 
 def load_dataframe(file_input) -> pd.DataFrame:
     lower_name = get_lower_name(file_input)
-
     if isinstance(file_input, (str, os.PathLike)):
         path = str(file_input)
         if lower_name.endswith((".xlsx", ".xls")):
@@ -138,10 +136,8 @@ def _hhmmss_int_to_seconds(n: int):
 
 def series_time_to_seconds_of_day(series: pd.Series) -> pd.Series:
     s = series.copy()
-
     if pd.api.types.is_datetime64_any_dtype(s):
         return (s.dt.hour*3600 + s.dt.minute*60 + s.dt.second).astype("float")
-
     if pd.api.types.is_timedelta64_dtype(s):
         total_sec = s.dt.total_seconds()
         return (total_sec % 86400).astype("float")
@@ -188,11 +184,9 @@ def parse_hhmmss_or_number(s: Optional[str]) -> Optional[float]:
         parts = text.split(":")
         try:
             if len(parts) == 2:
-                mm, ss = int(parts[0]), int(parts[1])
-                return mm*60 + ss
+                mm, ss = int(parts[0]), int(parts[1]); return mm*60 + ss
             elif len(parts) == 3:
-                hh, mm, ss = int(parts[0]), int(parts[1]), int(parts[2])
-                return hh*3600 + mm*60 + ss
+                hh, mm, ss = int(parts[0]), int(parts[1]), int(parts[2]); return hh*3600 + mm*60 + ss
         except Exception:
             return None
     try:
@@ -210,42 +204,30 @@ def prepare_x_series(df: pd.DataFrame, x_col: str) -> Tuple[pd.Series, bool]:
         num = pd.to_numeric(x, errors="coerce")
         return num, False
 
-def build_default_style_rows(y_cols: List[str], existing: Optional[pd.DataFrame]=None) -> pd.DataFrame:
-    rows = []
-    for i, y in enumerate(y_cols):
-        default = {
-            "series": y,
-            "color": (existing.loc[existing["series"]==y, "color"].iloc[0]
-                      if isinstance(existing, pd.DataFrame) and (existing["series"]==y).any()
-                      else DEFAULT_COLORS[i % len(DEFAULT_COLORS)]),
-            "width": float(existing.loc[existing["series"]==y, "width"].iloc[0])
-                     if isinstance(existing, pd.DataFrame) and (existing["series"]==y).any()
-                     else 2.0,
-            "dash":  (existing.loc[existing["series"]==y, "dash"].iloc[0]
-                      if isinstance(existing, pd.DataFrame) and (existing["series"]==y).any()
-                      else "solid"),
-        }
-        rows.append(default)
-    return pd.DataFrame(rows, columns=["series","color","width","dash"])
-
-def styles_to_map(style_df: Optional[pd.DataFrame]) -> Dict[str, Dict]:
+def styles_to_map(y_cols: List[str], style_df: Optional[pd.DataFrame],
+                  colors: List[Optional[str]], dashes: List[Optional[str]]) -> Dict[str, Dict]:
+    """
+    最終用於繪圖的樣式：{series: {color, width, dash}}
+    - width 來自 style_df（使用者可編輯）
+    - color 來自 ColorPicker
+    - dash   來自 Radio
+    """
     m: Dict[str, Dict] = {}
-    if not isinstance(style_df, pd.DataFrame) or style_df.empty:
-        return m
-    for _, r in style_df.iterrows():
+    df = style_df if isinstance(style_df, pd.DataFrame) else pd.DataFrame(columns=["series","width"])
+    width_map = {}
+    for _, r in df.iterrows():
         name = str(r.get("series","")).strip()
-        if not name:
-            continue
-        col = str(r.get("color","")).strip() or None
-        w   = r.get("width", None)
+        if not name: continue
         try:
-            width = float(w) if w is not None and str(w).strip() != "" else 2.0
+            width_map[name] = float(r.get("width", 2.0))
         except Exception:
-            width = 2.0
-        dash = str(r.get("dash","solid")).strip().lower()
-        if dash not in DASH_OPTIONS:
-            dash = "solid"
-        m[name] = {"color": col, "width": width, "dash": dash}
+            width_map[name] = 2.0
+
+    for i, s in enumerate(y_cols):
+        col = colors[i] if i < len(colors) and colors[i] else DEFAULT_COLORS[i % len(DEFAULT_COLORS)]
+        dash = (dashes[i] if i < len(dashes) and (dashes[i] in DASH_OPTIONS) else "solid")
+        w    = width_map.get(s, 2.0)
+        m[s] = {"color": col, "width": w, "dash": dash}
     return m
 
 def make_line_figure(df: pd.DataFrame, x_col: str, y_cols: list,
@@ -271,20 +253,15 @@ def make_line_figure(df: pd.DataFrame, x_col: str, y_cols: list,
         mask = x_series.notna() & y.notna()
         if mask.sum() < 2:
             continue
-
-        style = style_map.get(y_col, {})
-        line_kwargs = {
-            "color": style.get("color") or DEFAULT_COLORS[idx % len(DEFAULT_COLORS)],
-            "width": style.get("width", 2.0),
-            "dash":  style.get("dash", "solid")
-        }
+        st = style_map.get(y_col, {"color": DEFAULT_COLORS[idx % len(DEFAULT_COLORS)],
+                                   "width": 2.0, "dash": "solid"})
         fig.add_trace(
             go.Scatter(
                 x=x_series[mask],
                 y=y[mask],
                 mode="lines",
                 name=y_col,
-                line=line_kwargs
+                line=dict(color=st["color"], width=st["width"], dash=st["dash"])
             )
         )
 
@@ -338,12 +315,11 @@ def make_line_figure(df: pd.DataFrame, x_col: str, y_cols: list,
     fig.update_xaxes(showgrid=True)
     return fig
 
-# ===== Gradio UI =====
-with gr.Blocks(title="Excel/CSV 指定欄位擷取器（時間過濾＋互動線圖＋樣式）") as demo:
+# ====== 介面 ======
+with gr.Blocks(title="Excel/CSV 指定欄位擷取器（時間過濾＋互動線圖＋色彩樣式）") as demo:
     gr.Markdown("### 指定欄位擷取（A,B,K,L,M,V,W,X,Y）→ data,time,⊿Ptop,⊿Pmid,⊿Pbot,H2%,CO%,CO2%,CH4% ；支援 **時間區段 (hh:mm:ss)** 過濾與 **互動線圖**（Y 可複選）。")
 
     df_state = gr.State(value=None)
-    style_state = gr.State(value=None)  # 保存目前樣式表（DataFrame）
 
     inp = gr.File(label="上傳 .xlsx 或 .csv 檔案", file_types=[".xlsx", ".csv"], type="filepath")
 
@@ -387,13 +363,14 @@ with gr.Blocks(title="Excel/CSV 指定欄位擷取器（時間過濾＋互動線
             y_max = gr.Textbox(label="Y 最大（數值）", value="")
             y_dtick = gr.Textbox(label="Y 刻度間距 dtick（數值）", value="")
 
-    gr.Markdown("### 樣式（線寬與線型在表格中編輯；顏色改用 ColorPicker 或色盤）")
+    # ---- 樣式：寬度表（已移除 color 欄），顏色用 ColorPicker，線型用 Radio ----
+    gr.Markdown("### 樣式設定（寬度表 + ColorPicker + 線型 Radio）")
     style_df = gr.Dataframe(
-        label="系列樣式表",
-        headers=["series","color","width","dash"],
-        datatype=["str","str","number","str"],
+        label="系列寬度（每條線一列）",
+        headers=["series","width"],
+        datatype=["str","number"],
         row_count=(0, "dynamic"),
-        col_count=(4, "fixed"),
+        col_count=(2, "fixed"),
         wrap=True
     )
 
@@ -401,10 +378,22 @@ with gr.Blocks(title="Excel/CSV 指定欄位擷取器（時間過濾＋互動線
         palette_dd = gr.Dropdown(label="色盤", choices=list(PALETTES.keys()), value="Okabe-Ito (CB-safe)")
         apply_palette_btn = gr.Button("套用色盤到 Y（依序）")
 
-    gr.Markdown("#### 顏色挑選（最多顯示前 10 條線）")
+    gr.Markdown("#### 顏色挑選（前 10 條；縮短標籤以節省寬度）")
+    # 兩排 × 5 組 ColorPicker，縮短標籤（僅顯示系列名）
     color_pickers = []
-    for i in range(MAX_SERIES_FOR_PICKER):
-        color_pickers.append(gr.ColorPicker(label=f"系列 {i+1}", value="#000000", visible=False))
+    for row in range(2):
+        with gr.Row():
+            for i in range(5):
+                idx = row*5 + i
+                color_pickers.append(gr.ColorPicker(label=f"系列 {idx+1}", value="#000000", visible=False))
+
+    gr.Markdown("#### 線型（Radio 勾選；前 10 條）")
+    dash_radios = []
+    for row in range(2):
+        with gr.Row():
+            for i in range(5):
+                idx = row*5 + i
+                dash_radios.append(gr.Radio(label=f"系列 {idx+1}", choices=DASH_OPTIONS, value="solid", visible=False))
 
     plot_btn = gr.Button("繪製線圖（互動）")
     plot_out = gr.Plot(label="互動線圖")
@@ -412,20 +401,22 @@ with gr.Blocks(title="Excel/CSV 指定欄位擷取器（時間過濾＋互動線
 
     # --------- 回呼邏輯 ---------
     def run_pipeline(file_path_str, sh_, sm_, ss_, eh_, em_, es_):
+        # 基本輸出佔位
+        empty_color = [gr.update(visible=False) for _ in range(MAX_SERIES)]
+        empty_dash  = [gr.update(visible=False) for _ in range(MAX_SERIES)]
+
         if not file_path_str:
-            empty_updates = [gr.update(visible=False) for _ in range(MAX_SERIES_FOR_PICKER)]
             return (gr.update(visible=False), "請先上傳檔��。", pd.DataFrame(),
                     None, gr.update(choices=[], value=None), gr.update(choices=[], value=None),
-                    pd.DataFrame(), None, *empty_updates)
+                    pd.DataFrame(), *empty_color, *empty_dash)
 
         try:
             df = load_dataframe(file_path_str)
             out = extract_and_rename(df)
         except Exception as e:
-            empty_updates = [gr.update(visible=False) for _ in range(MAX_SERIES_FOR_PICKER)]
             return (gr.update(visible=False), f"處理失敗：{e}", pd.DataFrame(),
                     None, gr.update(choices=[], value=None), gr.update(choices=[], value=None),
-                    pd.DataFrame(), None, *empty_updates)
+                    pd.DataFrame(), *empty_color, *empty_dash)
 
         original_rows = len(out)
 
@@ -433,18 +424,16 @@ with gr.Blocks(title="Excel/CSV 指定欄位擷取器（時間過濾＋互動線
             start_sec = parse_time_to_seconds(sh_, sm_, ss_)
             end_sec   = parse_time_to_seconds(eh_, em_, es_)
         except Exception as e:
-            empty_updates = [gr.update(visible=False) for _ in range(MAX_SERIES_FOR_PICKER)]
             return (gr.update(visible=False), f"時間輸入錯誤：{e}", pd.DataFrame(),
                     None, gr.update(choices=[], value=None), gr.update(choices=[], value=None),
-                    pd.DataFrame(), None, *empty_updates)
+                    pd.DataFrame(), *empty_color, *empty_dash)
 
         parsed_ok = None
         if (start_sec is not None) and (end_sec is not None):
             if "time" not in out.columns:
-                empty_updates = [gr.update(visible=False) for _ in range(MAX_SERIES_FOR_PICKER)]
                 return (gr.update(visible=False), "找不到 'time' 欄，無法做時間過濾。", pd.DataFrame(),
                         None, gr.update(choices=[], value=None), gr.update(choices=[], value=None),
-                        pd.DataFrame(), None, *empty_updates)
+                        pd.DataFrame(), *empty_color, *empty_dash)
             secs = series_time_to_seconds_of_day(out["time"])
             parsed_ok = int(secs.notna().sum())
             valid_mask = secs.notna()
@@ -460,16 +449,16 @@ with gr.Blocks(title="Excel/CSV 指定欄位擷取器（時間過濾＋互動線
         try:
             out.to_excel(out_path, index=False, engine="openpyxl")
         except Exception as e:
-            empty_updates = [gr.update(visible=False) for _ in range(MAX_SERIES_FOR_PICKER)]
             return (gr.update(visible=False), f"輸出 Excel 失敗：{e}", pd.DataFrame(),
                     None, gr.update(choices=[], value=None), gr.update(choices=[], value=None),
-                    pd.DataFrame(), None, *empty_updates)
+                    pd.DataFrame(), *empty_color, *empty_dash)
 
         cols = out.columns.tolist()
         default_x = "time" if "time" in cols else (cols[0] if cols else None)
         default_y = [c for c in ["H2%", "CO%", "CO2%", "CH4%"] if c in cols] or ([cols[1]] if len(cols) > 1 else cols)
 
-        init_style_df = build_default_style_rows(default_y)
+        # 初始化寬度表（無 color 欄）
+        init_style_df = pd.DataFrame({"series": default_y, "width": [2.0]*len(default_y)})
 
         note_lines = [f"完成！原始列數：**{original_rows}**",
                       f"輸出列數：**{len(out)}**"]
@@ -479,15 +468,16 @@ with gr.Blocks(title="Excel/CSV 指定欄位擷取器（時間過濾＋互動線
         note_lines.append("下方預覽、右側可下載；可選欄位與樣式後繪圖。")
         note = "｜".join(note_lines)
 
-        # 初始顏色挑選器狀態
-        picker_updates = []
-        for i in range(MAX_SERIES_FOR_PICKER):
+        # 初始 ColorPicker 與 Radio 顯示（兩排 × 5）
+        picker_updates, radio_updates = [], []
+        for i in range(MAX_SERIES):
             if i < len(default_y):
                 series = default_y[i]
-                c = init_style_df.loc[init_style_df["series"]==series, "color"].iloc[0]
-                picker_updates.append(gr.update(visible=True, value=c, label=f"{series} 顏色"))
+                picker_updates.append(gr.update(visible=True, value=DEFAULT_COLORS[i % len(DEFAULT_COLORS)], label=series))
+                radio_updates.append(gr.update(visible=True, value="solid", label=series))
             else:
                 picker_updates.append(gr.update(visible=False))
+                radio_updates.append(gr.update(visible=False))
 
         return (
             gr.update(value=out_path, visible=True),
@@ -497,52 +487,58 @@ with gr.Blocks(title="Excel/CSV 指定欄位擷取器（時間過濾＋互動線
             gr.update(choices=cols, value=default_x),
             gr.update(choices=cols, value=default_y),
             init_style_df,
-            init_style_df,  # style_state
-            *picker_updates
+            *picker_updates,
+            *radio_updates
         )
 
-    def sync_styles(style_df_current, y_cols):
+    def sync_on_y_change(style_df_current, y_cols):
         y_cols = y_cols or []
-        existing = style_df_current if isinstance(style_df_current, pd.DataFrame) else None
-        new_df = build_default_style_rows(y_cols, existing=existing)
+        # 寬度表刷新（保留既有 width）
+        exist = style_df_current if isinstance(style_df_current, pd.DataFrame) else pd.DataFrame(columns=["series","width"])
+        width_map = {str(r["series"]): r["width"] for _, r in exist.iterrows()} if not exist.empty else {}
+        new_df = pd.DataFrame({"series": y_cols, "width": [width_map.get(s, 2.0) for s in y_cols]})
 
-        picker_updates = []
-        for i in range(MAX_SERIES_FOR_PICKER):
+        picker_updates, radio_updates = [], []
+        for i in range(MAX_SERIES):
             if i < len(y_cols):
                 series = y_cols[i]
-                c = new_df.loc[new_df["series"]==series, "color"].iloc[0]
-                picker_updates.append(gr.update(visible=True, value=c, label=f"{series} 顏色"))
+                picker_updates.append(gr.update(visible=True, value=DEFAULT_COLORS[i % len(DEFAULT_COLORS)], label=series))
+                radio_updates.append(gr.update(visible=True, value="solid", label=series))
             else:
                 picker_updates.append(gr.update(visible=False))
-        return new_df, new_df, *picker_updates
-
-    def on_y_change(style_df_current, y_cols):
-        # 自動同步（保留既有設定）
-        return sync_styles(style_df_current, y_cols)
+                radio_updates.append(gr.update(visible=False))
+        return new_df, *picker_updates, *radio_updates
 
     def apply_palette(style_df_current, y_cols, palette_name):
         y_cols = y_cols or []
-        df = build_default_style_rows(y_cols, existing=style_df_current)
         pal = PALETTES.get(palette_name, DEFAULT_COLORS)
-        # 按 y_cols 順序覆蓋 color
-        for i, s in enumerate(y_cols):
-            df.loc[df["series"]==s, "color"] = pal[i % len(pal)]
-        # 更新挑選器
         picker_updates = []
-        for i in range(MAX_SERIES_FOR_PICKER):
+        for i in range(MAX_SERIES):
             if i < len(y_cols):
-                series = y_cols[i]
-                c = df.loc[df["series"]==series, "color"].iloc[0]
-                picker_updates.append(gr.update(visible=True, value=c, label=f"{series} 顏色"))
+                picker_updates.append(gr.update(visible=True, value=pal[i % len(pal)], label=y_cols[i]))
             else:
                 picker_updates.append(gr.update(visible=False))
-        return df, df, *picker_updates
+        # Radio 不變，只更新顏色
+        radio_updates = []
+        for i in range(MAX_SERIES):
+            if i < len(y_cols):
+                radio_updates.append(gr.update(visible=True, value="solid", label=y_cols[i]))
+            else:
+                radio_updates.append(gr.update(visible=False))
+        # 寬度表保持不變
+        return style_df_current, *picker_updates, *radio_updates
 
-    def plot_handler(df, x_col, y_cols, fig_w_, fig_h_, auto_x_, x_min_, x_max_, x_dtick_, auto_y_, y_min_, y_max_, y_dtick_, style_df_current):
+    def plot_handler(df, x_col, y_cols, fig_w_, fig_h_, auto_x_, x_min_, x_max_, x_dtick_, auto_y_, y_min_, y_max_, y_dtick_,
+                     style_df_current, *color_and_dash):
         if df is None:
             return None, "尚未有可用資料，請先完成上方處理。"
+
+        # 拆分 color 與 dash（各 MAX_SERIES 個）
+        colors = list(color_and_dash[:MAX_SERIES])
+        dashes = list(color_and_dash[MAX_SERIES:MAX_SERIES*2])
+
         try:
-            s_map = styles_to_map(style_df_current)
+            s_map = styles_to_map(y_cols or [], style_df_current, colors, dashes)
             fig = make_line_figure(
                 df, x_col, y_cols or [],
                 fig_w=int(fig_w_ or 900), fig_h=int(fig_h_ or 500),
@@ -554,49 +550,35 @@ with gr.Blocks(title="Excel/CSV 指定欄位擷取器（時間過濾＋互動線
         except Exception as e:
             return None, f"繪圖失敗：{e}"
 
-    def make_color_change_handler(idx):
-        def handler(style_df_current, y_cols, new_color):
-            y_cols = y_cols or []
-            if idx >= len(y_cols):
-                return style_df_current, style_df_current  # 無變更
-            series = y_cols[idx]
-            df = build_default_style_rows(y_cols, existing=style_df_current)
-            df.loc[df["series"]==series, "color"] = new_color
-            return df, df
-        return handler
-
-    # 事件綁定
-    outputs_base = [file_out, msg, preview, df_state, x_sel, y_sel, style_df, style_state]
-    outputs_with_pickers = outputs_base + color_pickers
+    # 綁定事件
+    base_outputs = [file_out, msg, preview, df_state, x_sel, y_sel, style_df]
+    color_outputs = color_pickers
+    dash_outputs  = dash_radios
 
     run_btn.click(
         run_pipeline,
         inputs=[inp, sh, sm, ss, eh, em, es],
-        outputs=outputs_with_pickers
+        outputs=base_outputs + color_outputs + dash_outputs
     )
 
+    # Y 變更時同��（更新寬度表、ColorPicker 與 Radio）
     y_sel.change(
-        on_y_change,
+        sync_on_y_change,
         inputs=[style_df, y_sel],
-        outputs=[style_df, style_state, *color_pickers]
+        outputs=[style_df] + color_outputs + dash_outputs
     )
 
+    # 套用色盤（只變更顏色挑選器；Radio 與寬度表不動）
     apply_palette_btn.click(
         apply_palette,
         inputs=[style_df, y_sel, palette_dd],
-        outputs=[style_df, style_state, *color_pickers]
+        outputs=[style_df] + color_outputs + dash_outputs
     )
 
-    for i, picker in enumerate(color_pickers):
-        picker.change(
-            make_color_change_handler(i),
-            inputs=[style_df, y_sel, picker],
-            outputs=[style_df, style_state]
-        )
-
+    # 繪圖（把所有 ColorPicker 與 Radio 的值都丟進 handler）
     plot_btn.click(
         plot_handler,
-        inputs=[df_state, x_sel, y_sel, fig_w, fig_h, auto_x, x_min, x_max, x_dtick, auto_y, y_min, y_max, y_dtick, style_state],
+        inputs=[df_state, x_sel, y_sel, fig_w, fig_h, auto_x, x_min, x_max, x_dtick, auto_y, y_min, y_max, y_dtick, style_df] + color_pickers + dash_radios,
         outputs=[plot_out, plot_msg]
     )