Update app.py

app.py

@@ -823,15 +823,11 @@ def update_advanced_technical_chart(indicator, selected_stock, period):
     if indicator == 'RSI':
         fig = go.Figure()
         fig.add_trace(go.Scatter(x=data.index, y=data['RSI'], mode='lines', name='RSI', line=dict(color='purple', width=2)))
-        # 根據台股慣例修改顏色
         fig.add_hline(y=70, line_dash="dash", line_color="green", annotation_text="超買線(70)")
         fig.add_hline(y=30, line_dash="dash", line_color="red", annotation_text="超賣線(30)")
         fig.add_hline(y=50, line_dash="dot", line_color="gray", annotation_text="中線(50)")
-
-        # 根據台股慣例修改顏色
         fig.add_hrect(y0=70, y1=100, fillcolor="green", opacity=0.1)
         fig.add_hrect(y0=0, y1=30, fillcolor="red", opacity=0.1)
-
         fig.update_layout(
             title=f'{stock_name} - RSI 相對強弱指標',
             xaxis_title='日期',
@@ -841,89 +837,47 @@ 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], # 上方圖佔70%，下方圖佔30%
-                           subplot_titles=('價格走勢', 'MACD 指標')) # 設定子圖標題
-
-        # --- 上方子圖 (row=1)：只繪製價格走勢 ---
+                           vertical_spacing=0.1,
+                           row_heights=[0.7, 0.3],
+                           subplot_titles=('價格走勢', 'MACD 指標'))
         fig.add_trace(go.Scatter(
-            x=data.index,
-            y=data['Close'],
-            mode='lines',
-            name='收盤價',
-            line=dict(color='black', width=1.5)
+            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)
+            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)
+            x=data.index, y=data['MACD_Signal'], mode='lines', name='Signal (慢線)', line=dict(color='red', width=2)
         ), row=2, col=1)
