diff --git a/stock/analysis/AnalyzerSqlite.py b/stock/analysis/AnalyzerSqlite.py index be5108c..ee60d52 100644 --- a/stock/analysis/AnalyzerSqlite.py +++ b/stock/analysis/AnalyzerSqlite.py @@ -137,7 +137,7 @@ class AnalyzerSqlite: avg60 = list(reversed(stock['avg60'])) avg120 = list(reversed(stock['avg120'])) avg240 = list(reversed(stock['avg240'])) - avg300 = list(reversed(stock['avg300'])) + avg480 = list(reversed(stock['avg480'])) disparity_avg5 = list(reversed(stock['disparity_avg5'])) disparity_avg10 = list(reversed(stock['disparity_avg10'])) disparity_avg20 = list(reversed(stock['disparity_avg20'])) @@ -157,10 +157,11 @@ class AnalyzerSqlite: envelope_lower = list(reversed(stock['envelope_lower'])) ichimokucloud_changeLine = list(reversed(stock['ichimokucloud_changeLine'])) ichimokucloud_baseLine = list(reversed(stock['ichimokucloud_baseLine'])) - ichimokucloud_laggingSpan = list(reversed(stock['ichimokucloud_laggingSpan'])) + ichimokucloud_laggingSpan = [laggingSpan if -1 < laggingSpan else None for laggingSpan in stock['ichimokucloud_laggingSpan']] + ichimokucloud_laggingSpan = list(reversed(ichimokucloud_laggingSpan)) ichimokucloud_leadingSpan1 = list(reversed(stock['ichimokucloud_leadingSpan1'])) ichimokucloud_leadingSpan2 = list(reversed(stock['ichimokucloud_leadingSpan2'])) - + trend = list(reversed(stock['trend'])) # general candle_stick = go.Candlestick(x=ymd, open=open, high=high, low=low, close=close, increasing_line_color='red', decreasing_line_color='blue') @@ -177,7 +178,7 @@ class AnalyzerSqlite: avg60 = go.Scatter(x=ymd, y=avg60, name="avg60", line_color='#f89543') avg120 = go.Scatter(x=ymd, y=avg120, name="avg120", line_color='#0ed604') avg240 = go.Scatter(x=ymd, y=avg240, name="avg240", line_color='#FF00F7') - #avg300 = go.Scatter(x=ymd, y=avg300, name="avg300", line_color='#00FF49') + avg480 = go.Scatter(x=ymd, y=avg480, name="avg480", line_color='#00FF49') bolinger_upper = go.Scatter(x=ymd, y=bolingerband_upper, name="bol_upper", line_color='#8B4513') bolinger_lower = go.Scatter(x=ymd, y=bolingerband_lower, name="bol_lower", line_color='#8B4513') env_upper = go.Scatter(x=ymd, y=envelope_upper, name="env_upper", line_color='#FF33A2') @@ -187,11 +188,12 @@ class AnalyzerSqlite: laggingSpan = go.Scatter(x=ymd, y=ichimokucloud_laggingSpan, name='laggingSpan', line_color='#B50ABB') leadingSpan1 = go.Scatter(x=ymd, y=ichimokucloud_leadingSpan1, name='leadingSpan1', line_color='black') leadingSpan2 = go.Scatter(x=ymd, y=ichimokucloud_leadingSpan2, name='leadingSpan2', line_color='black') + trend = go.Scatter(x=ymd, y=trend, name="trend", line_color='#574e4c') - #candle_data = [candle_stick, avg3, avg4, avg5, avg6, avg10, avg12, avg20, avg36, avg40, avg48, avg60, avg120, avg240, avg300, bolinger_upper, bolinger_lower, changeLine, baseLine] - #candle_data = [candle_stick, avg5, avg10, avg20, avg60, avg120, avg240, bolinger_upper, bolinger_lower, env_upper, env_lower, changeLine, baseLine] - candle_data = [avg5, avg20, changeLine, baseLine, laggingSpan, candle_stick] + candle_data = [candle_stick, trend, avg5, avg20, avg60, avg120, avg240, avg480, bolinger_upper, bolinger_lower, changeLine, baseLine, laggingSpan] + #candle_data = [candle_stick, trend, avg5, avg10, avg20, avg60, avg120, avg240, bolinger_upper, bolinger_lower, env_upper, env_lower, changeLine, baseLine] + #candle_data = [avg5, avg20, trend, changeLine, baseLine, laggingSpan, candle_stick] volume = go.Bar(x=ymd, y=volume, marker_color='red', name="volume") volume_data = [volume]