Update app.py

app.py

@@ -6,16 +6,29 @@ 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"],
+    "Set2": ["#66c2a5","#fc8d62","#8da0cb","#e78ac3","#a6d854","#ffd92f","#e5c494","#b3b3b3"],
+    "Dark2": ["#1b9e77","#d95f02","#7570b3","#e7298a","#66a61e","#e6ab02","#a6761d","#666666"],
+    "Okabe-Ito (CB-safe)": ["#0072B2","#E69F00","#009E73","#D55E00","#CC79A7","#F0E442","#56B4E9","#000000"]
+}
+
+MAX_SERIES_FOR_PICKER = 10  # 最多顯示 10 個顏色挑選器
+
 def letters_to_index_zero_based(letter: str) -> int:
     idx = 0
     for ch in letter.upper():
@@ -198,7 +211,6 @@ def prepare_x_series(df: pd.DataFrame, x_col: str) -> Tuple[pd.Series, bool]:
         return num, False
 
 def build_default_style_rows(y_cols: List[str], existing: Optional[pd.DataFrame]=None) -> pd.DataFrame:
-    """依照 Y 選擇產生/更新樣式表，盡量保留既有設定。"""
     rows = []
     for i, y in enumerate(y_cols):
         default = {
@@ -217,13 +229,12 @@ def build_default_style_rows(y_cols: List[str], existing: Optional[pd.DataFrame]
     return pd.DataFrame(rows, columns=["series","color","width","dash"])
 
 def styles_to_map(style_df: Optional[pd.DataFrame]) -> Dict[str, Dict]:
-    """將樣式表轉成 {series: {color, width, dash}} 的對應表，含容錯。"""
     m: Dict[str, Dict] = {}
     if not isinstance(style_df, pd.DataFrame) or style_df.empty:
         return m
     for _, r in style_df.iterrows():
         name = str(r.get("series","")).strip()
-        if not name:  # 跳過空列
+        if not name:
             continue
         col = str(r.get("color","")).strip() or None
         w   = r.get("width", None)
@@ -277,7 +288,6 @@ def make_line_figure(df: pd.DataFrame, x_col: str, y_cols: list,
             )
         )
 
-    # 佈局
     fig.update_layout(
         width=int(fig_w) if fig_w else None,
         height=int(fig_h) if fig_h else None,
@@ -328,8 +338,9 @@ def make_line_figure(df: pd.DataFrame, x_col: str, y_cols: list,
     fig.update_xaxes(showgrid=True)
     return fig
 
-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 可複選，並可設定顏色/線寬/線型）。")
+# ===== Gradio UI =====
+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）
@@ -376,7 +387,7 @@ with gr.Blocks(title="Excel/CSV 指定欄位擷取器（含時間過濾＋互動
             y_max = gr.Textbox(label="Y 最大（數值）", value="")
             y_dtick = gr.Textbox(label="Y 刻度間距 dtick（數值）", value="")
 
-    gr.Markdown("### 樣式（每個 Y 一列） － `dash` 可選：solid / dot / dash / longdash / dashdot / longdashdot")
+    gr.Markdown("### 樣式（線寬與線型在表格中編輯；顏色改用 ColorPicker 或色盤）")
     style_df = gr.Dataframe(
         label="系列樣式表",
         headers=["series","color","width","dash"],
@@ -385,25 +396,36 @@ with gr.Blocks(title="Excel/CSV 指定欄位擷取器（含時間過濾＋互動
         col_count=(4, "fixed"),
         wrap=True
     )
-    sync_btn = gr.Button("同步 Y 選擇 → 樣式表（保留既有設定）")
+
+    with gr.Row():
+        palette_dd = gr.Dropdown(label="色盤", choices=list(PALETTES.keys()), value="Okabe-Ito (CB-safe)")
+        apply_palette_btn = gr.Button("套用色盤到 Y（依序）")
+
+    gr.Markdown("#### 顏色挑選（最多顯示前 10 條線）")
+    color_pickers = []
+    for i in range(MAX_SERIES_FOR_PICKER):
+        color_pickers.append(gr.ColorPicker(label=f"系列 {i+1}", value="#000000", visible=False))
 
     plot_btn = gr.Button("繪製線圖（互動）")
     plot_out = gr.Plot(label="互動線圖")
     plot_msg = gr.Markdown()
 
+    # --------- 回呼邏輯 ---------
     def run_pipeline(file_path_str, sh_, sm_, ss_, eh_, em_, es_):
         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)
+                    pd.DataFrame(), None, *empty_updates)
 
         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)
+                    pd.DataFrame(), None, *empty_updates)
 
         original_rows = len(out)
 
@@ -411,16 +433,18 @@ 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)
+                    pd.DataFrame(), None, *empty_updates)
 
         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)
+                        pd.DataFrame(), None, *empty_updates)
             secs = series_time_to_seconds_of_day(out["time"])
             parsed_ok = int(secs.notna().sum())
             valid_mask = secs.notna()
@@ -436,15 +460,15 @@ 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)
+                    pd.DataFrame(), None, *empty_updates)
 
         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)
 
         note_lines = [f"完成！原始列數：**{original_rows}**",
@@ -452,9 +476,19 @@ with gr.Blocks(title="Excel/CSV 指定欄位擷取器（含時間過濾＋互動
         if parsed_ok is not None:
             note_lines.insert(1, f"可解析時間列數：**{parsed_ok}**")
             note_lines.insert(2, f"時間區段：**{pad_time(sh_, sm_, ss_)} → {pad_time(eh_, em_, es_)}**")
-        note_lines.append("下方預覽、右側可下載 Excel；並可於下方選擇欄位與樣式繪圖。")
+        note_lines.append("下方預覽、右側可下載；可選欄位與樣式後繪圖。")
         note = "｜".join(note_lines)
 
+        # 初始顏色挑選器狀態
+        picker_updates = []
+        for i in range(MAX_SERIES_FOR_PICKER):
+            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} 顏色"))
+            else:
+                picker_updates.append(gr.update(visible=False))
+
         return (
             gr.update(value=out_path, visible=True),
             note,
@@ -463,21 +497,46 @@ 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
+            init_style_df,  # style_state
+            *picker_updates
         )
 
     def sync_styles(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)
-        return new_df, new_df
+
+        picker_updates = []
+        for i in range(MAX_SERIES_FOR_PICKER):
+            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} 顏色"))
+            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)
+
+    def apply_palette(style_df_current, y_cols, palette_name):
         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)
-        return new_df, new_df
+        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):
+            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} 顏色"))
+            else:
+                picker_updates.append(gr.update(visible=False))
+        return df, df, *picker_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):
         if df is None:
@@ -495,26 +554,46 @@ 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
+
     run_btn.click(
         run_pipeline,
         inputs=[inp, sh, sm, ss, eh, em, es],
-        outputs=[file_out, msg, preview, df_state, x_sel, y_sel, style_df, style_state]
+        outputs=outputs_with_pickers
     )
 
-    # 變更 Y 選擇時，自動同步樣式表
     y_sel.change(
         on_y_change,
         inputs=[style_df, y_sel],
-        outputs=[style_df, style_state]
+        outputs=[style_df, style_state, *color_pickers]
     )
 
-    # 手動按鈕同步（保險）
-    sync_btn.click(
-        sync_styles,
-        inputs=[style_df, y_sel],
-        outputs=[style_df, style_state]
+    apply_palette_btn.click(
+        apply_palette,
+        inputs=[style_df, y_sel, palette_dd],
+        outputs=[style_df, style_state, *color_pickers]
     )
 
+    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]
+        )
+
     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],