-
-        # 3. Histogram 柱狀圖
-        # 根據台股慣例修改顏色
         colors = ['red' if x >= 0 else 'green' for x in data['MACD_Histogram']]
         fig.add_trace(go.Bar(
-            x=data.index,
-            y=data['MACD_Histogram'],
-            name='MACD柱狀圖',
-            marker_color=colors
+            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_text=f'{stock_name} - MACD 指數平滑異同移動平均線',
-            height=550, # 可以適當增加圖表高度以容納兩個子圖
+            height=550,
             legend_title_text='圖例',
-            showlegend=True # 確保圖例顯示
+            showlegend=True
         )
-        # 隱藏柱狀圖的圖例，因為顏色已經表達了正負值
         fig.update_traces(showlegend=False, selector=dict(type='bar'))
 
     elif indicator == 'BB':
         fig = go.Figure()
-
-        # 價格線
         fig.add_trace(go.Scatter(x=data.index, y=data['Close'], mode='lines', name='收盤價',
                                 line=dict(color='black', width=2)))
-
-        # 布林通道上軌
         fig.add_trace(go.Scatter(x=data.index, y=data['BB_Upper'], mode='lines', name='上軌',
                                 line=dict(color='red', width=1, dash='dash')))
-
-        # 布林通道中軌
         fig.add_trace(go.Scatter(x=data.index, y=data['BB_Middle'], mode='lines', name='中軌(MA20)',
                                 line=dict(color='blue', width=1)))
-
-        # 布林通道下軌
         fig.add_trace(go.Scatter(x=data.index, y=data['BB_Lower'], mode='lines', name='下軌',
                                 line=dict(color='green', width=1, dash='dash')))
-
-        # 填充通道區域
         fig.add_trace(go.Scatter(x=data.index, y=data['BB_Upper'], mode='lines',
                                 line=dict(color='rgba(0,0,0,0)'), showlegend=False))
         fig.add_trace(go.Scatter(x=data.index, y=data['BB_Lower'], mode='lines',
                                 fill='tonexty', fillcolor='rgba(173,216,230,0.2)',
                                 line=dict(color='rgba(0,0,0,0)'), name='布林通道', showlegend=False))
-
         fig.update_layout(
             title=f'{stock_name} - 布林通道 (20日, 2σ)',
             xaxis_title='日期',
@@ -936,28 +890,17 @@ def update_advanced_technical_chart(indicator, selected_stock, period):
                            vertical_spacing=0.1,
                            row_heights=[0.6, 0.4],
                            subplot_titles=('價格走勢', 'KD指標'))
-
-        # 上方：價格線
         fig.add_trace(go.Scatter(x=data.index, y=data['Close'], mode='lines', name='收盤價',
                                 line=dict(color='black', width=1)), row=1, col=1)
-
-        # 下方：KD線
         fig.add_trace(go.Scatter(x=data.index, y=data['K'], mode='lines', name='K線',
                                 line=dict(color='blue', width=2)), row=2, col=1)
         fig.add_trace(go.Scatter(x=data.index, y=data['D'], mode='lines', name='D線',
                                 line=dict(color='red', width=2)), row=2, col=1)
-
-        # KD指標參考線
-        # 根據台股慣例修改顏色
         fig.add_hline(y=80, line_dash="dash", line_color="green", annotation_text="超買線(80)", row=2, col=1)
         fig.add_hline(y=20, line_dash="dash", line_color="red", annotation_text="超賣線(20)", row=2, col=1)
         fig.add_hline(y=50, line_dash="dot", line_color="gray", annotation_text="中線(50)", row=2, col=1)
-
-        # 超買超賣區域
-        # 根據台股慣例修改顏色
         fig.add_hrect(y0=80, y1=100, fillcolor="green", opacity=0.1, row=2, col=1)
         fig.add_hrect(y0=0, y1=20, fillcolor="red", opacity=0.1, row=2, col=1)
-
         fig.update_layout(
             title=f'{stock_name} - KD 隨機指標 (9,3,3)',
             height=500
@@ -969,26 +912,15 @@ def update_advanced_technical_chart(indicator, selected_stock, period):
                            vertical_spacing=0.1,
                            row_heights=[0.6, 0.4],
                            subplot_titles=('價格走勢', '威廉指標 %R'))
-
-        # 上方：價格線
         fig.add_trace(go.Scatter(x=data.index, y=data['Close'], mode='lines', name='收盤價',
                                 line=dict(color='black', width=1)), row=1, col=1)
-
-        # 下方：威廉指標
         fig.add_trace(go.Scatter(x=data.index, y=data['Williams_R'], mode='lines', name='威廉%R',
                                 line=dict(color='purple', width=2)), row=2, col=1)
-
-        # 威廉指標參考線
-        # 根據台股慣例修改顏色
         fig.add_hline(y=-20, line_dash="dash", line_color="green", annotation_text="超買線(-20)", row=2, col=1)
         fig.add_hline(y=-80, line_dash="dash", line_color="red", annotation_text="超賣線(-80)", row=2, col=1)
         fig.add_hline(y=-50, line_dash="dot", line_color="gray", annotation_text="中線(-50)", row=2, col=1)
-
-        # 超買超賣區域
-        # 根據台股慣例修改顏色
         fig.add_hrect(y0=-20, y1=0, fillcolor="green", opacity=0.1, row=2, col=1)
         fig.add_hrect(y0=-100, y1=-80, fillcolor="red", opacity=0.1, row=2, col=1)
-
         fig.update_layout(
             title=f'{stock_name} - 威廉指標 %R (14日)',
             height=500
@@ -1000,19 +932,20 @@ def update_advanced_technical_chart(indicator, selected_stock, period):
                             vertical_spacing=0.1,
                             row_heights=[0.6, 0.4],
                             subplot_titles=('價格走勢', 'DMI 指標'))
+        
         # 過濾掉不穩定的初始數據（通常為14天）
         data_filtered = data.iloc[14:]
 
         # 上方：價格線
-        fig.add_trace(go.Scatter(x=data.index, y=data['Close'], mode='lines', name='收盤價',
+        fig.add_trace(go.Scatter(x=data_filtered.index, y=data_filtered['Close'], mode='lines', name='收盤價',
                                 line=dict(color='black', width=1)), row=1, col=1)
 
         # 下方：DMI 線
-        fig.add_trace(go.Scatter(x=data.index, y=data['+DI'], mode='lines', name='+DI',
+        fig.add_trace(go.Scatter(x=data_filtered.index, y=data_filtered['+DI'], mode='lines', name='+DI',
                                 line=dict(color='red', width=2)), row=2, col=1)
-        fig.add_trace(go.Scatter(x=data.index, y=data['-DI'], mode='lines', name='-DI',
+        fig.add_trace(go.Scatter(x=data_filtered.index, y=data_filtered['-DI'], mode='lines', name='-DI',
                                 line=dict(color='green', width=2)), row=2, col=1)
-        fig.add_trace(go.Scatter(x=data.index, y=data['ADX'], mode='lines', name='ADX',
+        fig.add_trace(go.Scatter(x=data_filtered.index, y=data_filtered['ADX'], mode='lines', name='ADX',
                                 line=dict(color='blue', width=2, dash='dot')), row=2, col=1)
 
         # DMI 參考線