Update app.py

app.py

@@ -14,9 +14,11 @@ import folium
 from matplotlib import cm
 import branca.colormap as bcm
 import folium.plugins as plugins
+from matplotlib.patches import Wedge, Rectangle, FancyArrowPatch
+from matplotlib.path import Path as mpath
 
 from grafanalib.core import (
-    Dashboard, Graph, Row, Target, YAxis, YAxes, Time
+    Dashboard, Graph, Row, Target, YAxis, YAxes, Time, BarGauge
 )
 
 TAIPEI = tz.gettz("Asia/Taipei")
@@ -153,7 +155,7 @@ def filter_data(df: pd.DataFrame, start_time: str, end_time: str) -> pd.DataFram
 
 
 # -----------------------------
-# grafanalib JSON builder
+# grafanalib JSON builder (新增 BarGauge)
 # -----------------------------
 def build_grafanalib_dashboard(series_columns: list[str], dual_axis: bool, rolling_window: int) -> dict:
     panels = []
@@ -192,6 +194,14 @@ def build_grafanalib_dashboard(series_columns: list[str], dual_axis: bool, rolli
             yAxes=YAxes(left=YAxis(format="short"), right=YAxis(format="short")),
         )
     )
+    # 新增 BarGauge 面板，顯示最新值
+    panels.append(
+        BarGauge(
+            title=f"Latest {series_columns[0]}",
+            dataSource="(example)",
+            targets=[Target(expr=f"last({series_columns[0]})", legendFormat=series_columns[0])],
+        )
+    )
     return Dashboard(
         title="Grafana-like Demo (grafanalib + Gradio)",
         rows=[Row(panels=panels)],
@@ -270,6 +280,76 @@ def render_rolling(df, col, window=5):
     return fig, df
 
 
+# -----------------------------
+# 新增 Gauge 渲染 (使用 Matplotlib patches)
+# -----------------------------
+def degree_range(n):
+    start = np.linspace(0, 180, n + 1, endpoint=True)[0:-1]
+    end = np.linspace(0, 180, n + 1, endpoint=True)[1:]
+    mid_points = start + ((end - start) / 2.)
+    return np.c_[start, end], mid_points
+
+
+def rot_text(ang):
+    rotation = np.degrees(np.radians(ang) * np.pi / np.pi - np.radians(90))
+    return rotation
+
+
+def render_gauge(df, col):
+    value = df[col].iloc[-1] if not df.empty else 0
+    min_val, max_val = df[col].min(), df[col].max()
+    normalized = (value - min_val) / (max_val - min_val + 1e-9) if max_val > min_val else 0
+
+    labels = ['LOW', 'MEDIUM', 'HIGH']
+    N = len(labels)
+    colors = ['#007A00', '#FFCC00', '#ED1C24']  # Green, Yellow, Red
+
+    if normalized < 0.33:
+        arrow = 1
+    elif normalized < 0.66:
+        arrow = 2
+    else:
+        arrow = 3
+
+    fig, ax = plt.subplots(figsize=(6, 4))
+
+    ang_range, mid_points = degree_range(N)
+
+    labels = labels[::-1]
+
+    patches = []
+    for ang, c in zip(ang_range, colors):
+        patches.append(Wedge((0., 0.), .4, *ang, facecolor='w', lw=2))
+        patches.append(Wedge((0., 0.), .4, *ang, width=0.10, facecolor=c, lw=2, alpha=0.5))
+
+    [ax.add_patch(p) for p in patches]
+
+    for mid, lab in zip(mid_points, labels):
+        ax.text(0.35 * np.cos(np.radians(mid)), 0.35 * np.sin(np.radians(mid)), lab,
+                horizontalalignment='center', verticalalignment='center', fontsize=14,
+                fontweight='bold', rotation=rot_text(mid))
+
+    r = Rectangle((-0.4, -0.1), 0.8, 0.1, facecolor='w', lw=2)
+    ax.add_patch(r)
+
+    ax.text(0, -0.05, f"Latest {col}: {value:.2f}", horizontalalignment='center',
+            verticalalignment='center', fontsize=14, fontweight='bold')
+
+    pos = mid_points[abs(arrow - N)]
+    ax.arrow(0, 0, 0.225 * np.cos(np.radians(pos)), 0.225 * np.sin(np.radians(pos)),
+             width=0.04, head_width=0.09, head_length=0.1, fc='k', ec='k')
+
+    ax.add_patch(FancyArrowPatch((0, 0), (0.01 * np.cos(np.radians(pos)), 0.01 * np.sin(np.radians(pos))),
+                                 mutation_scale=10, fc='k', ec='k'))
+
+    ax.set_frame_on(False)
+    ax.axes.set_xticks([])
+    ax.axes.set_yticks([])
+    ax.axis('equal')
+    plt.tight_layout()
+    return fig
+
+
 # -----------------------------
 # Folium helpers (map + legend + heatmap)
 # -----------------------------
@@ -337,7 +417,7 @@ def make_point_choices(df: pd.DataFrame) -> list[str]:
     labels = []
     for _, r in df.iterrows():
         t = pd.to_datetime(r["time"]).strftime("%H:%M:%S")
-        labels.append(f"#{int(r['pid'])} | {t} | amp={r['amplitude']:.3f} cnt={int(r['count'])}")
+        labels.append(f"#{int(r['pid'])} | {t} | amp={r.get('amplitude', 0):.3f} cnt={int(r.get('count', 0))}")
     return labels
 
 
@@ -376,11 +456,12 @@ def pipeline(source, file, sheet_url, series_choice, dual_axis, rolling_window,
         fig1 = render_line(df, chosen[0])
         fig2 = render_bar_or_dual(df, chosen[1], chosen[0], bool(dual_axis)) if len(chosen) > 1 else plt.figure()
         fig3, df_with_roll = render_rolling(df.copy(), chosen[0], int(rolling_window))
+        fig4 = render_gauge(df, chosen[0])
 
         map_html = render_map_folium(df, value_col=chosen[0], size_col=chosen[1] if len(chosen) > 1 else "count",
                                      cmap_name=cmap_choice, tiles=tiles_choice, show_heatmap=bool(show_heatmap))
 
-        point_choices = make_point_choices(df)
+        point_choices = [] if show_heatmap else make_point_choices(df)
         default_choice = point_choices[0] if point_choices else ""
         detail_df = pick_detail(df, default_choice)
 
@@ -390,7 +471,7 @@ def pipeline(source, file, sheet_url, series_choice, dual_axis, rolling_window,
             demo_csv_path = f.name
 
         return (
-            fig1, fig2, fig3, map_html,
+            fig1, fig2, fig3, fig4, map_html,
             dash_json_str, json_path, df_with_roll,
             demo_csv_path,
             gr.Dropdown(choices=point_choices, value=default_choice),
@@ -399,7 +480,7 @@ def pipeline(source, file, sheet_url, series_choice, dual_axis, rolling_window,
         )
     except Exception as e:
         return (
-            None, None, None, "<p>錯誤：無資料顯示</p>",
+            None, None, None, None, "<p>錯誤：無資料顯示</p>",
             "", None, pd.DataFrame(),
             None,
             gr.Dropdown(choices=[], value=None),
@@ -417,10 +498,10 @@ def update_detail(df: pd.DataFrame, choice: str):
 
 
 # -----------------------------
-# UI 優化：使用 Tab 分頁、添加錯誤顯示、時間過濾、熱圖選項
+# UI 優化：使用 Tab 分頁、添加錯誤顯示、時間過濾、熱圖選項、優化圖表佈局
 # -----------------------------
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
-    gr.Markdown("## 優化版 Grafana-like Demo + Folium Map（支援 Google Drive / Sheets，新增熱圖）")
+    gr.Markdown("## 優化版 Grafana-like Demo + Folium Map（支援 Google Drive / Sheets，新增熱圖與 Gauge）")
 
     with gr.Row():
         with gr.Column(scale=1):
@@ -433,7 +514,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
             )
             with gr.Row():
                 start_time_in = gr.Textbox(label="開始時間 (YYYY-MM-DD HH:MM:SS)", placeholder="2023-01-01 00:00:00")
-                end_time_in = gr.Textbox(label="結束時間 (YYYY-MM-DD HH:59:59)", placeholder="2023-12-31 23:59:59")
+                end_time_in = gr.Textbox(label="結束時間 (YYYY-MM-DD HH:MM:SS)", placeholder="2023-12-31 23:59:59")
 
         with gr.Column(scale=1):
             series_multiselect = gr.CheckboxGroup(label="數值欄位", choices=[])
@@ -459,7 +540,9 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
             with gr.Row():
                 plot1 = gr.Plot(label="1：Line")
                 plot2 = gr.Plot(label="2：Bar / Dual Axis")
+            with gr.Row():
                 plot3 = gr.Plot(label="3：Rolling Mean")
+                plot4 = gr.Plot(label="4：Gauge")
 
         with gr.Tab("地圖"):
             map_out = gr.HTML(label="4：Geo Map (Interactive + Legend + Heatmap)")
@@ -473,7 +556,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
             df_view = gr.Dataframe(label="資料預覽（含 rolling）", wrap=True)
 
         with gr.Tab("點位詳情"):
-            gr.Markdown("### 🔎 點位詳情（對應地圖彈窗中的 #ID）")
+            gr.Markdown("### 🔎 點位詳情（對應地圖彈窗中的 #ID，熱圖模式下不可用）")
             point_selector = gr.Dropdown(label="選擇點位（#ID | 時間 | 值）", choices=[], value=None)
             detail_view = gr.Dataframe(label="選取點詳細資料", wrap=True)
 
@@ -499,7 +582,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         lambda: pipeline("drive", None, DRIVE_PRESETS[0], [], False, "5", "viridis", "OpenStreetMap", "", "", False),
         inputs=None,
         outputs=[
-            plot1, plot2, plot3, map_out,
+            plot1, plot2, plot3, plot4, map_out,
             json_box, json_file, df_view,
             demo_csv_file,
             point_selector, detail_view,
@@ -512,7 +595,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         pipeline,
         inputs=[source_radio, file_in, preset_dd, series_multiselect, dual_axis_chk, rolling_dd, cmap_dd, tiles_dd, start_time_in, end_time_in, heatmap_chk],
         outputs=[
-            plot1, plot2, plot3, map_out,
+            plot1, plot2, plot3, plot4, map_out,
             json_box, json_file, df_view,
             demo_csv_file,
             point_selector, detail_view,
@@ -524,7 +607,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         regenerate_demo,
         inputs=[series_multiselect, dual_axis_chk, rolling_dd, cmap_dd, tiles_dd, point_selector, start_time_in, end_time_in, heatmap_chk],
         outputs=[
-            plot1, plot2, plot3, map_out,
+            plot1, plot2, plot3, plot4, map_out,
             json_box, json_file, df_view,
             demo_csv_file,
             point_selector, detail_view,