diff --git a/.DS_Store b/.DS_Store index 541ac0a..b7cc749 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/ChanKLU.py b/ChanKLU.py index eaef870..8a5a9f8 100644 --- a/ChanKLU.py +++ b/ChanKLU.py @@ -88,8 +88,6 @@ class ChanKLU: if self.klc and self.klc.pre and self.klc.next: if self.klc.klc_fx_type != Chan_KLC_FX.UNKNOWN or self.klc.pre.klc_fx_type != Chan_KLC_FX.UNKNOWN or self.klc.next.klc_fx_type != Chan_KLC_FX.UNKNOWN: self.separate_div = 99 - else: - self.separate_div = 0 def set_next(self, next): self.next = next #if self.fx_type != Chan_FX_TYPE.UNKNOWN and self.fx_strength > 1: diff --git a/ChanSBI.py b/ChanSBI.py index 0f693c7..f12d6da 100644 --- a/ChanSBI.py +++ b/ChanSBI.py @@ -61,6 +61,9 @@ class ChanSBI(): included = False else: included = False + # high小于,low大于,右包含 + if self.low > bi.low: + included = True if included: if self.pre: if self.high > self.pre.high and self.low < self.pre.low: @@ -75,4 +78,5 @@ class ChanSBI(): # DOWN -> min(gn) self.high = bi.high #self.print(bi, "Z") + #print(self.start_bi.start_time, bi.start_time, included) return included \ No newline at end of file diff --git a/web/.DS_Store b/web/.DS_Store index 8b8c023..0e37fdc 100644 Binary files a/web/.DS_Store and b/web/.DS_Store differ diff --git a/web/templates/index.html b/web/templates/index.html index 6727fef..22c1186 100644 --- a/web/templates/index.html +++ b/web/templates/index.html @@ -5918,9 +5918,9 @@ lineWidth: 2, lineStyle: 0, upperColor: '#ff6b6b', - middleColor: '#667eea', - lowerColor: '#4ecdc4', - visible: true + middleColor: '#ffffff', + lowerColor: '#ff6b6b', + visible: false }; bollingerBands.push(defaultBB); console.log('添加默认布林带: BB(20, 2, 2)');