From 42b193190a265bae1c3a52fda5a1ca22f8c33d7a Mon Sep 17 00:00:00 2001
From: Paul597 <2454344015@qq.com>
Date: Fri, 18 Jul 2025 13:41:34 +0800
Subject: [PATCH] 7.18

---
 .../py/__pycache__/calc_way.cpython-312.pyc   | Bin 13997 -> 13932 bytes
 .../py/__pycache__/get_data.cpython-312.pyc   | Bin 16065 -> 16065 bytes
 Visual measurement-straight/py/calc_way.py    |   2 +-
 Visual measurement-straight/py/measure_lib.py |   4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Visual measurement-straight/py/__pycache__/calc_way.cpython-312.pyc b/Visual measurement-straight/py/__pycache__/calc_way.cpython-312.pyc
index 02c0e173a434ac30866a399b9058dd271711a989..3f1e5667ceff0f9ce001c33f55540b6346d2eaa5 100644
GIT binary patch
delta 915
zcmZ`%&1(}u6rcUxO|tpiP13Za9|pG((<ZH{RzavDNX0<)Ac#<66RpyZbQ{5hO>IHE
zc<A9Ny@+=a!Lmo&zrY?m=O9$^P?b{XS@6B2sr2B${NB8o-}}vb^X9|+?>XzUu6q~`
z&)3@Qtt4aL$>|LKXmMEIwC-?|8Y_v<*<Ayzgw`y{h*9(uw6T(k7_V_@ZI8kVGh#;u
ztq-Sw^Kf5cY=gl>rk4|;nCa&vTEn!F;$*0p=XghfVAr@PI<gmXav!XlChb+saip&0
z2BB~&ph=EYN1-}{-JvtGBUQtU!BjQ^E5m2uM%;iuf&uHP2<Un@Yzsd46uk$2U4xIJ
z4w={>o@=l#TAUYN#L_Sy)gUW~uoWA|OEz;k!RsJbG6i2X0S8gbM8A&dzvmEe)V+)~
zbO@gAg*Sc=R?^6go`^Jpj!vXbK*Nu@Cq0g@#Mf2E9365a5h36Nu&`v@@i_hy@>p9*
zs3u`4+oQJ%#U3?+PJo`Ici?~Yc5aM49)Jr<GU0?C@V8l7EbLL%d(=#uARUG;N)OL1
z!7n8r58F{Xh#@qk;#_66*c9)Vt3|k^UgN^Brkb#!y0Ftd;l9*Xl<R(Cn*_&kc92|b
z0kcC0C{ryij5PVmBio=&d<SOh1QCJ&fe)raX*o{IE?5m+@gA!!w=Q+Rg@$-HWxSGM
zJ7Mv*0lSHT4*#c>cQ1DzigG*1J>R#eAT8P7)+5nYHm&O@g?FK&Y~3H$sQ#?Wra#}5
z7M{#kYW4*2siLNIbFoyOvt`=AE*+)XQc=j&2>#tcpSq>nRG&`I%oZ0OmfP>B);eyQ
hC|QDw1XBc8;cY(UnZ_mcWqAvB@~`=WF<2eT`~?lU!S(<E

delta 1209
zcmZ`(OKTHR6rM@unVCs5naQ(h+EklbMf#R%1s_<*O05cl8;wn{l^WwXVjFL<f(u0y
z>rq+|v5H`%2$lQ*mkOe^=t6@Vbs>TarE978Oq#YnI*{+4bLKnW{pQTgd>?*#s`-_s
zc^G;nua68Kh%?L=Osbc>6f8V^)_j<~=wh;FhNEa?_>7QMvg!<1Vccczxn|f(%rY{Q
z5ic`G0(6z=8qCNPLp1ZyHJni>Mn>5d^&2+q9pEc{4yqL0^tbSaRwo(4*vmHy&}RB?
zHLi!xi8w0)+n8`mM1&tgJ?sz4u#@LhBH2~T%*40}`+^><n*}N|#uHIt{(Ij=q}4Kl
zLl>YuQs3&UZf`F~1?r3lM8Fl9)#o0QZ5hV37)J!#2h;8Vybq{wRWo3`RfAa2fRCyI
zi*An-=i9unk<-8zT;Xhwm~062kg>$@K#|i{RX%d<Zq*JWgN;IZodF|34SJgt$R!Q`
zio=YnAfZR-Pu5LbGB~0V58Q7GxV1_%%7?MI+I~TyGxAm*0lcjqj_?H@(#eLkg*W`8
zfg_<h#EZB*m>T#LYLJ#(d0{?jxP8QjBTp!#<_{B8Amg@U)v2G1!%Z=+{`KC%WQ{h^
zn_^z)z0fl~<|jJw!>kx$b$BVp;H%hGYghrQZ3QWm`SfspFkR-3XYF*EJp-LmAGFto
z;D%K4O|jQ5%*)ZKgO9o%_dMt+LcbjJP3fS_%e7MjkM=xHJxCQx=jE$nN<%>tVOiR$
z!Bj`UV?%ec)47haD?elzSfs;YEIjI#AHj<dft21NgfI-ld40D~Q7b*yQ!cY0S=qDa
zhV5+)Lkb<y(3@Y2izU&#EwB-ojBbJ#(fVrZ>*nrKqIQ9+_D35|iw>(UQ4z--9Ba<r
z=;w*PWWDsVxl=Qv7Jd=ReD2(-{HV1H`6kqK2l^eKPM3&9{Hs|jnh{LVbXgiXIxv{d
zoyb<^ER9yv7NoQxh0j|<IU91_ZJuK^$4|%E4^ZsBQ~$GrVTCKwM0}c?K2+?R?Ru;C
T%=xy?3ESQ=y+1hEv1Rjb=W+f^

diff --git a/Visual measurement-straight/py/__pycache__/get_data.cpython-312.pyc b/Visual measurement-straight/py/__pycache__/get_data.cpython-312.pyc
index 747a5bf8c73de3c4181d83b47f67f394da15cd93..05fd6d6fa335e2397f425fa68012b9a8042601b3 100644
GIT binary patch
delta 27
hcmX?Dd$5-KG%qg~0}u!@Rc_?w7i9dgSz2(JE&y;f2Z{gy

delta 27
hcmX?Dd$5-KG%qg~0}$-&s@TZQFUa^|v$WtcT>yX)2(bVF

diff --git a/Visual measurement-straight/py/calc_way.py b/Visual measurement-straight/py/calc_way.py
index 5e02f74..c3986cf 100644
--- a/Visual measurement-straight/py/calc_way.py	
+++ b/Visual measurement-straight/py/calc_way.py	
@@ -21,7 +21,7 @@ y_change = model.y
 参数：点在图像中的坐标x、y，相机的外部偏转角参数alpha、beta
 返回值：点在车辆坐标系下的二维坐标
 """
-def calc_distance(x, y, alpha, beta,q):
+def calc_distance(x, y, alpha, beta):
     # print(f"q={q}")
     Xp = (x - u0) * dx
     Yp = -(y - v0) * dy
diff --git a/Visual measurement-straight/py/measure_lib.py b/Visual measurement-straight/py/measure_lib.py
index 8eeba93..8e52310 100644
--- a/Visual measurement-straight/py/measure_lib.py	
+++ b/Visual measurement-straight/py/measure_lib.py	
@@ -46,5 +46,5 @@ def vs_measurement(txt_name, position = 784):
     return 1, Zw_pos, distance_pos
 
 
-# result = vs_measurement(r"C:\Users\Administrator\Desktop\BYD\7.16\0716\new175.8595023857456.txt", position=900)
-# print(result)
\ No newline at end of file
+result = vs_measurement(r"C:\Users\Administrator\Desktop\BYD\7.16\0716\new175.8595023857456.txt", position=900)
+print(result)
\ No newline at end of file