Change app and other py

ChanLun.py

@@ -153,6 +153,36 @@ class ChanLun():
 	def get_bi_list(self, dataframe):
 		bi_list = self.cal_bi_list(self.get_klc_list(dataframe))
 		return bi_list
+	# --------------------------------------------------------------------
+	def get_kl_data(self, dataframe:DataFrame):
+		fields = "time,open,high,low,close,volume"
+		klu_list = []
+		for i in range(0, len(dataframe)):
+			item = dataframe.iloc[i]
+			date = item['date']
+			o = item['open']
+			h = item['high']
+			l = item['low']
+			c = item['close']
+			v = item['volume']
+			#time_obj = date.fromtimestamp(date)
+			#date = date + timedelta(hours=8)
+			time_str = date.strftime('%Y-%m-%d %H:%M:%S')
+			item_data = [
+				time_str,
+				o,
+				h,
+				l,
+				c,
+				v
+			]
+			#klu =  KLU(self.create_item_dict(item_data, GetColumnNameFromFieldList(fields)))
+			klu = ChanKLU(time_str, o, h, l, c, v)
+			klu.set_idx(i)
+			klu_list.append(klu)
+			if True:
+				klu.set_indicators(item)
+		return klu_list
 	def calculate_zs(self, bi_list, seg_list):
 		return self.get_zs_list(bi_list, seg_list)
 
@@ -521,7 +551,7 @@ class ChanLun():
 		# 打印识别结果
 		print(f"笔中枢识别完成，共找到 {len(bi_zs_list)} 个笔中枢")
 		return bi_zs_list
-	
+	#-------------------------------------------------------------------
 	def cal_bi_list(self, klc_list):
 		bi_list = []
 		last_top = None
@@ -782,6 +812,8 @@ class ChanLun():
 				klc.state = "-10"
 				#print(klc.time, klc.state)
 		"""
+		#for index in range(0, 10):
+			#print(bi_list[index].start_time, bi_list[index].start_klc.start_time, bi_list[index].dir)
 		return bi_list
 	
 	def get_zs_list(self, bi_list, seg_list):
@@ -1102,35 +1134,6 @@ class ChanLun():
 				klc.set_end_klu(klu)
 		return klc_list
 	
-	def get_kl_data(self, dataframe:DataFrame):
-		fields = "time,open,high,low,close,volume"
-		klu_list = []
-		for i in range(0, len(dataframe)):
-			item = dataframe.iloc[i]
-			date = item['date']
-			o = item['open']
-			h = item['high']
-			l = item['low']
-			c = item['close']
-			v = item['volume']
-			#time_obj = date.fromtimestamp(date)
-			#date = date + timedelta(hours=8)
-			time_str = date.strftime('%Y-%m-%d %H:%M:%S')
-			item_data = [
-				time_str,
-				o,
-				h,
-				l,
-				c,
-				v
-			]
-			#klu =  KLU(self.create_item_dict(item_data, GetColumnNameFromFieldList(fields)))
-			klu = ChanKLU(time_str, o, h, l, c, v)
-			klu.set_idx(i)
-			klu_list.append(klu)
-			if True:
-				klu.set_indicators(item)
-		return klu_list
 	
 	def get_bsp_list1(self, big_df):
 		big_bi_list = self.get_bi_list(big_df)
@@ -1498,7 +1501,7 @@ class ChanLun():
 			area = histogram[start_idx:end_idx+1][histogram[start_idx:end_idx+1] < 0].sum()
 			
 		return abs(area)
-
+	# --------------------------------------------------------------------
 	def plot_dual(self, small_df, big_df):
 		"""
 		绘制双周期K线图表，包括两个周期的笔、线段、中枢和买卖点