From 80ff513dbde149d1eaf4a629a33afc13a94c62eb Mon Sep 17 00:00:00 2001 From: esea_info Date: Tue, 11 Apr 2023 21:37:04 +0800 Subject: [PATCH 1/6] new file: .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..acab2d0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +__pycache__/ +dist/ +build/ +*/__pycache__/ \ No newline at end of file From d54d6357415eb44c45d0f5410bce6a741818a256 Mon Sep 17 00:00:00 2001 From: esea_info Date: Tue, 11 Apr 2023 21:55:23 +0800 Subject: [PATCH 2/6] add README.md --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..630b386 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +## Readme From fe1cff4a6adcb855a7cac051937037f1ec6959b6 Mon Sep 17 00:00:00 2001 From: esea_info Date: Tue, 11 Apr 2023 22:03:21 +0800 Subject: [PATCH 3/6] modified: .gitignore --- .gitignore | 9 +++++---- README.md | 5 +++++ __pycache__/configuration.cpython-38.pyc | Bin 1470 -> 1461 bytes __pycache__/dataplot.cpython-38.pyc | Bin 5948 -> 5939 bytes __pycache__/listctrl.cpython-38.pyc | Bin 1278 -> 1269 bytes __pycache__/myconfig.cpython-38.pyc | Bin 4533 -> 4524 bytes __pycache__/myexception.cpython-38.pyc | Bin 1116 -> 1107 bytes __pycache__/mylogger.cpython-38.pyc | Bin 6847 -> 6838 bytes __pycache__/mypanel.cpython-38.pyc | Bin 4584 -> 4575 bytes __pycache__/mypath.cpython-38.pyc | Bin 7691 -> 7682 bytes __pycache__/mythread.cpython-38.pyc | Bin 4253 -> 4244 bytes __pycache__/readcal.cpython-38.pyc | Bin 10148 -> 10139 bytes __pycache__/uart.cpython-38.pyc | Bin 5109 -> 5100 bytes __pycache__/viper.cpython-38.pyc | Bin 11393 -> 11367 bytes __pycache__/yiwinframe.cpython-38.pyc | Bin 17278 -> 17269 bytes .../__pycache__/ui_com_setting.cpython-38.pyc | Bin 4145 -> 4136 bytes .../ui_filepath_setting.cpython-38.pyc | Bin 3097 -> 3088 bytes .../__pycache__/ui_log_setting.cpython-38.pyc | Bin 3348 -> 3339 bytes .../ui_pathsn_setting.cpython-38.pyc | Bin 3356 -> 3347 bytes .../ui_plot_setting.cpython-38.pyc | Bin 3340 -> 3331 bytes uiconfig/__pycache__/uiabout.cpython-38.pyc | Bin 1955 -> 1938 bytes uiconfig/__pycache__/uihelp.cpython-38.pyc | Bin 1948 -> 1931 bytes 22 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index acab2d0..b315aa5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -__pycache__/ -dist/ -build/ -*/__pycache__/ \ No newline at end of file +/__pycache__/ +/dist/ +/build/ +/*/__pycache__ +*.log \ No newline at end of file diff --git a/README.md b/README.md index 630b386..f3bf8c5 100644 --- a/README.md +++ b/README.md @@ -1 +1,6 @@ ## Readme + +## issue + + +## bug fix \ No newline at end of file diff --git a/__pycache__/configuration.cpython-38.pyc b/__pycache__/configuration.cpython-38.pyc index a957762ef508a65eadde79907c3bb89f884da398..368407fd5acc5b1e325b368a9cc88fe57a943129 100644 GIT binary patch delta 57 zcmdnTy_K6gl$V!_0SKn1nQr8M%_yYdVin__S>l|Zk{VM`S(1^Tw^@*>g^}^r^2h0M2(1*#H0l delta 66 zcmdnWy^otal$V!_0SH>(X>a6y%_wc?Vin__S(2I&MXQpI*W(H%sq$up1H_)8DlFR*B{8| zdpUP*EJV5nS7x`@ZFjj^;@h*SKvqn~jL9gh^TbHS48A{Vhw=Z{1`gbgdsMru<0fou>E6xMCmC zBr;$uXaeJ40!&J*gqTIGfh>3qdO;3MfoX}~B8tuq_tj#p#+{O{miPymN6g^B3os|K z3}K*7gYl>EnIzx3Z##vG?eKcORq%RPikJ944_<*0N+fO`;?kB9UIEwgV}ch;=oO39 z(Vj{M4Q*%$h@L6smfIi-x_9k) z06`fT-AOhsW)?nxFOV5r4)hHioUxPt?Lu&27C%nzJvlk&UN`!v@A*UX@+;G<&r zMNG;2L}{h-Tnh$xAKio=SkygIE?H}*zgvB()oRs%A8~^Q)iu^dj=I63bgxF(F#S?b znc?nef7u$c`3M*l*VYG1cs@x`F9G9m~y==e&s3L+RYX0qQyUBOA@ub4|$tc9I-4aG@*h(N7U;k zT5eeO%~WC_F^lrf1o&R`j&aRkz4tFzecP}**Y-_H;=t@Xf5IxRHO*zDin|HDo{lFw zR-xcYcG2O}NJvtoeZ8YTxc|PRmGb$Dl|Zk{VM`S(1^TxA_}02O|I*TMeoJ delta 53 zcmey$`Hz!3l$V!_0R$wNHgaEJmez5xigC{@NllDT&QD2=DX1*T$j^%@%PdGO+WeN8 GgAo9PQV?VS diff --git a/__pycache__/myconfig.cpython-38.pyc b/__pycache__/myconfig.cpython-38.pyc index 5af9e90fe0a572f0657a846d50e14392fdcc8104..ab3aad0ad7d7ede04a0f699db1cd245b38b5354c 100644 GIT binary patch delta 43 xcmdn0yhfQTl$V!_0SKn1ZRGmLB&6(O72}>+;+&t78dFeNl98XcS($kf9{>bf4F&)J delta 52 zcmZ3Zyj7Vil$V!_0SKIUH*)=BlGbstigC{@NllDT&QD2=DX1*T$j^%@%PdGO+API9 Gi4OpJix4UR diff --git a/__pycache__/myexception.cpython-38.pyc b/__pycache__/myexception.cpython-38.pyc index a5fb9d954ab0bb823153b1158c4771b6fb00ff5a..7a224820191500a9546856490431d76f37aee3a5 100644 GIT binary patch delta 45 zcmcb^ahZcBl$V!_0SKn1nWk*yk!BQ9bFqqX&n$7yPf3j_s4U6I&)e+8D8&o_38)No delta 54 zcmcc2afgE^l$V!_0SJl`vywORNHa?7yI94zXO^TU#wX{eq{b9fmSp7T#gt_hq!w+q IWRzkC0GY86Pyhe` diff --git a/__pycache__/mylogger.cpython-38.pyc b/__pycache__/mylogger.cpython-38.pyc index b9969b70cc433593c579180a97a567b71f12b549..ba7ddd0be2e02b0c6d941aa05ba913cecd805e1f 100644 GIT binary patch delta 1939 zcmbVNU2ocE6t00_8*nfoB!v=4ldy)6MoKffDneB=0+f!B6{T4}kdOn0q%|15&`Oo6 z_Hvq9X%|P^f8c7WDoxY0X__kaCsfmWwfn6%m9~qm7kkf31q4b}4atw~bDnej_hYG!RPE~*%(N|l$A*EtF#BNCKN%2uf^3cK9QhI;zAgT zS0QabBX}5d4j$XX$Mnf%Lu<7fT3si;cZANsOZ#$Y_PB?qccU%L;5s~$4&b4vexMdA zuJpCU25Ti%?>5Tskzz>E@lsARDF={uEWkza68L1#2g)IGtS{$yX$<|IZoEg2-LbMV zwls@O&uw<}ng)U^4EG(y)4W+&!;a9MiIH~w?T9cELgi}zvZl9lX067ocB6ZS2a}-?UxYZuS*rEXVf|t9PbYr~D=JLDckUU% z4lms6i#+fX3>52ntHsueY$0br9t6}c)oC=&BP<|Xf~Tr4&QszBbtbxHzl^>i>Ody+ zZo|Loe(Vanj9STOXz2^f;q4GV2@gEiM)`K6zKfrNH=gUGe9Jg~8Xisk#0ERzUGO9r ziOO1~l0Gt6;n_FA^!kM`eB}*p;4;wJ+-@e5DwNXM+#WmSQv0b~erqR1a5TwB2m|t; z{pL*yLJ)$!<=Dp=3*-o9j^5`7nur_Cr+JpaN@Q~wsN#*t-(Y4A^qeg8xvwVlF;xpC| z_{#FhTH40@Bti-yjc^g+Q-lnIn?Cs6Jw1DFpl`f`{97D_4S!@Vid_CC0>KrFE>f{n zs+i?ci3H)Ue?C&hM3Xx=N^i%5k3_$OyhsP|qd#$e19R~uJdalw5Y8av5%3?0Ttz4_ cp!VJvt_QqJd<@Q_69rK#TmKQ!P!1IT17>1w>;M1& delta 2057 zcmbVN&2Jk;6z}?b9q-nTYm&Hi+$30uKZFQv_$W!*;Kpu(<3PTeE=H@(dhNJbd#za~ zh*J?9xNsYZ8(cW07gQl}0`<@nhYE3>{{R6ODlV0fcyFBAj#F0^mi9M0@BQYz-@bV> z{&DW%Twq(0{O92J+AmH0K_Kr8Dz4j08%5?tTq))isyn~C>IKHJgSl+OtPmeg&XE8N zPct{KmGZTgp{cr6HcHJ;Tl-d{bX02^gwDFY%7{QpI`|UiZEE^~RyB?tWC+Y8h=5Vr zAkp7lB|)Y+_ju+)$J*mZn+MA0AQV`_rJ z34UO2BAm)}!80wK2WE_Z>x!QeD(V=lq16o%e$LVh^s#3q6FKeSIwiEl0CwT&N{oTT zvhZ@Me)Fcfs?xpX^HmNT`U^zqzU25oQE?EoN5kGd8W2M-DWxW+yHZXU$TW@&^95S| z6;p$?On{cV^uBMB$^nr!{iO-MRan7eq1_sNyDrne{0Yz!9@>dc0&T#yd@(e$_6oX3 z5JnMXgebyAgi8nmn`;Wa@SNG$%Vll)tqKp}4fFjuVs`S7qXciGrGtP(f<`TXn@KY(*+ z_SOyChEqx2#YH`Zr=j4N$}k$o5iTQK1Aq!hZEd>Mur1SQ*B5gfyW0}qLvG*Fp2+B3 zq<;r@(l>cLvW%9l@*Gb4_zTnyZJ*`4k@`ITb^0WKilXOY^0|6>S|(#$J zRn@Ykt15|7bL?{BW3Vdn+8y4OycEVeacS9PdD33YeM(OFq&L=S6eBCM^n#LlY1)G}D)&BrCM~r*` diff --git a/__pycache__/mypanel.cpython-38.pyc b/__pycache__/mypanel.cpython-38.pyc index fda19c49cba6233950d5dc48c220f53a1b96eced..aab29bda7ba076548e5b4ca4dc0e57de17667975 100644 GIT binary patch delta 43 xcmaE%d|#O>l$V!_0SKn1ZRFa^D5T_K72}>+;+&t78dFeNl98Xc`4JK delta 52 zcmcbw{6d*4l$V!_0SNL`HgfG{l-72!igC{@NllDT&QD2=DX1*T$j^%@%PdGO+I*9d GO#lFqwh+Sr diff --git a/__pycache__/mypath.cpython-38.pyc b/__pycache__/mypath.cpython-38.pyc index 4ab8db19d751192439528a0abfe416dbb1d8a62f..263509d5916683aca4a093e7bb864fa7808e14ca 100644 GIT binary patch delta 841 zcmZ9K&rTCj6vjQRQwn1##Y$Uf6O2I_6I#nZO+yr=28ad)ip3FIwVldHI~{K)5?z|O zFeGknj4VhDK7fgtEf3(@6`3^g6?_8Y{cbTLUHp3HJKy>4os-#_c{`)7g+e{2#P4Hm z>YMsX=|7*(ZOog_T(fFy*sq<~hOtp8Kh1 zohZ$JsiTx}6KC>76TB1}qe&hKoOM5k?ojL+#%=(rfaYTn)YmzMKa5;~a+*y*2@812 zHZvXLKj)-yM)~(}nsWTTn&Q#E?AXaUb_)r(o937KdeAbq%XQN-Sm!G5`U(`7hU+T- z8F9n6MY&Ya6xIuE+}-d0O38WD_km?#Mc^opt@5pCJ9|$ko?!-H7TriJMO5aQ_`u>*n4SUh8WmJk zzyK}?Xu-~LFCfU{YN(zAMPL(%<8;0s-wkwp@^K}x5S$fV@nR+ZC2^2^0;>!SbVB7F zEvQZYX0WKr;iKpF;9k~7YwP6HF_&oR-F3r~>uIr<^4xYSQUAX|yJjWT4=yBZ(Sc6p8O@Ew-tZ#Kvhfw#lR&&0~5q6hzU| ztc5&Q&#?uPE&xpVLR-!%A`#c$3%|MR+syP1EHmrAlcG{C=K2<$upn4~-jAA>hQ zb8JgV_wv|h8ey8z4qw>WfvZ=89yyl*En%ROGurdHeW2CZ(jVKq$=%L|FA%gCDt zZnK=4a5qP12$^GF_m8QSzU2A&c0947Cf`xX4aYUIcn>n+&?8jkKQGXA%oeS}{QwXn zEx}p_YQO;wJ=|-(3WsQ2hh+jKpusj0A3{A@EOlDF5x&3`ezyvHt$s@1N0_J;>eUjn zHsNitwd8^%l6TMFlW%ivNY?*Ze?@W0h&0W%*ie^tL|->$j7@MwCv*WnpSUj-qx5Z- zP1l|uMCEZH1Dpc>yb`g4i|}0rt^n78DPRUD0(XE#UKndVovyHLZTdG_8LyE5 diff --git a/__pycache__/mythread.cpython-38.pyc b/__pycache__/mythread.cpython-38.pyc index 71c6963bef22e7a9c6d7a82e1b663fb231802a2b..794f54ed60dda7aaa52b05d8aa1525ef3f73f0f3 100644 GIT binary patch delta 44 ycmbQMI7N{=l$V!_0SKn1nQr9HViZz#v5IleEOE|HNsTF}EXl~v+dP4hmmdK3f(%;# delta 53 zcmbQDI9HK7l$V!_0SIi?=x^lCVwBc#v5IleEJ;m_PtH$CjVY)s$;i)(Da$NKE!y19 H$jc7^eOM3@ diff --git a/__pycache__/readcal.cpython-38.pyc b/__pycache__/readcal.cpython-38.pyc index 2885d762d5175893e286b6d1ac84c4430a7507f3..140438bb014d16014ee745895d80fe75461d8113 100644 GIT binary patch delta 54 zcmZ4DKii)>l$V!_0SKn1nQr7h&m^SeVin__S>l|Zk{VM`S(1^TxA`j*6D!Lt#^_s{ Jf3vTY2LQ705)1$U delta 63 zcmbR3zr>$Al$V!_0SI^#bvJUKXOh--v5IleEJ;m_PtH$CjVY)s$;i)(Da$NKE!zBs SiHViv7i09V&7as;$^!sU1{Hn) diff --git a/__pycache__/uart.cpython-38.pyc b/__pycache__/uart.cpython-38.pyc index 0d082a3e30a4cf2ace160713f06e03bfcf30a459..e235ae4707a7eab434340a08a41b96fbfc991ce3 100644 GIT binary patch delta 59 zcmeyW{zjcUl$V!_0SKn1nQr9X%p@f5Vin__S>l|Zk{VM`S(1^TxA`X1K>@Z~OvS}T OJd*=?gePwnb^-t&8xueP delta 68 zcmaE({#Bhjl$V!_0SHP|4L5RcW|G!$v5IleEJ;m_PtH$CjVY)s$;i)(Da$NKE!up6 X>7W2x6jO0=5zpj@Y{HXQ2|ED*(^eL% diff --git a/__pycache__/viper.cpython-38.pyc b/__pycache__/viper.cpython-38.pyc index 6b0ae26d7c24c705cca6a93ed78d8e9ceafb11ca..81553c907fe6e8f9aab12c9203bdc520512b298d 100644 GIT binary patch delta 134 zcmZpSd>+9Y%FD~e00dLhOjF!8^8R4uP;jw|anCGqo-Dv7wpoYmq99|)@Pf3j_s4U6I&xsC( diff --git a/__pycache__/yiwinframe.cpython-38.pyc b/__pycache__/yiwinframe.cpython-38.pyc index a44a1250a8e2a3bdaea62c9aaf7d01fe905016b1..6e59eb00524014c93f4adfd559f8212a91d7d742 100644 GIT binary patch delta 45 zcmey@#`v|3kt>v!mx}=irlxJ=vf~j_b+L+Z&n$7yPf3j_s4U6I&)b~LBW(@v!mx}=iSS&Yk+3`s0xmd-xXO^TU#wX{eq{b9fmSp7T#gt_hq!w+C I;*mB70H^K{xc~qF diff --git a/uiconfig/__pycache__/ui_com_setting.cpython-38.pyc b/uiconfig/__pycache__/ui_com_setting.cpython-38.pyc index 391fc76300e20a3fd733f0c89b2762a9745429a1..d365e4875b0eef1e2bbe47249bdae8ddcd274476 100644 GIT binary patch delta 155 zcmdm}utI@5l$V!_0SKn1nQr8kWD+uRv5IleEOE|HNsTF}EXl~v+icIYjh*q<=5L%1 zOpJb$&3RPV0)QHd0w*W(%mE7glpK0D`G$rW?7XnS_j8tYX|VOPuplQez4#OEU8FHajw%<^lldK@3;` delta 53 zcmZpc>XG6O<>lpK0D`u7qmA6sOwu+kRx$3GC8>$=$@wX%F$I++8TolJWtj!3MVl>{ HPICbOYk&|B diff --git a/uiconfig/__pycache__/uiabout.cpython-38.pyc b/uiconfig/__pycache__/uiabout.cpython-38.pyc index 1e0f3f2272a16ec14eff02cf23668cfbacafd6a7..8c043d13c8dc2f4f0aa85ef398260cd8a45d1593 100644 GIT binary patch delta 51 zcmZ3?KZ&0wl$V!_0SKn1nWk*yDPok+cCm_a&n$7yPf3j_s4U6I&x~v WUX+*{laZL0l98H|vUwWgA65X)PZ!Mq diff --git a/uiconfig/__pycache__/uihelp.cpython-38.pyc b/uiconfig/__pycache__/uihelp.cpython-38.pyc index 14d360c8dfd49febcccdf60888a2d3b862fb5455..da02d453b7fd44f760fe70aaef170d4a96c4414a 100644 GIT binary patch delta 51 zcmbQk-_6ex%FD~e00dLhOj9=U6f#O^xmd-xXO=kUr=-RdRF-7q=f#v|7Niz!UdH&1 F6#!ax5FP*k delta 68 zcmeC?pTo}+%FD~e00jSz?oQgsQ^=@k?P3+~v WUX+*{laZL0l98H|vUw`wH&y`n)) Date: Tue, 11 Apr 2023 22:05:47 +0800 Subject: [PATCH 4/6] modified: README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f3bf8c5..4c28c22 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,5 @@ ## issue -## bug fix \ No newline at end of file +## bug fix +2023-04-11 修改 .gitignore \ No newline at end of file From b1ce3ac82befdadb528d9a0f2c6776e7d40b7e10 Mon Sep 17 00:00:00 2001 From: esea_info Date: Tue, 11 Apr 2023 22:07:56 +0800 Subject: [PATCH 5/6] myconfig.py version --- myconfig.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/myconfig.py b/myconfig.py index 8adf84f..b173a28 100644 --- a/myconfig.py +++ b/myconfig.py @@ -12,8 +12,8 @@ import yaml from enum import Enum from pathlib import Path -VERSION = "3.5.0" -LASTDATE = "2023-03-7" +VERSION = "3.6.0" +LASTDATE = "2023-04-1" COMPANY = u"奕枫仪器" CURRENT_DIR = Path() From 4a5238c08d9375e25f18cc70d5245e5af77a8356 Mon Sep 17 00:00:00 2001 From: esea_info Date: Tue, 11 Apr 2023 22:09:03 +0800 Subject: [PATCH 6/6] myconfig.py --- myconfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/myconfig.py b/myconfig.py index b173a28..c91c82e 100644 --- a/myconfig.py +++ b/myconfig.py @@ -13,7 +13,7 @@ import yaml from enum import Enum from pathlib import Path VERSION = "3.6.0" -LASTDATE = "2023-04-1" +LASTDATE = "2023-04-11" COMPANY = u"奕枫仪器" CURRENT_DIR = Path()