diff --git a/stock/analysis/AnalyzerSqlite.py b/stock/analysis/AnalyzerSqlite.py index 2f28276..4d93034 100644 --- a/stock/analysis/AnalyzerSqlite.py +++ b/stock/analysis/AnalyzerSqlite.py @@ -154,6 +154,8 @@ class AnalyzerSqlite: stochastic_slow_d = list(reversed(stock['stochastic_slow_d'])) bolingerband_upper = list(reversed(stock['bolingerband_upper'])) bolingerband_lower = list(reversed(stock['bolingerband_lower'])) + envelope_upper = list(reversed(stock['envelope_upper'])) + envelope_lower = list(reversed(stock['envelope_lower'])) ichimokucloud_changeLine = list(reversed(stock['ichimokucloud_changeLine'])) ichimokucloud_baseLine = list(reversed(stock['ichimokucloud_baseLine'])) @@ -173,13 +175,15 @@ class AnalyzerSqlite: 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') - bolinger_upper = go.Scatter(x=ymd, y=bolingerband_upper, name="upper", line_color='#8B4513') - bolinger_lower = go.Scatter(x=ymd, y=bolingerband_lower, name="lower", line_color='#8B4513') + 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') + env_lower = go.Scatter(x=ymd, y=envelope_lower, name="env_lower", line_color='#FF33A2') changeLine = go.Scatter(x=ymd, y=ichimokucloud_changeLine, name="changeLine", line_color='#000000') baseLine = go.Scatter(x=ymd, y=ichimokucloud_baseLine, name="baseLine", line_color='#FF0000') #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, changeLine, baseLine] + candle_data = [candle_stick, avg5, avg10, avg20, avg60, avg120, avg240, bolinger_upper, bolinger_lower, env_upper, env_lower, changeLine, baseLine] #candle_data = [candle_stick, bolinger_upper, bolinger_lower, changeLine, baseLine] volume = go.Bar(x=ymd, y=volume, marker_color='red', name="volume")