diff --git a/ChanKLC.py b/ChanKLC.py index 850fd15..c9346ac 100644 --- a/ChanKLC.py +++ b/ChanKLC.py @@ -1223,14 +1223,10 @@ class ChanKLC(): if self.bi.dir == Chan_BI_DIR.DOWN and self.fx == Chan_FX_TYPE.TOP: return strength if self.bi.dir == Chan_BI_DIR.UP: - if self.klc_fx_type == Chan_KLC_FX.TOP1: - strength += self.check_bi_end(self.bi) - elif self.klc_fx_type == Chan_KLC_FX.TOP2: + if self.klc_fx_type == Chan_KLC_FX.TOP1 or self.klc_fx_type == Chan_KLC_FX.TOP2 or self.klc_fx_type == Chan_KLC_FX.TOP3: strength += self.check_bi_end(self.bi) else: - if self.klc_fx_type == Chan_KLC_FX.BOTTOM1: - strength += self.check_bi_end(self.bi) - elif self.klc_fx_type == Chan_KLC_FX.BOTTOM2: + if self.klc_fx_type == Chan_KLC_FX.BOTTOM1 or self.klc_fx_type == Chan_KLC_FX.BOTTOM2 or self.klc_fx_type == Chan_KLC_FX.BOTTOM3: strength += self.check_bi_end(self.bi) else: return strength diff --git a/ChanLun.py b/ChanLun.py index c4074f5..f2c8b4a 100644 --- a/ChanLun.py +++ b/ChanLun.py @@ -836,6 +836,7 @@ class ChanLun(): #klc.set_state("20") bi_list[-1].add_klc(klc) klc.set_bi(bi_list[-1]) + klc.set_klc_fx_type(Chan_KLC_FX.TOP3) #print(klc.start_time, klc.fx, "二类卖点Sell 1") else: # A new top found @@ -955,6 +956,7 @@ class ChanLun(): #klc.set_state("-20") bi_list[-1].add_klc(klc) klc.set_bi(bi_list[-1]) + klc.set_klc_fx_type(Chan_KLC_FX.BOTTOM3) #print(klc.start_time, klc.fx, "二类买点Buy 1") else: # A new bottom found diff --git a/web/templates/index.html b/web/templates/index.html index faf8c10..fadb286 100644 --- a/web/templates/index.html +++ b/web/templates/index.html @@ -3387,7 +3387,7 @@ if (fx.fx_strength < 1.0) { // 降低阈值,让更多分型显示 displayText = fx.fx_strength >= 0.8 ? '' : '' // 0.8以上显示点,0.8以下不显示文本 } - + displayText = fx.fx_type.replace("TOP", "").replace("BOTTOM", "").replace("1", "").replace("2", "").replace("30", ""); // 添加标记配置 const markerConfig = { time: timestamp, @@ -3536,7 +3536,7 @@ if (fx.fx_strength < 1.0){ // 调整小周期阈值 displayText = fx.fx_strength >= 0.6 ? '' : '' // 0.6以上显示点 } - + displayText = fx.fx_type.replace("TOP", "").replace("BOTTOM", "").replace("1", "").replace("2", "").replace("30", ""); // 小周期分型标记配置 const markerConfig = { time: timestamp,