From 78ade849df46352a19fd664782320520acd97c85 Mon Sep 17 00:00:00 2001 From: Dinger <2542905616@qq.com> Date: Sat, 14 May 2022 14:29:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E7=BB=88=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __pycache__/detect.cpython-37.pyc | Bin 10908 -> 0 bytes __pycache__/identify.cpython-37.pyc | Bin 11514 -> 0 bytes __pycache__/identify.cpython-38.pyc | Bin 7506 -> 0 bytes __pycache__/util.cpython-37.pyc | Bin 1361 -> 0 bytes __pycache__/util.cpython-38.pyc | Bin 1142 -> 0 bytes control.py | 0 detect.py | 9 +- identify.py | 189 ++++++++++++++++------------ main.py | 122 +++++++++--------- test.py | 25 ++-- 10 files changed, 181 insertions(+), 164 deletions(-) delete mode 100644 __pycache__/detect.cpython-37.pyc delete mode 100644 __pycache__/identify.cpython-37.pyc delete mode 100644 __pycache__/identify.cpython-38.pyc delete mode 100644 __pycache__/util.cpython-37.pyc delete mode 100644 __pycache__/util.cpython-38.pyc delete mode 100644 control.py diff --git a/__pycache__/detect.cpython-37.pyc b/__pycache__/detect.cpython-37.pyc deleted file mode 100644 index d5e516fd3f3af3f58baa5d01638d9aa420714621..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10908 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 TJd&7>RL1|DmNBO%W+(p-KlH79 diff --git a/__pycache__/identify.cpython-37.pyc b/__pycache__/identify.cpython-37.pyc deleted file mode 100644 index 8b2d2ed8a4b5face6652a9bffb6ae3f7bcd5fb85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11514 zcmc&)TWlLwdY%~$$st8i7t6MMi9^edV>*uGIJe!@n>exKByA$Qwi0Kj&JwiFNFq&< z(wUKUDYebUN!m^8Y`R$VA$^hZ(Az@_v<2Et3ls$wMS-?2`>-emeF(O768E9#Yx~lE z-#^2l$jaF?El>&bpUZ#FnSajzpZ|9F?BHPDz~A5g{cG3CQ-<+RY;^uosGPy$zXzZU zWi||#rPVO!E!Q%mzLc91ob9Hi%(xjTvu;*O$91I4xj8BGZeFF7{g&YlsIsBKfV3E-@5&WKfL|%4?g|wuYdO2e|G!rKfe9` zZ{GRU?|t^cTmSs=Z+!OWfAab7e*gBzzjOT4jURq`>!Yag+2%*LKl%U@Zom7Nveq4( z8AJ0p-QiifBQ=|~G(m;1bY8T*3(zddH(gFwQzO0rLSLYc)s6iUY*rdwNwpit!8CGx9WK3 zmaYdoT{Y!3gWAmMiG|fLFE5r?@hkk}0ETU6GUij}vsT{v8KtQYV0@yVxSiZ#(N9NF ziF8uIXdOWfnklY9m&7&5K*0dN)03JU(Bz6HLo|6IpAJPhTJtM2^4S$X(AC=PTp*|j z+=G!}zP_Ypy~>)WTR(@k&ovBl%+w{6+Y@*gn25mEL`0sH5pnGKQpD+du}nWTxrmxz zxpfBEn3!QxA4F?=VkUrzi7CazummwJmS3HeftZvz?Rn4j5W`n)PfV#x%z>B~mL!HH zi1}G8+jduC9?i6t^w0NDa_IkylG+XLLJuXBiD^8^AI13$9{&dbp5dCxa4lsj3)VXo zTYEdU_UYK#XJTugjjg>CTl-vO>)|Dgs8P%xP&?EZ%7WUdcA*?pyVW?#qS~YOq8w8D z)P9u1>K=6f<%qghl~9hVgK7fh4s{58I2<}J#wU83$A^C`d4SI1@z3B`w#~LtG1?ZO z8CW+VYL%2?pDi#gFr$di3Up>UCMWg0zyawg2pkkx6gVVsSm21jQGq)Ij$yCj|JgKF z+}UX4_MNWO=Bv;}^DX7MgY(suN^@zxLPhI`4^TFxUOpM7Z&VvgUYM?GU0v0b z)-XL!r!g!xyqQ2=TbXH8XTu>)y}6}hWV#wm&s7#+R6vT1$uG40nozb9cI&HQTD~YO zL?1Tiaiwq|YAx4PFc;?Z?6v5-!(zOm_WY$r;D^Ha!Z*I1th3e#`(c9YWoaM%53sEkoA<&Ta9&ikW$&%| z1vlrn8gLt0O&`iYSC=UYbR&E>Kfh3kdm?YacO7(zRJk_T=1H3sY}b6F`z`4gD0!}Z zkz>*_z%9;Hr@gKmx>+p6E_d)e;JJ=`!ZWdbuQ8)(%XOK6&d3(C>r^VWW-X{xUO~Tq z6~Hhv_;&=dcK82bb9h^9-sC^$S@O@iC4Fln9Zh$l^WMaO(H*11CMs_V2O%&vpm;XT zb-;Biur^YgRB1T=_4Gz&Q=+Byl(Mec>-KtjJ+q#D-&)Bdj>&EsSFLpiV;#gYIgEEy z3bnklZ&48eQy=g@1T1U}ZW<<5trwHpP^Y#r9N{)b;&K%0cHd<-k8$O8x}AO7YTND1 z+tv&`q-g!l-1?4w zm;tN@f3AMNGEZ~uqf&RIPIY^~!h2Ej`|ekH)CbzuxS^cu2G;&y@$vQm;zeWQflc^+ zcn{Z`z;hf*_>daF8`18(Q_RBzc=@0zFuGKQ^#WQa+69bqHW8`^4{e-OM!SG0Vi1^z zQ8U+z=sndQ3?8XJ+D@rKyxnXU6{18y#Chm{Y%|MPb>ng6Y?`Wg#t5EJLpROqmVW%A zvG_Q4&D{7JcLrm=&Qi?4@ML5K>@8M+UT@TE)y|-C=iks#Hr+vJHcv0K8sd?k*9FY&;azESG)dDnJADODRidIzK2^s7)zt!VB4#3G@&Sbj20P2V`>76f&+x)3aB zFU&-i#m#*4!b=xkeN3MxWyd&Uz@LWy*R1%pH7~TaS5^8X`rQmvGP>Nti<48&U8=nF z;^cGBT+$D6-lLqCo^E(BEnj2D*V!?oJW#k?3+7^NKLDClq}}{*R2o55&w9{!Vpuet z&M=GMV;VtFA%8u@6=Nqnzs&n-8V zn>qXHrRUC0_3QieHE*`od>eE8CV&C8Y~v}K1(Zc|7gTkmz8#o=F>4%f*p5suol{TUH2sOBWutXcTIqUbBTJ3KC>13f-#x~r6?FR%{0JVw&!)8x8uq%a z8=R{$a1XO^51BKNL#~-FkWhB2obQUbgrZvnd^bmp1B3+%xPq5Zg(uh*e0X`}a32pe zt?b|7@i~{~)|MyYgl&$SCG@QANcJi^6%^}a!$@kfVJEPC_%v)3)bp|T&6WLuBm~)W z6aVL+wqMVz!vwLXjU;0oQ3GIFSx}dMge0W3a!s%q!DeBOF0R8=Vmql&7f{R9^H*cz zSs7TjgF-u1A4LDa7}J$(6*-H=*!ahEFQQLnSoSf215HK_}Jx9QE1`tJlx%yC@N1isqE+!g{g+u42#n^ zoPKSl2A>=5U6^iEuX&AdtUIOBfSWd7)z_gaI#tn2qNu~PKUal96>YVL%bF{pxvKY~ z+SSfwClZ($_ELX_MNylb_59GB4z1}GJgcHw`$g*#=iu=t0C>3fLY!=*QS#=fIbn`w ziq@7^c5N&XvMp91kun;*M9TgE4RC}KWYjHX-hyMcveu^SqTvo$vxuZ-Q|qY}x(zAx zmLMfIUA49?htk@#^l>;!h`LW3Fww`a7&4a9R$5QTV>(b>qg zQ^LnxQCoiqHzW_2Ceudj%dCb<<6*p)K>}WOJ~H%4a;m(&!xeX8CVaR)`%;~ z8Fz;mUo;T{P2-d!1t{iJjI1y*9FiT3Lo&GP*VF17j=Lyty{s%ki#cChVr! zWu8?+E~*>2%EDxXT`;y43vF5flyzHr7@$OkHZ36y?$2=6tSI?g&gqx1h>LKzwh+0e z&h(AoY^%}I?%-Ltw3jN+K7Z-drRSfG+(>$sdWwJ!+@!l zPvc-d@@dV)K>7t*e3(dg8xwi%t|s!wEAQjO@#%?q{5B(?*gQ5->ot!l7(}bbJX$^G z5%DVK3~dZU9i}4#DeG@F&LeULCWBE0F9*>JW5*o=#}+5A7>lKq@5`JnO>cB*f+N5< z`KwU1^Gi_mQ&5GdHKrG6?%|mz=3*H<;hBDXBc7 z$bTTpUpy?jF0bE|*#q(H!d+$;lG%eY`&!~Q;gIeFJ>n*pi(6tq-Xleu{UmFmDHHwZ zGC7yr{78t%U5i{8UiV1EhyMB+72v z&~lnP%0HHTWM|1>*;!^lkY$Q)JgNASwnPn;RFnA`w`HuszR7JFPKVePe2}rl;7}Kft${3xgo^M=yepw@vS*#0`hu$~I2lviuVJjo z{i5C^6#Y5cw_6z8vqLG&ksTVw5^Ynz6>y&rN{9@?`RnWe96?x5KG!4pwD|qv!qG|W z$6-(Iio-5#hhucs{55$$Vn66L=8YtLiARfb$@+CW!FFlb4%?+-J8YMZJ}fCwS(rO` z3SI6M$ukP2-UTpqzMR&)gNnjL;h!W!sAgiWg;^X1D!)D%4~voLO8OZb`4-v7V?cXP zyT0E%3if5J68yXa<}ol7VdCySR(59pulZ@myzcI0m!BP6cPIZluDg#txc>n^nQe@? z-KC++lP(9evpUD}L%(#1G44shrGfjA z++N}ymQ=uLdYMeQW| z;5Q&rfgVI(8YPP5^CG;uzn4wzvA8=LB+^Y5||iZ-d-TmfCZ@|gP*eTLosCM z`;UEm4>MUF3vo@%yOc^L%vbokh@}SWg-T^{soIDz`USj5GuD#?x4y(0b5wenfMLAE zOq#BI^buXj7d_Yg#P4tjKVge*6D@ZS`|bl^)~qpG9ywlWRX4k^D!;CfUs^=ziX85UYSo1rl5OWOB(&$NFiE>n)h`pgPVg-P tiE&D-33Db`J47HJAIaK|-q1N6?buV`hv9P(UYd{<$-mCQxR@q?kfEET+W_%AD9EW>Joay<#8Ayx1=epd1wsi8+*G;$iU!%5m`lEaG5j zpB7#{C@)2 zue$Zsn!8f03*VWkmFuqX0KP^e!Cb5(CC zU>@#LwYVIP$nx?^Z$nag{%SRFGR=lxX5LqO@N1#PGKE)*$=|8vhOZoC7yJBtSXw$cVo`Z zXtn4Ew9Y^_s=O#?xJlc#+C=MWJ#a?2DjI9FPiP2DKk%APo(HZ;%;NIIpQkC^QX{=yiTCch! zEhzbxCikKE$N3XS7SH>h^cPR^5*JT;{v~+w;#xyqTC94$->5Gx%c59?IW+2XP1&eG z<2_9uiJRj6IMlor+OAu!mjl-w!6g1M08LN+hhKgNT1L;H)lk2Gu8*FMG6^xuwrFgS58>N1w=@Jj@?eW$`{J_>)zY!1;FVA&Yk99Auxxu_i3(l)G?C2zFIpYy@!<|tZ{tz^rXLFl}s z$(xsRtt8~pDtUZk?szaEtYDJr*Y#=bI)!42F?saUH>Zd%Rx(W`dv9`{9rje4wAiK{ zSf7M-7OQ;*IQOZ!!c3SbT{#?PFF-Mk6UAn*D!tH@UQx(2hJ_=-!>F}#u%diLj-gdj z%#*a4p(Wu2o*boy950{dxJ>!P<@u74D$e;7c6b(uy^w=HFtSv`xEjBfMKgyq?2F?4e%V~laz zdah%E%&O1)ND&?LdlD5gKPVN4-4+>{fjZ2tg0fuwaO;RrJ?&xeyouEe^Ho_?^^V z*I#~egO-n$mc9o|76jpGmkjxPZclQ13ZB+tZ?J_9+7f8#N@kI~)W$cokqELaqcV*4 zp$T{g*K(-YR5P><6aJ=EMmF;;vt=zATjW19dK9f=o8y3KeAsH5577NHhJOq?x(=$IG*91g7$F$9w@t(j~Ca4MELqT(G6l4F#v;=49zu#ckqEBJi!D)QPXV+KZ>!S@Kvm%P{1GFtMUX=D;R zxAz$MK-lUtaPnUp9~=1JkP$6w%82C{3;~BoJ&DrTfU#H1O)Ef9C$kpD9x_a-CF0tQ z)}fkxRIbfvOGbZxu2}=4iCcFxQ9Glz=pfS(JrZQ_J@O=D9?UTn*CKg{+T}>p4oB{9 z$NjmMj%(3qqIO3UwKIBGc``8%<~S7BB927uawKYpBlpk7{kb+A*P_ux?T#jDXY{V} zZ~x$lw>RH<`_(s9<<8cd+i%{) zfbFmSuES4~kEt6+g0MM&Hn%-Q7#%TfI%C@8hiytz+7zSO6qnj`(6#AkYg0PXroht9 z6QC5OP1#F(oB*Bv^Eg2{m7%UGWicsJ4$bp`&d3!cu?^`S7A|M{@+s=}Gy&pRFjc4` z+~IWEb&~2zFc6-?3+XoGl_KaR$3@Lsx+TbUytk&8VbWI`Y}6IN6|WFW4%yF97E=MV=+> z9Dp-~%TIjk;jQ6(5LZV^#3Y6Cfen$5q3!$ld{QB0{gg+oALy)V$2_rbfs{+pB6)$7 zu+ai3(q^^BA;uALJ2;|b2Zw!UamBr5sVqua+i`G^&j27J;$)WgY(VNTqr_VGWaAdd zKEI~uGkWHpfv-m?-F~~vdBl-FBDliC)YWD~ndhHkq{_IR&kk98zd7$j>b?7`$3 zQacu`NYDF4uVl7T=)}ODamU?dBctwU^g|ul6h^Ws46>cm-bI&@r7bm9(XKdw7_AB|=gDa0XrUOtO0 z;R8>eChRi=J`1pL>Q+K7Qmu1B-BMB2Ng?LaBh_Gx$|;+srz00W{#Ok4$(=Rb)DP;j z_Y7n9u3_LJd(XIQm`UUQHd9}p9x(iv+xwtPwVQgJ1^4MBrge7{kHCFe&_#DQ`)CiS zOJzwr>oTTwXYcAOrgdlUqs6+EFO#mmK)@wHuV)JI>q4(?5as>_>ieXd!I()WW5>^a ziwgD`=M}xks~yKR`aodNa~H0`bS=kjqU{JhdeMWJJi-@bz5Yd}B|y6Xn#HsWf*y+X zx?q|GS`)M+e7G4=KFt&pl-vAprmMMdQ=;@D5j}JLh;zzBkP=CL(tm1s|dR zBBZ0|XwC&CAJ&u*hUS7?^%g?wRI%!NNKq&)l$75|Iw<5Mfma9=3A{*voFQ_e9iM=r z$EfISHj5bL6E6+P87_~wQcfUQp^qMX=<(6U0}&-KCVBws>r(^X6S3+G(Epo)aG`^O zloFJJXseZih;~8H%VMmcWS@c*MJb3>x0`}2gx#)!Qml@|yDDg5Ktu8(?Rg0R+TmRL z-L)eHjT!Kr5f#@uZ{&~mDF%vo0L65lum+g*sRoR@ndJ+pz+yFd3>J>mS&k_mBF~Wr zghBqanE?K{pv~bYWBH^o&uIbvr9zulw}Ex+yMSmvN6X{;%yGgf>kO?%u;NK4S8u5Q zdZ-6eJ`?aHLf01g5&@6E5`m5}@01M60=gWhEt&zs3ASPCb^;%j1}xdI@3++G1$MqL zL67tGV$E~iFyqp{c2@D94mZrY?&Z~DRZ-*tlH=n94icb87|Hho%7m1FEHvE~r9*%o z71e?E3SmV8-6fIGJ$h#gpuj09l+g+3KLUWq*N5#7+m=0R7wn{Mc77kTNATNg&vJj* z8^-|hG=3*_(lt+%i_J2gu%^)%nzbS_I=;rx1Utxx!LCyA@Kt90!dm?tqd59RQsJ)sF!ZsBDsKGO!G+ zl~Chzu;|fHItvi6m(%m-o3SCx5R*W;*Fxf`i^ zrQvHGg_WA}WZR2_C=@Lf-SMk&U+8Q%)Q0X%x7O1mYcL^Fq9lbm3mc^;@FqM@vyXu- zQ->D7a=I~wjh#NUtcve|f)<~{G&&ChY;>K#Gqc6cDe%oriZr#&amLGF2$JbwpoNZ= z7t~f_tU?u1^w(0A`VK;0W@5(KJ$V zSgI_5B2zY)ln+~3H?Q-_&%pHn7g(aCgr2`6@|KC0w zfu{~a(aWE}i(xwnJx50lXmDuSB5*n{MCdhrA<}{n%}BO^z#<(IVzuoxvWyyrjnoLj zQH0|N$nZWuI;d`Q&C$Td(Y%$nOtfgHR&}kE4m5okc&(u2r>xmBoiq8qoy^9DUHJ=H OJ+sJCjjS;YxBdWiG%Sq( diff --git a/__pycache__/util.cpython-38.pyc b/__pycache__/util.cpython-38.pyc deleted file mode 100644 index 635acec221332c0f1f62d9cda525a656f8718579..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1142 zcmZ8g&1(}u6rY)$-K1%YsRr8GOAj7g!9sHIAfkm9^b`;&>Jk{%%$lxAcGHy976-i1x=$A@;(EW#%aVU=+t=Zf1V1OLpyi}Z#lP7RK`eu+}?8T zqKMo(3D`#@#v%64n@g7)D>4wWu^dLNKs1&E*-qkKV?7q_MkkOmjv6iD z^S+;iaWvl(@q?h5JoP7l3rQ;HDa0xVu zH!Hfm3nvaX^-GLM>-telyNjUccDE5cHmMKKgKg?@v9isj#>!v<7S(ttnM{NqwpNoF za7Z&sc(ZIS&Mp2oV|tSVY%W~@MNd#RXW4Ykz^uW%z|_wo@Bn6>X_yxM2h>eV1%;!+ z0&t12K`1KMMB)<9>BV7`RR74@$*d<@LBe<_6F+JOb8v8!_LNCGzgl-4Rb(vky8&aW z#8@}xeP}dO6O66({Z6(bCUq)h4W~8eA;^J#D>15C>e8WMQ$@@8Tw7VqK~0Ty10MRl fuoo!O?U{nidM=I$YaYIMB}?S0Zr~^)E?U0 0.5: - print("identify is left") self.left_hand_flag = True self.is_identify = True @@ -317,7 +333,6 @@ class Identify: # self.mp_drawing.draw_landmarks( # self.image, self.identify_results.multi_hand_landmarks[i], self.mp_hands.HAND_CONNECTIONS) if self.identify_results.multi_handedness[i].classification[0].score > 0.5: - print("identify is right") self.right_hand_flag = True self.is_identify = True @@ -325,11 +340,8 @@ class Identify: if self.is_identify: if self.left_hand_flag: self.left_angle_list = hand_angle(hand_=self.left_hand_points) - # print("(((((((((((((((((((") for i in range(5): self.is_left_finger_straight[i] = util.Util.is_straight(self.left_angle_list[i]) - # print(self.is_left_finger_straight[i]) - # print(")))))))))))))))))))") if self.right_hand_flag: self.right_angle_list = hand_angle(hand_=self.right_hand_points) for i in range(5): @@ -339,9 +351,9 @@ class Identify: if self.left_hand_flag: self.position_x = self.left_hand_points[8][0] self.position_y = self.left_hand_points[8][1] - elif self.right_hand_flag: - self.position_x = self.right_hand_points[8][0] - self.position_y = self.right_hand_points[8][1] + # elif self.right_hand_flag: + # self.position_x = self.right_hand_points[8][0] + # self.position_y = self.right_hand_points[8][1] return is_finger_straight[1] and not is_finger_straight[2] and \ not is_finger_straight[3] and not is_finger_straight[4] @@ -394,22 +406,25 @@ class Identify: if self.step_up == 0: self.lase_time = time.time() if self.step_up == 0 and self.judge_step_three(): - self.step_up = 4 - if self.step_up == 4 and self.judge_step_one(False): self.step_up = 1 - elif self.step_up == 1 and self.judge_step_two(False): + if self.step_up == 1 and self.judge_step_one(False): + self.step_up = 2 + elif self.step_up == 2 and self.judge_step_two(False): self.step_up = 3 - elif self.step_up == 2 and judge_zero(self.is_right_finger_straight): - self.step_up = 3 - elif self.step_up == 3: + # elif self.step_up == 2 and judge_zero(self.is_right_finger_straight): + # self.step_up = 3 + # elif self.step_up == 3: + # self.step_up = 0 + now_time = time.time() + if now_time - self.lase_time > 3: + self.lase_time = now_time self.step_up = 0 - now_time = time.time() - if now_time - self.lase_time < 3: + return False + else: + if self.step_up == 3: self.lase_time = now_time + self.step_up = 0 return True - else: - self.lase_time = now_time - return False return False def judge_page_down(self): @@ -418,25 +433,24 @@ class Identify: if self.step_down == 0: self.lase_time = time.time() if self.step_down == 0 and self.judge_step_three(): - self.step_down = 4 - print("step = 1") - if self.step_down == 4 and self.judge_step_one(True): self.step_down = 1 - print("step = 2") - elif self.step_down == 1 and self.judge_step_two(True): + # print("step = 1") + if self.step_down == 1 and self.judge_step_one(True): + self.step_down = 2 + # print("step = 2") + elif self.step_down == 2 and self.judge_step_two(True): self.step_down = 3 - print("step = 3") - elif self.step_down == 2 and judge_zero(self.is_left_finger_straight): - self.step_down = 3 - elif self.step_down == 3: + # print("step = 3") + now_time = time.time() + if now_time - self.lase_time > 3: + self.lase_time = now_time self.step_down = 0 - now_time = time.time() - if now_time - self.lase_time < 3: + return False + else: + if self.step_down == 3: self.lase_time = now_time + self.step_down = 0 return True - else: - self.lase_time = now_time - return False return False def judge_end(self): @@ -444,36 +458,47 @@ class Identify: return True return False + def judge_system_over(self): + if not self.judge_one(self.is_left_finger_straight): + return False + if not self.judge_one(self.is_right_finger_straight): + return False + standard_distance = util.Util.get_distance(self.left_hand_points[7], self.right_hand_points[8]) + # print(util.Util.get_distance(self.left_hand_points[8], self.right_hand_points[8]) / standard_distance) + if util.Util.get_distance(self.left_hand_points[8], self.right_hand_points[8]) / standard_distance < 1: + return True + return False + def judge_control(self): - # print("left_flag = " + str(self.left_hand_flag)) - # print("right_flag = " + str(self.right_hand_flag)) - # print("1111111111111111111111") - # for i in range(5): - # print(self.is_left_finger_straight[i]) - # print("2222222222222222222222") if self.is_identify: + # print("len = " + str(len(self.identify_results.multi_handedness))) + # print("left is " + str(self.left_hand_flag)) + # print("right is " + str(self.right_hand_flag)) if judge_two(self.is_left_finger_straight): - print("1") + # print("1") return 1 elif self.judge_page_up(): - print("2") + # print("2") return 2 elif self.judge_page_down(): - print("3") - # print("down!down!down!down!down!down!down!down!down!down!down!down!down!down!down!down!down!down!") + # print("3") return 3 - elif self.judge_one(self.is_left_finger_straight): - print("4") + elif self.judge_one(self.is_left_finger_straight) and not self.right_hand_flag: + # print("4") return 4 - elif self.left_hand_flag and judge_zero(self.is_left_finger_straight): - print("5") - # for i in range(5): - # print(self.is_left_finger_straight[i]) + elif self.judge_one(self.is_left_finger_straight) and judge_zero(self.is_right_finger_straight): + # print("5") return 5 - else: - print("other") - else: - print("no_hand_points") + elif self.left_hand_flag and judge_zero(self.is_left_finger_straight): + # print("6") + return 6 + elif self.judge_system_over(): + # print("7") + return 7 + # else: + # # print("other") + # else: + # print("no_hand_points") return 0 # diff --git a/main.py b/main.py index 80feaa5..5a88a55 100644 --- a/main.py +++ b/main.py @@ -1,27 +1,15 @@ import multiprocessing +import sys import tkinter from identify import * from tkinter.filedialog import * +from tkinter import messagebox from win32com.client import Dispatch import win32con import win32api import time import os -control_flag = 0 -x = 0 -y = 0 - - -def show(): - win32api.keybd_event(116, 0, 0, 0) # 代表按下f键 - time.sleep(0.02) - win32api.keybd_event(116, 0, win32con.KEYEVENTF_KEYUP, 0) # 释放f键 - time.sleep(2) - win32api.keybd_event(34, 0, 0, 0) # 代表按下f键 - time.sleep(0.02) - win32api.keybd_event(34, 0, win32con.KEYEVENTF_KEYUP, 0) # 释放f键 - def control_page_up(): win32api.keybd_event(38, 0, 0, 0) # 代表按下f键 @@ -61,39 +49,29 @@ def control_writing(m, position_x, position_y): m.move(position_x, position_y) -def control_draw(): - global x, y - - # m = pymouse.PyMouse() - # m.move(x, y) - # win32api.keybd_event(40, 0, 0, 0) # 代表按下f键 - # time.sleep(0.02) - # win32api.keybd_event(40, 0, win32con.KEYEVENTF_KEYUP, 0) # 释放f键 - - # class Control: - # def __init__(self, control_flag): - # self.control_flag = control_flag - # - - -def control_thread(value, array): +def control_thread(control_number, array, over_flag): last_time = 0.0 step = 0 mouse = PyMouse() - + test_time1 = time.time() + count = 0 while 1: + count += 1 # print("step = " + str(step)) # print("control_thread") now_time = time.time() - # time.sleep(0.1) - # print(end - start) - # print("***********array************") - # print(array) - # print("***********array************") - control_flag = value.value + control_flag = control_number.value + # os._exit(0) + if control_flag == 7: + # test_time2 = time.time() + # fps = count / (test_time2 - test_time1) + # print("count2 = " + str(count)) + # print("time = " + str(test_time2 - test_time1)) + # print("fps_control = " + str(fps)) + over_flag.value = 1 + sys.exit(0) if step == 2: if control_flag == 4: - # print("inininininininininininininininininininininininin") position_x = int(mouse.screen_size()[0] / array[2] * array[0]) position_y = int(mouse.screen_size()[1] / array[3] * array[1]) control_writing(mouse, position_x, position_y) @@ -101,22 +79,16 @@ def control_thread(value, array): step = 1 control_ppt_end() last_time = now_time - # print("step to 11111111111111111") continue if now_time - last_time < 1: continue last_time = now_time - # if control_flag in range(1, 2, 3, 4, 5): - # time.sleep(2) - # elif control_flag == 6: - # time.sleep(0.05) - # start = time.time() - print("control_flag = " + str(control_flag)) - # print("main.step = " + str(step)) - if step == 0 and control_flag == 1: - control_ppt_begin() - # print("control_flag == 1") - step = 1 + # print("control_flag2 = " + str(control_flag)) + # # print("main.step = " + str(step)) + if step == 0: + if control_flag == 1: + control_ppt_begin() + step = 1 elif step == 1: if control_flag == 2: control_page_up() @@ -127,38 +99,37 @@ def control_thread(value, array): elif control_flag == 4: control_open_pencil() step = 2 - elif control_flag == 5: + elif control_flag == 6: control_ppt_end() - # print("end!end!end!end!end!end!end!end!end!end!end!") - # print("control_flag == 4") step = 0 + # if control_flag == 5: # control_open_pencil() # if control_flag == 6: # control_draw() -def identify_thread(value, array): - identify = Identify(value, array) - identify.begin() - - -def show_thread(value, array): - return 0 +def identify_thread(control_number, array, over_flag): + identify = Identify(control_number, array) + identify.begin(over_flag) def open_file(): file_path = askopenfilename(title=u'选择文件') # file_path = askopenfilename(title=u'选择文件', initialdir=(os.path.expanduser('H:/'))) - open_ppt(file_path) - value = multiprocessing.Value('i', 0) + if not open_ppt(file_path): + return False + control_number = multiprocessing.Value('i', 0) array = multiprocessing.Array('i', 4) + over_flag = multiprocessing.Value('i', 0) # array2 = multiprocessing.Array() - p1 = multiprocessing.Process(target=identify_thread, args=(value, array)) - p2 = multiprocessing.Process(target=control_thread, args=(value, array)) + p1 = multiprocessing.Process(target=identify_thread, args=(control_number, array, over_flag)) + p2 = multiprocessing.Process(target=control_thread, args=(control_number, array, over_flag)) # p3 = multiprocessing.Process(target=show_thread, args=(value, array)) p1.start() + # p1.terminate() p2.start() + return True # p3.start() # identify_t = threading.Thread(target=identify_thread) # print("control_flag1 = " + str(control_flag)) @@ -170,11 +141,32 @@ def open_file(): # control_t.start() +def judge_ppt(file_path): + string = file_path + string = string.split('.') + if len(string) <= 0: + return False + string = string[len(string) - 1] + if string.find('ppt') != -1: + return True + return False + + def open_ppt(file_path): + if not len(file_path): + messagebox.showinfo("选择失败", "您尚未选择ppt文件，请重新选择") + return False + if not judge_ppt(file_path): + messagebox.showinfo("选择失败", "该文件非ppt文件，请重新选择") + return False ppt = Dispatch('PowerPoint.Application') ppt.Visible = 1 # 后台运行 ppt.DisplayAlerts = 0 # 不显示，不警告 ppt.Presentations.Open(file_path) + return True + + +# def make_button(window): if __name__ == '__main__': @@ -183,4 +175,6 @@ if __name__ == '__main__': window.geometry("200x100") bt1 = tkinter.Button(window, text='打开文件', width=15, height=15, command=open_file) bt1.pack() + # show_text = tkinter.Text(window, height=2) + # show_text.pack() window.mainloop() diff --git a/test.py b/test.py index ba733b1..1501c03 100644 --- a/test.py +++ b/test.py @@ -46,9 +46,6 @@ def video_speed(video_root, out_root, fps=None, scale=1): # yolov5 = detect.YOLOV5() # blank_image = np.zeros((1000, 1000, 3), np.uint8) # blank_image.fill(255) - fourcc = cv2.VideoWriter_fourcc(*'XVID') - videoWriter = cv2.VideoWriter('output.avi', fourcc, 60.0, (1280, 720)) - count = 100 while True: ret, frame = cap.read() # blank_image = frame.copy() @@ -58,9 +55,9 @@ def video_speed(video_root, out_root, fps=None, scale=1): # print("") frame = cv2.flip(frame, 1) - frame = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB) + frame_rgb = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB) # frame = cv2.cvtColor(frame, cv2.COLOR_RGB2BGR) - results = hands.process(frame) + results = hands.process(frame_rgb) # results = poses.process(image) # print("*********************************") # if results.pose_landmarks: @@ -74,19 +71,19 @@ def video_speed(video_root, out_root, fps=None, scale=1): # if results. # print(results.multi_hand_landmarks) if results.multi_handedness: - if results.multi_handedness[0].classification[0].label == "Left": - for hand_landmarks in results.multi_hand_landmarks: - # 关键点可视化 - mp_drawing.draw_landmarks( - frame, hand_landmarks, mp_hands.HAND_CONNECTIONS) - # if results.multi_handedness[0].classification[0].label == "Right": - # print(results.multi_handedness[0].classification[0]) + # if results.multi_handedness[0].classification[0].label == "Left": + for hand_landmarks in results.multi_hand_landmarks: + # 关键点可视化 + mp_drawing.draw_landmarks( + frame, hand_landmarks, mp_hands.HAND_CONNECTIONS) + # if results.multi_handedness[0].classification[0].label == "Right": + # print(results.multi_handedness[0].classification[0]) cv2.imshow('MediaPipe Hands', frame) # cv2.imshow('black_image', blank_image) # videoWriter.write(blank_image) # count = count - 1 - # cv2.imwrite("picture3.jpg", frame) - if cv2.waitKey(1) & 0xFF == 27: + cv2.imwrite("picture3.jpg", frame) + if cv2.waitKey(3000) & 0xFF == 27: break cap.release() # videoWriter.release()