添加新的判断依据
This commit is contained in:
+1
-27
@@ -521,7 +521,7 @@ def analyze_chan(df, symbol=None, timeframe=None):
|
||||
ema52_dict = None
|
||||
# 获取分析结果
|
||||
klu_list = chan.get_kl_data(df)
|
||||
klc_list = chan.get_klc_list(df)
|
||||
klc_list = chan.get_klc_list(klu_list)
|
||||
bi_list = chan.cal_bi_list(klc_list)
|
||||
#for index in range(0, 10):
|
||||
#print(bi_list[index].start_time, bi_list[index].start_klc.end_time, bi_list[index].dir)
|
||||
@@ -1209,9 +1209,6 @@ def analyze():
|
||||
elements_only_param = request.args.get('elements_only')
|
||||
elements_only = elements_only_param == 'true'
|
||||
|
||||
# 获取是否需要回放数据的参数
|
||||
need_replay_data = request.args.get('need_replay_data', 'false').lower() == 'true'
|
||||
|
||||
# 验证小周期是否小于主周期
|
||||
if element_timeframe and not is_smaller_or_equal_timeframe(element_timeframe, timeframe):
|
||||
return jsonify({'error': '分形元素时间周期必须小于或等于主图表时间周期'})
|
||||
@@ -1243,12 +1240,6 @@ def analyze():
|
||||
# 计算MACD
|
||||
macd_data = calculate_macd(df)
|
||||
|
||||
# 如果需要回放数据,生成逐步计算的回放数据
|
||||
if need_replay_data:
|
||||
replay_data = generate_replay_data(df, client_tz, symbol, element_timeframe, start_time, end_time)
|
||||
else:
|
||||
replay_data = None
|
||||
|
||||
# 基于已有 KLC 列表生成趋势标记(不做额外计算)
|
||||
klc_trend = []
|
||||
try:
|
||||
@@ -1391,9 +1382,6 @@ def analyze():
|
||||
'klc_trend': klc_trend
|
||||
})
|
||||
|
||||
# 如果生成了回放数据,添加到返回结果中
|
||||
if replay_data is not None:
|
||||
result['replay_data'] = replay_data
|
||||
|
||||
# 如果有指定分形元素时间周期,获取小周期数据
|
||||
if element_timeframe:
|
||||
@@ -1670,19 +1658,5 @@ def get_uncompleted_seg_list(seg_list, client_tz):
|
||||
|
||||
return result
|
||||
|
||||
def format_fx_type(fx_type):
|
||||
"""格式化分型类型显示"""
|
||||
fx_type_map = {
|
||||
'TOP1': '顶分型1',
|
||||
'TOP2': '顶分型2',
|
||||
'TOP3': '顶分型3',
|
||||
'BOTTOM1': '底分型1',
|
||||
'BOTTOM2': '底分型2',
|
||||
'BOTTOM3': '底分型3',
|
||||
'TOP': '顶分型',
|
||||
'BOTTOM': '底分型'
|
||||
}
|
||||
return fx_type_map.get(fx_type, fx_type)
|
||||
|
||||
if __name__ == '__main__':
|
||||
app.run(debug=True, host='0.0.0.0', port=8128)
|
||||
Reference in New Issue
Block a user