diff --git a/stockpredictor/analysis/AnalyzerSqlite.py b/stockpredictor/analysis/AnalyzerSqlite.py index e8974f6..a359ba9 100644 --- a/stockpredictor/analysis/AnalyzerSqlite.py +++ b/stockpredictor/analysis/AnalyzerSqlite.py @@ -126,7 +126,8 @@ class AnalyzerSqlite: 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, avg5, avg20, avg60, avg120, avg240, bolinger_upper, bolinger_lower, changeLine, baseLine] + #candle_data = [candle_stick, avg5, avg20, avg60, avg120, avg240, bolinger_upper, bolinger_lower, changeLine, baseLine] + candle_data = [candle_stick, bolinger_upper, bolinger_lower, changeLine, baseLine] volume = go.Bar(x=ymd, y=volume, name="volume") volume_data = [volume] @@ -814,7 +815,7 @@ if __name__ == "__main__": fnguideFileName = PROJECT_HOME + '/resources/fnguide.db' analyzer = AnalyzerSqlite(PROJECT_HOME, stockFileName, fnguideFileName) - #analyzer.analyze() + analyzer.analyze() day = datetime.today().strftime("%Y%m%d") diff --git a/stockpredictor/analysis/IchimokuCloud.py b/stockpredictor/analysis/IchimokuCloud.py index b4cc934..e0e85f1 100644 --- a/stockpredictor/analysis/IchimokuCloud.py +++ b/stockpredictor/analysis/IchimokuCloud.py @@ -25,8 +25,7 @@ class IchimokuCloud: df = pd.DataFrame(stock["PRICE"]) leadingSpan1 = go.Scatter(x=df.DATE, y=df['leadingSpan1'], name="선행스팬1", line_color='#8B4513') leadingSpan2 = go.Scatter(x=df.DATE, y=df['leadingSpan2'], name="선행스팬2", line_color='#4169E1') - candle = go.Candlestick(x=df.DATE, open=df.open, high=df.high, low=df.low, close=df.close, - increasing_line_color= 'red', decreasing_line_color= 'blue') + candle = go.Candlestick(x=df.DATE, open=df.open, high=df.high, low=df.low, close=df.close, increasing_line_color= 'red', decreasing_line_color= 'blue') data = [leadingSpan1, leadingSpan2, candle] layout = go.Layout(title='{} MACD 그래프'.format(item_name))