diff --git a/.DS_Store b/.DS_Store index f68b505..87cba7f 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/TF_DF.py b/TF_DF.py index d2cdbb7..3a031cd 100644 --- a/TF_DF.py +++ b/TF_DF.py @@ -872,11 +872,11 @@ class TF_DF(): last_bottom = None for klc in klc_list: fx = self.check_fx(klc) - if fx == Chan_FX_TYPE.TOP: + if fx == Chan_FX_TYPE.TOP and False: if last_bottom: if self.check_top_fx(last_bottom, klc) == False: fx = Chan_FX_TYPE.UNKNOWN - if fx == Chan_FX_TYPE.BOTTOM: + if fx == Chan_FX_TYPE.BOTTOM and False: if last_top: if self.check_bottom_fx(last_top, klc) == False: #print(klc.end_time, last_top.end_time, "---") @@ -1452,7 +1452,7 @@ class TF_DF(): Chan_BSP_TYPE.S1, Chan_BSP_DIR.SELL, leave_bi.sure_time, - 1, zs, None + zs.index+1, zs, None ) leave_bi.end_klc.set_bsp_type(Chan_BSP_TYPE.S1) bsp_list.append(bsp) @@ -1467,7 +1467,7 @@ class TF_DF(): Chan_BSP_TYPE.B3, Chan_BSP_DIR.BUY, pullback_bi.sure_time, - 1, zs, None + zs.index+1, zs, None ) pullback_bi.end_klc.set_bsp_type(Chan_BSP_TYPE.B3) bsp_list.append(bsp) @@ -1481,7 +1481,7 @@ class TF_DF(): Chan_BSP_TYPE.S2, Chan_BSP_DIR.SELL, second_bsp_bi.sure_time, - 1, zs, None + zs.index+1, zs, None ) second_bsp_bi.end_klc.set_bsp_type(Chan_BSP_TYPE.B2) bsp_list.append(bsp) @@ -1495,7 +1495,7 @@ class TF_DF(): Chan_BSP_TYPE.B1, Chan_BSP_DIR.BUY, leave_bi.sure_time, - 1, zs, None + zs.index+1, zs, None ) leave_bi.end_klc.set_bsp_type(Chan_BSP_TYPE.B1) bsp_list.append(bsp) @@ -1510,7 +1510,7 @@ class TF_DF(): Chan_BSP_TYPE.S3, Chan_BSP_DIR.SELL, bounce_bi.sure_time, - 1, zs, None + zs.index+1, zs, None ) bounce_bi.end_klc.set_bsp_type(Chan_BSP_TYPE.S3) bsp_list.append(bsp) @@ -1524,7 +1524,7 @@ class TF_DF(): Chan_BSP_TYPE.B2, Chan_BSP_DIR.BUY, second_bsp_bi.sure_time, - 1, zs, None + zs.index+1, zs, None ) second_bsp_bi.end_klc.set_bsp_type(Chan_BSP_TYPE.B2) bsp_list.append(bsp) diff --git a/web/.DS_Store b/web/.DS_Store index a862785..0904e73 100644 Binary files a/web/.DS_Store and b/web/.DS_Store differ