Update app.py

app.py

@@ -373,79 +373,6 @@ def generate_trading_signals(df):
 
     return df
 
-def plot_combined(df, ticker):
-    # Create a figure
-    fig = go.Figure()
-
-    # Add closing price trace
-    fig.add_trace(go.Scatter(
-        x=df.index, y=df['Close'], 
-        mode='lines', 
-        name='Closing Price', 
-        line=dict(color='#36D7B7', width=2)  # Brighter pink
-    ))
-
-    # Add buy signals
-    buy_signals = df[df['Combined_Signal'] >= 3]
-    fig.add_trace(go.Scatter(
-        x=buy_signals.index, y=buy_signals['Close'], 
-        mode='markers', 
-        marker=dict(symbol='triangle-up', size=12, color='lightgreen'), 
-        name='Buy Signal'
-    ))
-
-    # Add sell signals
-    sell_signals = df[df['Combined_Signal'] <= -3]
-    fig.add_trace(go.Scatter(
-        x=sell_signals.index, y=sell_signals['Close'], 
-        mode='markers', 
-        marker=dict(symbol='triangle-down', size=12, color='red'), 
-        name='Sell Signal'
-    ))
-
-    # Combined signal trace
-    fig.add_trace(go.Scatter(
-        x=df.index, y=df['Combined_Signal'], 
-        mode='lines', 
-        name='Combined Signal', 
-        line=dict(color='#36A2EB', width=1), # Blue
-        yaxis='y2'
-    ))
-
-    # Update layout
-    fig.update_layout(
-        title=f'{ticker}: Stock Price and Combined Trading Signal (Last 120 Days)',
-        xaxis=dict(
-            title='Date',
-            showgrid=True,
-            gridcolor="rgba(255,255,255,0.1)"
-        ),
-        yaxis=dict(
-            title='Price',
-            side='left',
-            showgrid=True,
-            gridcolor="rgba(255,255,255,0.1)"
-        ),
-        yaxis2=dict(
-            title='Combined Signal',
-            overlaying='y',
-            side='right',
-            showgrid=False
-        ),
-        plot_bgcolor='#111111',
-        paper_bgcolor='#111111',
-        font=dict(color='white', size=12),
-        legend=dict(
-            bgcolor="rgba(0,0,0,0.8)",
-            bordercolor="white",
-            borderwidth=1
-        ),
-        margin=dict(l=40, r=40, t=50, b=40)
-    )
-
-    return fig
-
-import plotly.graph_objects as go
 
 def plot_combined_signals(df, ticker):
     """
@@ -487,7 +414,7 @@ def plot_combined_signals(df, ticker):
 
     return fig
 
-def plot_individual_signals(df, ticker):
+def plot_individual(df, ticker):
     # Create a figure
     fig = go.Figure()
     
@@ -568,6 +495,78 @@ def plot_individual_signals(df, ticker):
 
     return fig
 
+def plot_individual_signals(df, ticker, x_range=None):
+    fig = go.Figure()
+    
+    # Closing price
+    fig.add_trace(go.Scatter(
+        x=df.index, y=df['Close'], 
+        mode='lines', 
+        name='Closing Price', 
+        line=dict(color='#36A2EB', width=2)  
+    ))
+
+    signal_colors = {
+        'MACD_Signal': {'buy': '#39FF14', 'sell': '#FF073A'},
+        'RSI_Signal': {'buy': '#39FF14', 'sell': '#FF073A'},
+        'BB_Signal': {'buy': '#39FF14', 'sell': '#FF073A'},
+        'Stochastic_Signal': {'buy': '#39FF14', 'sell': '#FF073A'},
+        'CMF_Signal': {'buy': '#39FF14', 'sell': '#FF073A'},
+        'CCI_Signal': {'buy': '#39FF14', 'sell': '#FF073A'}
+    }
+
+    signal_names = ['MACD_Signal', 'RSI_Signal', 'BB_Signal', 
+                    'Stochastic_Signal', 'CMF_Signal', 'CCI_Signal'] 
+    
+    for signal in signal_names:
+        buy_signals = df[df[signal] == 1]
+        sell_signals = df[df[signal] == -1]
+        
+        fig.add_trace(go.Scatter(
+            x=buy_signals.index, y=buy_signals['Close'], 
+            mode='markers', 
+            marker=dict(symbol='triangle-up', size=12, color=signal_colors[signal]['buy']), 
+            name=f'{signal} Buy'
+        ))
+        fig.add_trace(go.Scatter(
+            x=sell_signals.index, y=sell_signals['Close'], 
+            mode='markers', 
+            marker=dict(symbol='triangle-down', size=12, color=signal_colors[signal]['sell']), 
+            name=f'{signal} Sell'
+        ))
+
+    fig.update_layout(
+        title=f'{ticker}: Individual Trading Signals',
+        xaxis=dict(
+            title='Date',
+            showgrid=True,
+            gridcolor="rgba(255,255,255,0.1)",
+            range=x_range  # ←←← Shared x-axis range
+        ),
+        yaxis=dict(
+            title='Price',
+            side='left',
+            showgrid=True,
+            gridcolor="rgba(255,255,255,0.1)"
+        ),
+        plot_bgcolor='#111111',
+        paper_bgcolor='#111111',
+        font=dict(color='white', size=12),
+        legend=dict(
+            orientation='h',          # Horizontal legend
+            yanchor='bottom',
+            y=1.02,                   # Just above the plot
+            xanchor='right',
+            x=1,
+            bgcolor="rgba(0,0,0,0.8)",
+            bordercolor="white",
+            borderwidth=1
+        ),
+        margin=dict(l=40, r=40, t=80, b=40)  # Extra top margin for legend
+    )
+
+    return fig
+
 def technical_analysis(ticker, start_date, end_date):
     try:
         # Download stock data using the StockDataFetcher class