Update app.py

app.py

@@ -796,33 +796,61 @@ def update_advanced_technical_chart(indicator, selected_stock, period):
         )
 
     elif indicator == 'MACD':
+        # 建立兩個垂直排列的子圖，並共享X軸
         fig = make_subplots(rows=2, cols=1, shared_xaxes=True,
-                           vertical_spacing=0.1,
-                           row_heights=[0.7, 0.3],
-                           subplot_titles=('價格與MACD線', 'MACD柱狀圖'))
-
-        # 上方：價格線
-        fig.add_trace(go.Scatter(x=data.index, y=data['Close'], mode='lines', name='收盤價',
-                                line=dict(color='black', width=1)), row=1, col=1)
-
-        # MACD線和信號線
-        fig.add_trace(go.Scatter(x=data.index, y=data['MACD'], mode='lines', name='MACD',
-                                line=dict(color='blue', width=2)), row=1, col=1)
-        fig.add_trace(go.Scatter(x=data.index, y=data['MACD_Signal'], mode='lines', name='信號線',
-                                line=dict(color='red', width=2)), row=1, col=1)
-
-        # 下方：MACD柱狀圖
+                           vertical_spacing=0.1,  # 子圖間的垂直間距
+                           row_heights=[0.7, 0.3], # 上方圖佔70%，下方圖佔30%
+                           subplot_titles=('價格走勢', 'MACD 指標')) # 設定子圖標題
+
+        # --- 上方子圖 (row=1)：只繪製價格走勢 ---
+        fig.add_trace(go.Scatter(
+            x=data.index, 
+            y=data['Close'], 
+            mode='lines', 
+            name='收盤價',
+            line=dict(color='black', width=1.5)
+        ), row=1, col=1)
+
+        # --- 下方子圖 (row=2)：繪製所有MACD相關指標 ---
+        # 1. MACD 快線 (DIF)
+        fig.add_trace(go.Scatter(
+            x=data.index, 
+            y=data['MACD'], 
+            mode='lines', 
+            name='MACD (快線)',
+            line=dict(color='blue', width=2)
+        ), row=2, col=1)
+        
+        # 2. Signal 慢線 (MACD)
+        fig.add_trace(go.Scatter(
+            x=data.index, 
+            y=data['MACD_Signal'], 
+            mode='lines', 
+            name='Signal (慢線)',
+            line=dict(color='red', width=2)
+        ), row=2, col=1)
+        
+        # 3. Histogram 柱狀圖
         colors = ['green' if x >= 0 else 'red' for x in data['MACD_Histogram']]
-        fig.add_trace(go.Bar(x=data.index, y=data['MACD_Histogram'], name='MACD柱狀圖',
-                            marker_color=colors), row=2, col=1)
-
-        fig.add_hline(y=0, line_dash="dash", line_color="gray", row=1, col=1)
+        fig.add_trace(go.Bar(
+            x=data.index, 
+            y=data['MACD_Histogram'], 
+            name='MACD柱狀圖',
+            marker_color=colors
+        ), row=2, col=1)
+
+        # 在MACD子圖中添加一條零軸水平線，方便觀察
         fig.add_hline(y=0, line_dash="dash", line_color="gray", row=2, col=1)
 
+        # 更新整個圖表的佈局
         fig.update_layout(
-            title=f'{stock_name} - MACD 指數平滑異同移動平均線',
-            height=500
+            title_text=f'{stock_name} - MACD 指數平滑異同移動平均線',
+            height=550, # 可以適當增加圖表高度以容納兩個子圖
+            legend_title_text='圖例',
+            showlegend=True # 確保圖例顯示
         )
+        # 隱藏柱狀圖的圖例，因為顏色已經表達了正負值
+        fig.update_traces(showlegend=False, selector=dict(type='bar'))
 
     elif indicator == 'BB':
         fig = go.Figure()