From d4f17d4009af43bbfd82e4881454ad0b5a7c1cae Mon Sep 17 00:00:00 2001
From: Champagne <1369741103@qq.com>
Date: Fri, 20 Jun 2025 15:39:41 +0800
Subject: [PATCH] 2

---
 py/__pycache__/calc_way.cpython-312.pyc | Bin 11365 -> 11362 bytes
 py/__pycache__/get_data.cpython-312.pyc | Bin 2131 -> 1974 bytes
 py/measure_lib.py                       |  10 +++++-----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/py/__pycache__/calc_way.cpython-312.pyc b/py/__pycache__/calc_way.cpython-312.pyc
index 7918d1c92ba2dedced72a86e8677f0f734f473a4..c61edafc1945edcb63af13b2d2c8051087695873 100644
GIT binary patch
delta 49
zcmaDF@hF1#G%qg~0}%W$4#_yWk=KZw(Q&c^yE1=zW=TwLYGQF|QEGfnX42+T_75rm
Dkn#}F

delta 52
zcmaD9@ic<>G%qg~0}!0JADmINk=KZw(Pgp&yRuMNW^rj^jzVr~VsU9vYHn&?$>t*V
G4=Mo2U=j@g

diff --git a/py/__pycache__/get_data.cpython-312.pyc b/py/__pycache__/get_data.cpython-312.pyc
index 7f30ffe89134f8c5a384050718b7023b1c28173a..2c9a8512d86b5f78fcbb5ffa5faf529e55b2e0ef 100644
GIT binary patch
delta 124
zcmV-?0E7S25Vj8u%MA?*000009{f~jfsqYc0_X#=YF_~nTmS%l1bhT!1ZzY90CNG1
z36m-WAd_SQfdN{x<^s_H0m+lN1keFNlZgc*4`*p~Ty14xb9HiMUu<b&lfDHb0@wkQ
e;{~V%@CE=34YR-oGyw=lCj-YP1xGQH{0CPR$0oi2

delta 124
zcmV-?0E7Rw57Q70%MA?*00000of%7LeUS}Y0#XFAYF_~Xk(00ja0+AuYeWD5a{-J#
zlfVNYlllRH0gtnM0?`2h{*z7w&;dk~9|a>4R%vr}VQe66Wnpu5a%F90Zgi7T1tS6o
e0+V(HsFRomHnSuKGXV%l90SN41xO~7Uk6t#q$Q95

diff --git a/py/measure_lib.py b/py/measure_lib.py
index e5d9215..25d0a35 100644
--- a/py/measure_lib.py
+++ b/py/measure_lib.py
@@ -174,8 +174,8 @@ output_folder = 'C:\\Users\\Administrator\\Desktop\\BYD\\Visual measurement\\pic
 #     return Z/len(x_bot),-max_Yw
 
 def vs_measurement(txt_name,position):
-    if not os.path.exists(txt_name):
-        return None,None,None,None
+    # if not os.path.exists(txt_name):
+    #     return None,None,None,None
     # 获取数据
     
     x_bot, y_bot, x_top, y_top = get_data.get_data(txt_name)
@@ -183,8 +183,8 @@ def vs_measurement(txt_name,position):
     y_bot = np.array(y_bot)
     x_top = np.array(x_top)
     y_top = np.array(y_top)
-    if not (x_bot or y_bot or x_top or y_top):
-        return 1,1,1,1
+    # if not (x_bot or y_bot or x_top or y_top):
+    #     return 1,1,1,1
     
 
     # 拟合路沿上下直线方程
@@ -246,7 +246,7 @@ if __name__ == '__main__':
     # print(f"x_zero: {x_zero}")
     # print(f"y_zero: {y_zero}")
     t = time.time()
-    Zw_intersection, distance, Zw_pos, distance_pos = vs_measurement(txt_name,1500)
+    Zw_intersection, distance, Zw_pos, distance_pos = vs_measurement(r"C:\Users\Administrator\Desktop\BYD\git\measure_lib\py\new.txt",877)
     # vs_measurement(txt_name)
     print(f"time: {time.time() - t}")
     print(Zw_intersection, distance, Zw_pos, distance_pos)
\ No newline at end of file