From 5ab03d23f2e90249b0b853a86456c68d9cd2ffe3 Mon Sep 17 00:00:00 2001 From: gitea Date: Wed, 17 Jul 2024 17:31:32 +0800 Subject: [PATCH] =?UTF-8?q?aio.py=20=E5=B0=86canvas=E8=AE=BE=E5=AE=9A?= =?UTF-8?q?=E5=88=B0tabview=E4=B8=8B=EF=BC=8C=E5=B9=B6=E5=B0=86=E9=AB=98?= =?UTF-8?q?=E5=BA=A6=E5=87=8F=E5=B0=8F=E5=88=B0600=EF=BC=8C=E5=B0=86?= =?UTF-8?q?=E6=9B=B2=E7=BA=BF=E9=80=89=E6=8B=A9=E7=9A=84OP=E8=AE=BE?= =?UTF-8?q?=E5=AE=9A=E4=B8=BA=E4=B8=8D=E5=8F=AF=E4=BC=B8=E7=BC=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../durable/durable_data_current.xlsx | Bin 6370 -> 5541 bytes .../durable/durable_data_velocity.xlsx | Bin 6376 -> 5541 bytes aio/code/aio.py | 11 +++-------- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/aio/assets/templates/durable/durable_data_current.xlsx b/aio/assets/templates/durable/durable_data_current.xlsx index 241fc607c0682d4b7e6109de70e590c6739db342..ece47de0ed7829c21f569e943e6b38d14f2ffe6b 100644 GIT binary patch delta 1574 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 diff --git a/aio/assets/templates/durable/durable_data_velocity.xlsx b/aio/assets/templates/durable/durable_data_velocity.xlsx index 0b47ea48e4f794aae574f8d99ce54ea8aa5308d5..ece47de0ed7829c21f569e943e6b38d14f2ffe6b 100644 GIT binary patch delta 1565 zcmZXUdpOg39LIl~SyPL}YD;5;sCL*vl4G=qoKhxRM&UT*m`}_IhJ@Ng$y-4a&85kM> z00fZ2y@o87OX1Eirson>#n+zfX7?ZSI^?Kl^Ft)3NfTAsGE)(sb4Bq^ps%e{g*>cM zWpw4^*;95CniW}DVN)$EOSkU+8aYLg6D~Cqh6vUyuuzWM6}!}ZN;vaQ;f-PVgbewb zXV6b^Jh-DD#z*;gI#8pJAk)&d@-?0U$#g z0F+i&5?nR`A;1--8>vEC?0Y5y0MD@ifCa#Cj57O5U%$_5A`U+7Kn{t3r?X_O_nLWO z!22iri|vW1ed+|iqYLw_4kI(dV(%-2`HF>E%9!uq?1|*|S9ZHe!GbdT^7uq2p6_VY zYgKv{ZU0lp%mgu4-}YfOLBTITmtJ}yc9xLyWZ19`oI@Ag5?)&PGt{wef`a>MIL9=zEh&$yPbd#bl$Z>L+lYqq$G$7FZtfkIVBcfidz!6O+&@Wr ztK4l)^kvk69zESI8R%x~ZeRVE)bm0b9!)llPFd%1hO{?UOw~aWWnDT2-wv_rZ*2$Rr zmYgTMj;f>oQ0O*6aE1M5ie#yKAP!I>sq?q-ZTXf>qS(uBCQ%)bHIdgAh#a|*@W2yA zGeGHcaQuThmtNSO6~O(1{1m%4M@it6*dz@!!c#%=&TC5TL*VhpgJkN=!4}j-4jalB zlg%@W@J*tg9~lP`Of|%IN+MM)nKY4GM&eZMFqKP3km)dWinR&S}P& zdCkUh=a^7!4L1jVUcovafmQmVbzsCrdZj+lzV>0!0IBVGRyraM0KC;0k8D^kro%4*Em^G{&l^NwEe~qcugV im?a1RD1U=h+XAxDIQjp;c&pcC6~TI}7TivneZXImFt5-6 delta 2430 zcmZWrdpOhm8~&nD<}fzLWg=!;a>yt{SaVhjnYSE5w2@Oe7E83`&@e^GXkp}7qFxn^ zR8%x15p&4-TwZ38cYfFJy?(vd@AJ=d-Pd*B&*ysX=a1(u+B>NWI%X%d4FUjwC_qZc z09EcFB`gtm^aHr*jAkUcYj-jOB`1YQPtVylBC9?q%Pz!wchAoe-}S@~z1IC@My`Vr z89MGw%kITV!r*J>d=1o#5`ICJU-R=(Li`+4!w?G>ro=+74u>mO9I)QDv^ z&3jNI-oA(;gA~2E!U$P{P%q=nVTGvH;U;N~{LR1|+Ev)2lO^Pag?Di#=SOic4>+7Y zF(xLbH|3R%B&O-?FbKDCkZT$JXv;m3#r)#A{c&07l>(nv;>L*mGyTuzOq{}9JfSX5 zi+(2ulIp<*RF~ASFY{I@A&_wG_9*SD<#a(-a~q{W$i- zZ0$a5XMLxJ<7R{97j~Fr(df%0^^TC$_o!C=EZO}VzxszuXDDU){U7E-OfD)?Ca6Ew zhUZKBD<$B(i6D`0_c+0>LWA@0iE9(FPwLGi`hv!7MGZNXJ(>ksTK zI@Z=0?3$Mr>7e%GbE7r~CVn`U?CE-KzK*kA(*UPe`k#&n=a`f?1XDUT-YpE|Y8u}n zR8T&JJzVgtT(Ox83(fX`EyOuX@?x@|^YmupD?=MkA3VI`ZCY?+IWBG$Jxzhv^8Pe^ ztKS^Nffu)f$_C-Z9iTD}+^-!JFbMbS00nU1FN~>8m!)u1H=f#T%8XW$bDQ^d5xWzLL9HzyiE^Xr@s|{#elhZp^ME|scd$i0O)2x85{wY) z^&wtdq)zT-X}xav+vj<9cZ~PQVSeu)?z5gA?U{Yxvi-3obJ4vF*Fm@7#1tG(E9d*o zWpkr_7Z#fobR5Ka=FuxQ?@c_5tj{bnXE z@vQTAj=bGm;idPE_OW1xkAh;R$Bo4r^i3Uh&5Fx53jS47V&#?HG?FHtNbcjKp_6Y@ z(cZ$t8iza<&%eK|CmFKLGn85Wbo9&>R?+t4%-47`BwYRC==0P*pO(EOM3K)zmXub7 zxP)DKb}PD9N97w5uz}m&QJF;Vii=ruy1NXf?P`MQtFK zzc?qEmTh6SN0k@4J7yD_FwnA*`xY+T+pl)+hxXjM|6;Xn$R~!B@@2HMXDDUNV^LS% ziAjrc*6IFZ+MgBK!$7DC-m@8z=KrFu@MRGPMW`WBk1!{yEQLZ2w8>qX%@MYenx!O} za;ZEwdg}4^t`HG_`jD8}I~xAgviWldccae9uUUV2O%;D&73$xNY*|N9af)3c1G~hm z)X-%2#q$`&(siAJNwziAO0C@E@y*L1X2$KEW*x9JsXR+8l|2PmZtyh(kDN{X9nItw zm+W;PENzP z^nj4InrRd!e`6*)y(*aUYmGbC`#DZtoj12M=Jcd~VdXloesAGgSMIX<X$&&(G5CtCHf?#R;|3FU}%>RN1txyKN#rY}&6KJKa$*98r z{{r*x^M7Am{7%{-2ts9xv${gv!4w35b7BA>{ttm)FALa7(&8aXTV3f8nBXpH+H;74 z`<7%ST;PF@001EQGRc2Qg!v(Wp8+C+!veg6g9Egq&IKN`6A**||D>fQg8s~CeFb0i olixt`Ut%8!4FiVJ9HF4CKTknng4R&lZfPiu3Y8MhlHKC|4NRk8SO5S3 diff --git a/aio/code/aio.py b/aio/code/aio.py index a53b21c..8c6d8e9 100644 --- a/aio/code/aio.py +++ b/aio/code/aio.py @@ -185,7 +185,7 @@ class App(customtkinter.CTk): widgits_da[widgit]['entry'] = customtkinter.CTkEntry(self.tabview.tab('Durable Action'), width=670, placeholder_text=widgits_da[widgit]['text'], font=self.my_font) widgits_da[widgit]['entry'].grid(row=widgits_da[widgit]['row'], column=widgits_da[widgit]['col']+1, columnspan=11, padx=(5, 10), pady=10, sticky='we') elif widgit in ['curvesel']: - widgits_da[widgit]['optionmenu'] = customtkinter.CTkOptionMenu(self.tabview.tab('Durable Action'), button_color='#708090', fg_color='#778899', values=["device_servo_trq_feedback", "hw_joint_vel_feedback"], font=self.my_font) + widgits_da[widgit]['optionmenu'] = customtkinter.CTkOptionMenu(self.tabview.tab('Durable Action'), dynamic_resizing=False, button_color='#708090', fg_color='#778899', values=["device_servo_trq_feedback", "hw_joint_vel_feedback"], font=self.my_font) widgits_da[widgit]['optionmenu'].grid(row=widgits_da[widgit]['row'], column=widgits_da[widgit]['col'], padx=5, pady=10, sticky='we') widgits_da[widgit]['optionmenu'].set(widgits_da[widgit]['text']) # For durable_action tab END ===================================================================== @@ -207,9 +207,9 @@ class App(customtkinter.CTk): # functions below ↓ ---------------------------------------------------------------------------------------- def create_canvas(self, figure): - self.canvas = FigureCanvasTkAgg(figure, self) + self.canvas = FigureCanvasTkAgg(figure, self.tabview.tab('Durable Action')) self.canvas.draw() - self.canvas.get_tk_widget().configure(height=640) + self.canvas.get_tk_widget().configure(height=600) self.canvas.get_tk_widget().grid(row=3, column=1, rowspan=3, columnspan=13, padx=20, pady=10, sticky="nsew") def create_plot(self): @@ -309,7 +309,6 @@ class App(customtkinter.CTk): def tabview_click(self): self.initialization() - tab_name = self.tabview.get() if tab_name == 'Data Process': self.flg = 0 @@ -323,10 +322,6 @@ class App(customtkinter.CTk): def initialization(self): tab_name = self.tabview.get() - try: - self.canvas.get_tk_widget().grid_forget() - except: - pass self.textbox.delete(index1='1.0', index2='end') if tab_name == 'Data Process': for widgit in widgits_dp: