From 023fd7db4fac009d2553b8b2a6d41aa2b6d44e07 Mon Sep 17 00:00:00 2001
From: Paul597 <2454344015@qq.com>
Date: Wed, 25 Jun 2025 17:13:57 +0800
Subject: [PATCH] 625.final

---
 .idea/.gitignore                               |   8 --------
 .idea/inspectionProfiles/Project_Default.xml   |  10 ----------
 .idea/inspectionProfiles/profiles_settings.xml |   6 ------
 .idea/measure_lib.iml                          |   8 --------
 .idea/misc.xml                                 |   7 -------
 .idea/modules.xml                              |   8 --------
 .idea/vcs.xml                                  |   6 ------
 py/__pycache__/calc_slope_line.cpython-312.pyc | Bin 0 -> 4015 bytes
 py/__pycache__/calc_way.cpython-312.pyc        | Bin 0 -> 11383 bytes
 py/__pycache__/get_data.cpython-312.pyc        | Bin 0 -> 6314 bytes
 py/__pycache__/model.cpython-312.pyc           | Bin 0 -> 1347 bytes
 py/get_data.py                                 |   8 +++++---
 py/measure_lib.py                              |  12 ++++++------
 py/readme.txt                                  |  11 -----------
 py/test.py                                     |   3 +--
 15 files changed, 12 insertions(+), 75 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 delete mode 100644 .idea/measure_lib.iml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/vcs.xml
 create mode 100644 py/__pycache__/calc_slope_line.cpython-312.pyc
 create mode 100644 py/__pycache__/calc_way.cpython-312.pyc
 create mode 100644 py/__pycache__/get_data.cpython-312.pyc
 create mode 100644 py/__pycache__/model.cpython-312.pyc
 delete mode 100644 py/readme.txt

diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 35410ca..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 72ad4ef..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <Languages>
-        <language minSize="95" name="Python" />
-      </Languages>
-    </inspection_tool>
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2d..0000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/measure_lib.iml b/.idea/measure_lib.iml
deleted file mode 100644
index d0876a7..0000000
--- a/.idea/measure_lib.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index db8786c..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Black">
-    <option name="sdkName" value="Python 3.12" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.12" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 88f8f89..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/measure_lib.iml" filepath="$PROJECT_DIR$/.idea/measure_lib.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/py/__pycache__/calc_slope_line.cpython-312.pyc b/py/__pycache__/calc_slope_line.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3cc8b44a93b7ed3d2fd77fd36af19b16969ebbdc
GIT binary patch
literal 4015
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
QojJjSxp^so8yxk20&+a;U;qFB

literal 0
HcmV?d00001

diff --git a/py/__pycache__/calc_way.cpython-312.pyc b/py/__pycache__/calc_way.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f72039a11037458d4fec6027529304adf4704648
GIT binary patch
literal 11383
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
Wu9|c`IZE2e3a$LK8OmkS^861Yps6_k

literal 0
HcmV?d00001

diff --git a/py/__pycache__/get_data.cpython-312.pyc b/py/__pycache__/get_data.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..bb13740ba93ba4552054f9ecf56f66195998c993
GIT binary patch
literal 6314
zcmeHMTTC0-8J@v2_Skc=%`FK_AS40m>@EeeNt4~&NT3T53rQE!4fWPC%;1<9+c`57
zaL1}6Wwl008%L}ZM`<NzpV%g<cx%+BJXY#TjYBSImQ|@XFFX}BE3KNR{%7nl7$$4f
zcAvUq&41?1`ETc(|D5^$<G=8{gMjO!KmP1OTQxy^g)7EYmVbEh6L`2uh=fRnh#^uh
z%ZAFJEDKr2sUeEYwb4Vg-ew)Q4KeV}GGrI2A%~q1=_|w#D_Vy*(Kf`34Ag{a(qmu2
z2KqdtM$3v{kpnL?zLTHUK0h9~`ujh9`j5XJI59%zUBHD6ZVTKmLRRdKQfO1bF|q8P
z<t}c8>i`iaRdOs}%e~9dyZK5SI}g9R`7V+~fQVZZ+Ti_FnMfIJoy3QG3Bn7UaVk!$
zmND$dhD)W#>>FM|)v$Iq?<q-KYof3vE8I4PH6#??cv39}uTg?^FSabwigS%irFK9?
z)TzN4gNalvM#~XsSFL8gn&`1&ZH6ABBnj2FMfoB>*5t4KoFWvr;q_R#@w8T|R)afk
zEx~CkaN3kAL&F$^?8ZyAsy1WpybuF%CT@>AV8mItIk<Va1=G<lcw^Xt(GTF!2c3E!
zRVD^8qS|9%RJG;a;c*wO7dr_8c~sVH#0+UeD~v2>%9q!;#&_+6%A0cL{aNEw1yjDw
z8iOV0gf+Cr*%EWY6*##PoP2?kFTp7kIE51P%&J_`JUipAxVwZ5uL?yn<?)JmrAVo6
zeHLwa7G<Wmj>u^SBBshTVhUqrcnuNLh9gG7OG>{~E+0EimCZ*C#E`yPU6>k@qFuL6
zUTaXROy`m^IAI^zUo?v~hOM;{Y*iUOEt*F&UTz&PULodvEzF_ehe=<Bd|%5|enVd?
zzQexq>-=9IUuJz3*6|83N*s79j8g9tdx$ndCMU~C;ygjZFJ-yLPFc<qlcdMdr;+F-
zJ)w-gdFV4zW2Ep%L=1)lD|lmHc>tRX!XJ{rFDw7>?%!iqj(ey+xK{9&)gx$BBr1h9
zJCgijC>WMx%`Sx}#wFxeB+crNLZb*Dz-TC_Xf*PN1CnM5fq*3#R<yEkRHOX}`KLAK
zh(9#qlS81*hxKS~O#R4*qyUm+IT!&M|FEoCMJXgHlBZf@lqtm*_K!;%IjYe)<CN%E
z{2Ce5C|wCTrIFKM9;?;tU{XROQdH3_$k(pXQ@-H{cr~3XrhG~S+?m!3d(IQw&KJaV
zJ}YY1%RC2`S;v8^m_t{kdn)5ie3$9<vh&p2-a%PHvbRGV4~B!X0>c(T-cCur2pYU6
z&v$yy1?35UXxF&pmnV=kE`=3ublMw`6d&$tOLSUej0%Fa3Ge_G`QKo|62y|7PhLn{
zGJz-dmidN7m-{ArgPrA*^fwm5@xx`7PjoI-)TReB9ZxHoW^73^`PL%CU1w+5ROijp
zH%`y?K4BVGEktGWGUG^eEMoGUFaKnJN|`<Ul;4>o7pu1ac7IyQbljTET)GvzeLP#W
zFG(fO&e&4qjAN0pUuR~RPbyLa>4qCWO`p9nG+Y0eX)t|{P1y*c?rVmyvsf(UzRD&#
zmKevnO6}{<YL8}XkKXq`a4*!J%2GQLUCG0#k!4OubS)N>CEe3Yvj>0kAvnr%;MH5H
z#+f5&PnO-2@z0TW#4NjS?(8GBWs!4V@15yQyVGsADj#!oMfE3K-ExWcRh|%D`&uA)
z=k@NH?$qGb{zTUjCv2(GeDGOwcec6v&s7i43@$XE%Tjw2J;``_bm^5X%XUZd;LP^a
zz$0cyhRihGVdgp?)weD>8})I>b$nv>?WcTQl3Zei<V5Q1%v9Qwk>)z?T*%h6WSuSZ
zJG0JX3+(X+yBFBbLVthVze*EAJ<I`grDvumC8Y-!xIMYvtgrvC3|UJWVqK}mbXA6a
z$TmKt8ovpW5V~1=%S#yp%<Jx6kL7a@-Milw>)yg*YHw{n(0ZV~)jNt{-|+qDP;0BN
zy=5#K@Wmz~!$E(f1@@HKxh-gt5Q2rO>pKYg3J*PfX9fp+?+v~`;Opxj@SW`Pb-j0H
z;5^oA4);I!9`1h+_aT%CV(V~!4StQ8fB?}3Kjxm@NEr3xj*W9FCps{08{4UyD<U|p
z5LuDC$KR!L4FKaA)w-4t#QB1JeUYeM0eM~&MCW>WrNQ7+9R{e<Q&9mxm=kUn+-_6g
z`QN81<_W{*#KLI`MmHxGCsday=Vpy=Q@+g_OQ$O9lZ9_jG@Zuy#+@Y+5LbcIRf5x9
z;4GDP2&&Tn<9bS}ryV6y6_@HRlBtSU$G5FTjObD;Zxf<h-FBP!-MZ8OVzB&`F${ie
zis5oq&||nF2EnMua8BMVhK0>B4E8EsX%G6a$zGM}((P3j?B(Rm?724ETeq@z8>?rn
zG>%+gZ9-pFu>T5ZPv)V0Wgo()J_x=s1i~jf2p{Ai4Bd51zk-3irwrk5=?a6NEgBt0
zkx3bfkw{3^Y@@+|9E?f8gn4zMQNy7LNuwhu5Da_DG#WS~2q3tBSPB8QmPE}m8k~yR
zb5MEL(Ooge8#z!6&!9<nB5zuM#>7*OIBWqQ7a;)?d?bWinBeF~_=E*jU{Z+*J|;mJ
zT%&D3G)pw3XpB5D91TSj@LL}7D**R33fDC{ig3a~$rmD%p6v+ln&>r5YB9kZBC5j#
zPZQdO3EsRAo&&T8lf6K2uL2t7pMosMI_-->M^PhgY{H}&lOJH>!DJsMuVeBCCU0WW
z0z}>p#55g%m#7sQHC~Zq#aBS}@4~w<mi!kC*>{8LbC7XssD9N-*mX?4bzIM4T+e+A
zuCMVtt9d6|^UnQ_`<E7KI<nL@!1bQgsU=s%P3{JlX`AbqpM2~(ez_-cDp|QmG0Doy
zr=L;PS*kj9DecZQ&D$PQ)sLw|%X~Rt-Sg=kS$=oo$9cw&`!DyWI#R#L49+(u`hg4Z
zE$v9|xpMmdD{ok$?8%<gXzGLX(3~|h_0ZA!m})B?%!%~iT+{vBV4hg!tJ76kzAm#f
z%eNGdW>@;)T-CgUNAm~-1Z`h8A^(Yv=alW^?#ta*PA_i2`<FK2{d&vi^>nYt=5fLn
zH8CEY)^`Jq(a#Si;Us~UM}qJcpO5R?gXSLhD|izK1&1MB*0%#|u0+T1aw9Kl<glJQ
z>-&Oc*OwnYSU`B`eMY<hO5~O%b7VXsPK2am2>)w<4@hKu7QJdAN%9M#{42uwC9&-b
uqWVjsewh*y<RT`k6h%`193T&nO{-y&;JjplS>&XI{YBYfvI(691^)(r$P;S-

literal 0
HcmV?d00001

diff --git a/py/__pycache__/model.cpython-312.pyc b/py/__pycache__/model.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..8eb34507ca402063b144e09ddf89a57fbe5f4999
GIT binary patch
literal 1347
zcmb7EOK1~e5dQa-rfrh8X&PIC4{VJt)LKM(kYXPe6vTQ`F$UJPyG>V<H12MsTY4zk
zLj^?(Vk`(&FDgBH)4K>NsHgC&Ac#V!LTEtIOP$%5MHF#JX6Bps?Ee2g3x^vB(AkS8
zCoXV=d_dq4?<%!!P)bB03X>%%1|*whb6kpJ2ultSg_|P^zsx$(Dc)j4p@LvkWN0v_
z<+YqPt&TZvhchmyML{VM)vlUi6=sg4IExiIDjc3v)a;lSi17jV!-%AI3#=t#`o1%6
zYYg%z1H;~BfU`E|fOE@k#tf1C421`TRc%rPK;GJ9hMd8kzY$pdh+i%x&;ek&kwBIt
zc=rFQP`9pv-}f)wf*1>(>ehAo(^U0tT+oYC8X&9QM~#5&1ArDK1PC^8NC^W9`6vP?
z?4u??5g(zi$wL+qn@2@1bNutJ$M+(a26cSanc-6(Uv3?k8x%PQU;i4A+QF;E!0j4s
zPX%96=EZZQ&|qeEbtOoyT^$rz+iNq>ac`Ts_6j!f?6_>^`^t@{_wRff$jCd7Jc)+B
z3{?8TTv<XE2c|t*TU!&GDVr})LDqHIqRb)6j8o<yWtA!TTa+#KQucf=__KuxnewMq
zQ>H;hGfX)@rqY0^>8dp4O2~)b6r6e9P_yF(?y=>^(Eh#YqlT&*=^+KLf??{iIjN^d
zRO75USx66`7)c+~jG~;~l2c`)sH-_OZ>9@YI)@jar(n^bBtfDnNz)PgQuKHj4~g**
z*erS5(pqX?Xn&p9O%pq5qN^&fiDZqi(e3m6<v=w+qHU;@TejIE8ZRXmk~jC<?py3z
z>RRl7WyjT(|6z|UbVIry=0d0*-vRc9ax4j=z8WMQ2~fi2cn65aa=abI`<5687@>8Z
zzY?gy*zkeial5>nQzeNuND}N^%%UEWq;v309FM*UVjmEFGYEYnGQ40mL&d<uFh^=^
zT!=X_XcYx2<cqn2rQ;c<5o1g%SUr;k)BYOic;%fkov8VxX|UfJVxOJ_2fjq34Oo?9
V80HO$z9XIA0vnjvDgkDv{RBtl9ytI2

literal 0
HcmV?d00001

diff --git a/py/get_data.py b/py/get_data.py
index 29ee81e..3317c8e 100644
--- a/py/get_data.py
+++ b/py/get_data.py
@@ -54,6 +54,8 @@ def get_data(txt_name):
     with open(txt_name, 'r', encoding='utf-8') as f:
         lines = f.readlines()
     data = []
+    if not data:
+        return None, None, None, None
     for i, line in enumerate(lines, 1):
         data.append(line.split())
     x = []
@@ -65,7 +67,7 @@ def get_data(txt_name):
     x = np.array(x)
     y = np.array(y)
     slope, intercept, r_2 = calc_slope_line.linear_regression(x, y)
-    print(r_2)
+    # print(r_2)
     x_bot = []
     y_bot = []
     x_top = []
@@ -83,7 +85,7 @@ def get_data(txt_name):
     y_top = np.array(y_top)
     slope_bot, intercept_bot, r2_bot = calc_slope_line.linear_regression(x_bot, y_bot)
     slope_top, intercept_top, r2_top = calc_slope_line.linear_regression(x_top, y_top)
-    print(f"r2_bot = {r2_bot},r2_top = {r2_top}")
+    # print(f"r2_bot = {r2_bot},r2_top = {r2_top}")
     if ((1-r2_bot) > 1e-2) or ((1-r2_bot) > 1e-2):
         return None, None, None, None
 
@@ -91,7 +93,7 @@ def get_data(txt_name):
     for i in range(len(x_bot)):
         if abs(y_bot[i] - slope_bot * x_bot[i] - intercept_bot) > 10:
             delet.append(i)
-    print(f"len(x_bot): {len(x_bot)},delet: {delet})")
+    # print(f"len(x_bot): {len(x_bot)},delet: {delet})")
     x_bot = np.delete(x_bot, delet)
     y_bot = np.delete(y_bot, delet)
     # y_pred = slope_bot * x_bot + intercept_bot
diff --git a/py/measure_lib.py b/py/measure_lib.py
index 03c52cf..bc67698 100644
--- a/py/measure_lib.py
+++ b/py/measure_lib.py
@@ -173,13 +173,13 @@ output_folder = 'C:\\Users\\Administrator\\Desktop\\BYD\\Visual measurement\\pic
 #         Y = Y + Yw
 #     return Z/len(x_bot),-max_Yw
 
-def vs_measurement(txt_name,position):
+def vs_measurement(txt_name, position = 900):
     if not os.path.exists(txt_name):
-        return 0, None,None,None,None
+        return 0, None,None
     # 获取数据
     x_bot, y_bot, x_top, y_top = get_data.get_data(txt_name)
     if x_bot.any() == None:
-        return 0, None, None, None, None
+        return -1, None, None
     # x_bot = np.array(x_bot)
     # y_bot = np.array(y_bot)
     # x_top = np.array(x_top)
@@ -236,7 +236,7 @@ def vs_measurement(txt_name,position):
     x, y = calc_slope_line.find_intersection((k, -1, b), (slope_top, -1, intercept_top))
     Zw_intersection = calc_way.calc_height(x_intersection, y_intersection, x, y, alpha, beta)
     Xw_intersection, Yw_intersection = calc_way.calc_distance(x_intersection, y_intersection, alpha, beta)
-
+    print(Xw_intersection, Yw_intersection)
     # #位置修正
     # Yw_intersection = Yw_intersection + model.y
     Xw_bot = []
@@ -265,7 +265,7 @@ def vs_measurement(txt_name,position):
     distance = - Yw_intersection * math.cos(angle)
     distance_pos = -(Yw_pos + model.y) * math.cos(angle)
     # distance_pos = ((-intercept_Xw / slope_Xw) - position) / ((-intercept_Xw / slope_Xw) - Xw_intersection) * distance
-    return 1, Zw_intersection, distance, Zw_pos, distance_pos
+    return 1, Zw_pos, distance_pos
 
 
 if __name__ == '__main__':
@@ -280,7 +280,7 @@ if __name__ == '__main__':
     # print(f"y_zero: {y_zero}")
     t = time.time()
     test_name = r'C:\Users\Administrator\Desktop\BYD\error\20250620\20250620\CANNOT_CALCULATE_LINER_REGRESSION_.txt'
-    state, Zw_intersection, distance, Zw_pos, distance_pos = vs_measurement(test_name,900)
+    state, Zw_intersection, distance, Zw_pos, distance_pos = vs_measurement(test_name, 900)
     # vs_measurement(txt_name)
     print(f"time: {time.time() - t}")
     print(Zw_intersection, distance, Zw_pos, distance_pos)
\ No newline at end of file
diff --git a/py/readme.txt b/py/readme.txt
deleted file mode 100644
index 08876d6..0000000
--- a/py/readme.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-函数说明：vs_measurement(txt_name,position)
-txt_name : 路沿数据文件路径
-position ：车身某点P距离摄像头在X轴（车行进方向）的偏移，车头为正，车尾为负。
-	        如不输入该参数，默认为900，指向前车轮中心位置。
-
-返回值：state，Zw_pos, distance_pos
-
-state : -1 , Zw_pos, distance_pos都为None，表示txt_name 所传输的数据为空或无法使用
-state :  0  , Zw_pos, distance_pos都为None，表示txt_name路径不存在
-state :  1  
-Zw_pos返回P点对应路沿的高度，distance_pos返回P点距离路沿的距离
\ No newline at end of file
diff --git a/py/test.py b/py/test.py
index 1ce4189..3e2f443 100644
--- a/py/test.py
+++ b/py/test.py
@@ -221,5 +221,4 @@ def vs_measurement(txt_name,position):
     return Zw_intersection, distance, Zw_pos , distance_pos
 
 
-
-vs_measurement(txt_name,877)
\ No newline at end of file
+#