制动性能测试和数据处理已完成

code/data_process/current.py

@@ -4,6 +4,7 @@ import openpyxl
 import pandas
 import re
 import csv
+import time
 from common import clibs
 
 
@@ -161,12 +162,10 @@ def current_cycle(data_files, vel, trq, trqh, sensor, rrs, rcs, params, w2t, ins
     t_excel.daemon = True
     t_excel.start()
     t_excel.join()
+    wb.close()
     clibs.stop = False
     t_progress.join()
 
-    w2t("----------------------------------------------------------\n")
-    w2t("全部处理完毕")
-
 
 def find_point(data_file, df, flag, row_s, row_e, threshold, step, end_point, skip_scale, axis, seq, w2t, insert_logdb):
     if flag == "lt":
@@ -255,7 +254,7 @@ def p_single(wb, single, vel, trq, sensor, rrs, w2t, insert_logdb):
         row_e = df.index[-1]
         row_s = row_e - end_point
         speed_avg = df.iloc[row_s:row_e].abs().mean()
-        if speed_avg < 2:
+        if speed_avg < threshold:
             # 第一次过滤：消除速度为零的数据，找到速度即将大于零的上升临界点
             row_s, row_e = find_point(data_file, df, "lt", row_s, row_e, threshold, step, end_point, skip_scale, axis, "pre-1", w2t, insert_logdb)
             row_e -= end_point*skip_scale
@@ -281,7 +280,7 @@ def p_single(wb, single, vel, trq, sensor, rrs, w2t, insert_logdb):
             # 正式第三次采集：消除速度大于零的数据，找到速度即将趋近于零的下降临界点
             row_s, row_e = find_point(data_file, df, "gt", row_s, row_e, threshold, step, end_point, skip_scale, axis, 3, w2t, insert_logdb)
             row_start = get_row_number(threshold, "start", df, row_s, row_e, axis, insert_logdb)
-        elif speed_avg > 2:
+        elif speed_avg > threshold:
             # 第一次过滤：消除速度大于零的数据，找到速度即将趋近于零的下降临界点
             row_s, row_e = find_point(data_file, df, "gt", row_s, row_e, threshold, step, end_point, skip_scale, axis, "pre-1", w2t, insert_logdb)
             row_e -= end_point*skip_scale
@@ -409,6 +408,7 @@ def get_configs(config_file, w2t, insert_logdb):
 
 
 def main():
+    time_start = time.time()
     sub = clibs.data_dp["_sub"]
     path = clibs.data_dp["_path"]
     vel = int(clibs.data_dp["_vel"])
@@ -429,6 +429,12 @@ def main():
     elif sub == "cycle":
         current_cycle(data_files, vel, trq, trqh, sensor, rrs, rcs, params, w2t, insert_logdb)
 
+    w2t("-"*60 + "\n全部处理完毕\n")
+    time_end = time.time()
+    time_total = time_end - time_start
+    msg = f"数据处理时间：{time_total // 3600:02.0f} h {time_total % 3600 // 60:02.0f} m {time_total % 60:02.0f} s\n"
+    w2t(msg)
+
 
 if __name__ == '__main__':
     main()