From cfa80ec7f3323b6eccc86c5b8bcb2b38b3d549c3 Mon Sep 17 00:00:00 2001 From: wangsr Date: Tue, 29 Aug 2023 16:58:34 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=B8=89=E9=80=9A=E9=98=80?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=8E=A7=E5=88=B6=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ValveInitStateMonitor.cs | 1 + .../Mesnac.Controls.ChemicalWeighing.csproj | 1 + .../Resources/ThreeWayValveHVError.png | Bin 0 -> 8672 bytes .../ThreeWayValve.cs | 57 +- Main/MCEdit/Data/ComponentAction.xml | 2 +- Main/MCEdit/Data/MCProject/nodeDevice.xml | 2 +- .../MCProject/nodeForm/DeviceDetail_1.xml | 1883 ++++++++++++++++- .../MCProject/nodeForm/FormDeviceDetail2.xml | 2 +- Main/MCEdit/MCEdit.csproj | 4 +- 9 files changed, 1819 insertions(+), 133 deletions(-) create mode 100644 Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveHVError.png diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ValveInitStateMonitor/ValveInitStateMonitor.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ValveInitStateMonitor/ValveInitStateMonitor.cs index 1c5f69e..7969b20 100644 --- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ValveInitStateMonitor/ValveInitStateMonitor.cs +++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/EngineeringDebuggingMode/ValveInitStateMonitor/ValveInitStateMonitor.cs @@ -70,6 +70,7 @@ namespace Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode.NewFolder1 AlarmPosition_D.Text = PlcCommunicationUtil.GetDataToString(dmName, "_AlarmPosition"); Alarm_D.Text = PlcCommunicationUtil.GetDataToString(dmName, "_Alarm"); + } private void Refresh_Click(object sender, EventArgs e) diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj index d31f5dc..0751dbb 100644 --- a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj +++ b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj @@ -638,6 +638,7 @@ + diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveHVError.png b/Controls/Mesnac.Controls.ChemicalWeighing/Resources/ThreeWayValveHVError.png new file mode 100644 index 0000000000000000000000000000000000000000..78b93c32c679ebe7c83cb48f053ce77b45c452ab GIT binary patch literal 8672 zcmV<6As^m}P) z33MFQneYEq-K|}6Tax9rwY5ZyalFJaAtY=8sv#t-C-Yt=?+j#_2>}8j49SoTVF<(n zFGC2@49S^fX2QJ8kYP=NbHeJrCal40jLmAtQd^cR*%;fBY+07NtL9X9Rrgn4-CNy~ zJ#)?*`JPj*s#}Zd*6;qm@4HL2HN!9t0Ju|pWNSBI0nm_3779s2(Ud(!19U5Qsjd|+ z)9piAVLPAaEbeiQT<31P=ZD<$wZgT!2J6dx#h)!8eOoJ`Y>K3jH>0tAo#pYxSA4Rq zmzZy_zhGHKpEHq2{0P7`VF1ywilbe|hNa&vKnDZtRszeL?<=WQfSw0uk>i@8gc`}y zSc$xF3nh2%{okB4_GWYjn6HaLmO+>0bJ#k2jv&ah$Hu}3s;Xea#%qhWBes85G(Olw zpl|8+(j*XRi6}q{+6R&-+oNCyn$DpsK!<3B(DC1qWa^cvngdb+4@s_(tz~d^wiJVW zMk<9RLqqtx^Uu%0wloWa4F@n(e-N?#Q3v|6g3>)Da}}leO9-Y=-BmjQ>v?Kk5j0jZ zt#A#$j=G8ef)r$)gVd|q56V};gi|r-wIO!B3i6o_O~Z)2KPwvVZ|X8$Tatr*_8U3#E)A*_L6%4D zmRHgA4RW8X0!+_2##9Wj$|MH?rst|mwhDd_c%FBUVf^U6L?R3M>{JTNhK3Mwlq{fQ7IFM<4tR0O%HU`7oeHSy?Cl*pZP$;{$B^x-RLkK7nPrUy zT*Y9!%UurS1_oL7_ht9;r3NFQLb4V(s7CYuHD+%OtQzoXdA)FVVRr*OI7&_??VtuvI_#5?I#=|G)pnqw5cfR6yp2GP%9uut>w+Bg>vnW|)SL&dJHA_I`C!d2SyWDr9b*bBUVJIQWhS~9 z5S7WbmpcgL^HV9T2#BtOo<{~=0-Kvj2AuX@g{W_Klx~~%MWYy6bQrN6wbA&7XqWMi zC*`2u+}rJoy4`C%_k|={=junnDjZ{qaHCb?3oX?g7XxfBw>yv<9muB=$fcNQ)tVY) zFKn)6Zo;XuxUc1d6E^fEhcL9{Fkh@L?#~)LWyy?cz&!2bf zc05ANd5}`L3075vQcSkH+(sZL93=-u*Zg^8Yi_>%X56jbn(i;D%mho#vfu1x&HM7h z82Zp*#NMus#$S$h8F$BX&{ys%MDINK(gVQL3U};Q+-Js1QLx5*eW~W&tx(@#kUzqr z>tdCNgOpVS!2g;YW$WI%dVDn`Fci^ph*bh=-dBuaXvG*}Z`4HN&)0Psf76pwIxm!7ouuBCj^TR>c({ultK)xWA!f6gbfrDn=Lu$KOX4z`D*S$sKSpE?6N7SGsr9lLH?El zd5#15qX9lSNUbWkLD1cbL||(Qf6SwE-UI?WE{W!SX5MbHX&C(Y5e$9&2x1$mqw!~I zx{T|abI|`~(A!Rz`RaUWj-7Ty0j^k3RSNK12;@&XN)AanLxO;+%(n_K$T3KjU8YG) zGa0my!ejo{cfQ1@d)|(ggMQW#44rudv9*=a_>(nV#+T>ipg%ZN=!Vr$h$nbyj|1%K z0#?EPrUSXjf$S=o11{A}yULWAW?ixm2HQ;qWy|1%bO)-=MysgGW$I=AS2d2EH}4h( zKQWG>bH)+-ePuMhs;0}hGM0n>=$>xxcsQH+a-3jO;PeFsjVE*9HxtMgIgnM+bt&pq zfrjLm3^4a}5;IN%E!ycp+t-@+?a-!>3@GiP(|E-x^ucF+`g!9R`ouV5uT)0kzpCys zK07xD{fYOw^MLc!_}F2Wm7wNgioS_J{uF`CD+$;=R3^EYiRK`6QXY+MYh*T|!e_f{ z-TMTx4i~C!>2M}<4Ia}h@xeCqu!ce7D2C1(N9@JQX#DZ2F5`+hIq1KAulsmFb`$s6 zGUdw5uf2SoK>l)-ia&IEIX)i2bfS8h@m!%ecgW{>;8^X$hwRyHo|cFZ@Oa@>~b<#|UIz zAykT0`C)FRxl&76TMGC@*{mDW2b9k;0W-x4MZ4g^j)PVTHr*+IZtk(I5HNV*1cnkv z5qrKo8h@y&%ebg93mr*xA5YjS;P(0k0{LPFSq4@Gm#!83(mRAa36;z%lgUdl%exEG~nmpZ-s%8`is_6KjW}8nvc9onjB~v=A!Z}V+t%$Ak zqdD`wraT(|#q^;^7!<1TYYF5_Qz?9$nQL95Q0`}oLFLC(U^zqzQzOSIT#H@fS2hLZ zYeHEP*p}QJdny1m)9%}0kZChYR(e`>-NM-B{Q^6XbD&Q{=@ACS-oD0x92*-8U*ag4 zo9j}7ESZvd@k%k(ve!V9Nwzs?32fFk4pmew>)6n}+mMx>K+bQI04}d!+i`Z!{1Dy9UTD*I{z`7)wpUKwO&nnRtgiB^1j;{hoHOV_3(58h4{*84^6 z6rIVbE6lM9t}LWl_Sb*vDy`S&2(`}#ra8*(0_6ztjgM6mKT&tjh zDIEcDRVJJ7%Ze;3zD&uM0=)fUpCuj`WC~``JhsYFGAwV!$d^JgDy0z>gH!~MKb9oV zcZOC@_3m|+1DU>s{E|Dar7gr>s6hPDDpc(b4cn7JD0Fvny$$(t$6S|5nou&p#gwZv ze+qV<%2;u@GRPF93N&B-#4z~e1wP-52U!yJ`ph)R1BGjOkGra-rI9%$9&y0(u04S1 zo3OH*gXcH{E-zQiia%a$EBy`tX#lfhV`KUij*=q`au8@RrSoHuTqkQD1%VDyu4>;T z`6kPUd|DC@o+Oh6bV#CTcq4At2fKfgD_H4+>9!>Y?J2oMO3IF#xqUl36ER_iE%)gw z?e#<`gqn0Zt7chb&4KY_zTz{m8hI3AlYAyxa~@w)K;&?P7797TUa6i(ZUc80o#r|H z;cjy*OqyjOHf2MnzFZ?Fosm^V8t_8OKYfO-ZE}{gZ{_mRPJSANeP_F2Lpe^nwH{0F zi;mUo3fsQB4#3`dy}cMqr*ZGHW%%pUPQ#Xl22YVf&MTnB<6Wk*IpC@aKr07G(I_BO zqE3?(oi3)osQGPsnPl7W%v5nd($jfx#Y{9LJ~)5O@>g3`;y&07wDMJ%nq}gn^KZjs zd0th|ej|d;$7&GWRyGdce*3%oWHRZ#*HGo*!-#FzfYhQz=xJ(7uUx)7wCLbL?W&$0 zEIV+Zs86P9vAm`5C0T$)_k&EdYM~WGX2LC2c?z&Y2yO%C0TUn0KZMudFDiFdQrl#C z;er6BCCJ0Hym_V<@~n5m=zP2u^>3Eh75bm-L8)XiX;*NX%0rn9Lg_S4+PW1(@pyQk zv(tP#8r^p5iWMg>-@jk`LQfAC4G;V4IV)PJftD=5Qu$v~vhDFsB?6}VYS_{si}_$r zRLx4o^G$M)gZ7o!D(ssUE3qXhVeTHay%BW&vIdQt%Wbf~usgt#$>g|#LqyMH@@BU= zl|s$Pi2lbVOBSXhk>6~tudm-+Uw_u=`}X0BJv}&SbX01Jc`+@L&jCV`Hx)lDQ?m>* zJ(gkDkq`UGlX|wDP7PP>mc$3sq!IH>O)@lAQgWULs&lT#Z@Xrk0?wUN-5)~duWQk? zp&|ndzXb3X$z<}7`T?^k6k?qv_51f@`MPy@XW6pL4%OD~1h8OjW8)+18XH%fy>~A@ z-_wKm;lt9KapR?eDFZH3u1dlDT$4eSLH8@$?I-~QNqx7)DgrGfEs3W2n?V#PRkJDC zHbG1{2VOX*YEVbVsv69FtEH4Obsjy{0xvJ$p+wCHyfL;Gg zZBrgHsmm7G_dwSC{x!RH^Cj(M69olRlT9i@#XcP!zp25zSE?+{#2Ns9mP{u1lnB{P znyqXeU1wi~X=2G+Zy`D|Qn78p0%7XnT*Ardw%ZRlP(+_#Ff3hm@__J z5?CCAf@Q~wC!u%HjHxt7?%t2fmMdF z^y&HYpIjY_wO%|hfY0vSiTa~QO9mTcj;YBFYKE!62OTfKhN3O3QIML~_vXzqRX9~T zZ7;K?6RZMI(~>u#%-nutR7d>jYP39G4SiBupM`w?z_x4~dlJ)4dc-vIg;x!3%o!fW zx$D+p{nDl9z8{V5US$}k|8F6-YCzkghH?6;*48JUZf=fU(%+B&l}e#@a#CrI0ly+u zfK|#ZmY)fz1n?@Gs+4T!?Gx*!%pW%kPwK1I7Rk4~mBdzXzQmT-XPXwnhc&dVu11@v zLFlMv`_Ipd?t#tOdrr_`ZdysRVV5$kw`^hp=Wg1BEejUR-QL=|{V~J%+@A^YtE+@q zs{!-=%`g(bYHNGwspjU!OZ)n8SzjNj(rF(ou2$8tAl0hC7c=8t*e*=!hiRUrG1!je zebt!te0dPf3er+uK6 z&@Bre-L?%)BO{Tur=0TmFAU>HUlQU*``Fb&BsE~pKN-en9_#3M;HlQuS(onIiHmma zg6%4frw^8?x0tV{uydnc&+Q{>*1Y}~5|ApuGN@F|8QHPias4RJ@?s6zpQ}OHA-&fg zjS~0uulB%o&(9PphjsS$DUnVj5*3 zVw_&{4~FqYyT`6}Vxq=|eqMh+!ls#j;j(5@F`s*^dG`KK48wu_>^`Pw$pUVYsn1nK z915RIodOlUOvuzoFoGR?rNIKnj$qO&|pa!k! zd6VHV#F8c0+0bwhz?nA*@fN@S9>e&W{liAlqem<4x#VZ<-i?q0eX0Q$-=`IZH?dUL zJ&=d}G=a_4%HjILNpIBb3A||KFttKk*>uL5*H)qPnL1P)2<-*%4RKHZgC3X`GuxJ{ z>cTPWlRKsgds)TA#Os&6^iokp^R?&eO-;jV9UWNP(P6*uuiPTU1G0O3&oFKU@ZI|H z@v@70da~bp+0R}o^o#RfI#-MoL#k7wsiudHpXNd_Tk#7vq~dC*R?%e`;L3FJ&b zGcC;BScQ&fYEkuG*zN?mReXQfPqXJvS_QBs`J1N1SG(Y+o~m>w5-&x`vI>!fZdo{| zrw1(~Bcb0eUi`Cr4CB1pgt&^|<1QiY)_}WjHH>@y~jvN%Z#OLwokXR6ysT zO7+V@Rs#6|jhf6N0}Xi)pk|hBQxi_WG;OIw$1`=P8H$Y9vqr?-ySlQ+CM^aO#0t;~ z!&IM{4r|2hz)3c%RHkf|(%ogzzI~Xtemx#tw(QEkHH?n}IQ=dm4)XJVD8wxqaLdhx z@#BXUFTQ3?dwb}--d-%+yEjmsvVg3Z$qt5{mJRxozU+KRXGuWt0LtI<)$nEoPI|Tu zwf$vd0Dd6u>boPSWCk`PyB{&#rsY32^;AifT`VBu+p^Dt=8lcwy7lYv>qU!B-ZFP? z|91={@dF`VlilaXLR_x_*MHS89(;J|(*F}19o5g;u>+m&zb{qvR8$=l(IekW=o$I8 z$lA)Oj&5i7O?KSbpKv-lvgetY{Z1K9{rfps{nLRsKEaZwO+m=pb0IPsaK+~hqilCH`rBWwSdnPnzh67G zrw2{L!+{DeX1005h`@#?QkME&{ud;syLML@I+Jy1e77<`rYvsXIi5Z4G1*RJ&i$~g zxs|=Y$>5XcoQ4?>J7%1JMjPatOQ{U*deMOcxNZG<{B-HkOM2_-c3x{3A9+BCJ$#Ov zd(A^aOz6Oce`**t1NHS!4b<14-Lh{Vmi6?YesokBsLAr6fL?$-X%=l;9Y_PD*> zI6jVVZ`_DqEL_;~;{5qL|J*Pxdr*kyXdgU}@_#ABAq_a^Glo&$-`Kdizp-&e%ig_M z+|z@a!-u6{c_)pmyMrlP4pAC-k@KqF3!&rrS(v+}IzOf?ZcXi%LiQ+DreGdvbJt<9 z(XeR;Xl3>X0IFX$3~XCZp~uZ$Y+i&CK;o(=3iOO~AZ#_ZXHpD~P&{YHo#Am>2> z+)mF5(W3ziE;Nj#{qyHPxjPnXows{8+EOV*$XGg8GhGU>CnP2_56DF1u#Wi4v(U1k z4tm-dQ~qY}w(R+n+`RM75mn@_uqGDi8Kd{4?SDFFZR)AKOcIR;0amrWWxf{*;C7ll zF@cqT_yd0afe$o3(bo3PWrlI(lR`YAF~}&07E|_ss%MLfT zY^+85+F2+Y3+2X?zuvRD;FF8_U`+y=1!g|rT=5hxU+7#mOjp^}wz6gIY#C4#G2O)g z%gnL6?mTn|_pe`%dloPL&})s2gBKXaCz3*J4uVXNxfURqOs=y3=fy-K@x_78&inVY zw${u`r7)+zKRbcaP1$GE$2GL9tHBvRX~BZ$>-)>bLRW~d^>m8scdRb-*^zF_G~FlN zrW2(5lOD@-a)XPn~928xw|cEr)DL*0SO!lga;=OeSm7k;sj^7A!cj^^7yH zx1|M^^Hbf~@$B)sG%7~IxiRG%ddQfvWIUOUTXR#*n_Iqa9*Md=>Xj*)&v~P-K!f%D zsm&rzBoe(}dGpP<{i_PPM3r2{D5B^f^=eFk6rxPEYa1Hy{Uu8<8V)~}6ymegZgJr5 zb~wPgB@&73SbEv`c-cfnMHcq^*)iqocKp=W#PNZam}S`jqSTh1=vm0g!^Jv0yx8Fi`t8AfquAd9TpA` zCjbmwZWzrcV3(f4)y{WbT-8Bcr!rFy2G|#Nuz*V1b-?3Zvbf-*M~~urn>OK-{rxcj zJ%3^tm!`=Klv2}7gq{8LXDS0AGRTl9Sp{CEW|Ns?x}*u{w6oSs6Mz2hySVPHx5^@> zx$1L1ymz(5bU`>hHF6D=D&Kw-X?He{|4ddhAxXLir zCK8FVQVNZks_b%wvQ_P9nq+30n`@K!U=H16ip{{Q=CnlR{FjfKM@Mn{x^?*A{{8mU z<-tTEaY`u#pNX*H!UlT*w8x7knJ8>SgMQwME4_Sj64!6uj0;n#dJWi` zNF=T*R_+-EJCR7ttITAInrZHP={66zxcN0D3N6J)r`a_!6HY5YZm7V*#XEM`Q<&{v zr~9`=BJn^_`NKg6{|BZj_ebGX$ztjbTC2>tEZT-d^{OVAs(D5SKWy0Jp%7keZpI63 zZT9i^0Bkq`yO8Eok->ecS`Ij<6NH~rDr{BfNh#3j_Mu1wFSWMfm6jHaMIwFne%CP~c)q$FnGigc zG}B<0+X0#it_nUkYHF3Is(|s)DJ?x1;NK8XB^Y`=U{s>BIK_GIg5}hbUz3%cqiN8tm#Y`CSuP z#2jRrWw2GiWzc0mo|D!zY-wu3OYt~{YHE%+zodN2cZ8U5Ag@g zK~*F@70AWbvM(_0^@OhD5A){XrS^90udK9xiQ+y0D{mFTlRtTt~>e0KWDuAy)ICOIA^efj$8{IAxn&=^|!XmQVeBDJJ{Wl#mXSm33q6col_ZEY6v+qsSqdkXN?-xOlI zD(F(}mlDmN@Y%tssw|!Mz%Hh0nQ52(HrdW-6tBkP*wN5nAAZV)e6tXHtbjK1RQ{%_ z0!$^%G}vJ_51njA$sz@f|Gp91p zD)5%m5%P9Z6Mo;`j=i>tZ0004-NklUcOtY#hHb})PB?rNtDrn3=*t+TXY^ub)H8oggPZr2^guHCe2)R~> zZDzm_W3gyD$j_>jYbl_rg0d6J4o*58*tP-(qEW1m$B}AiFrAK&uUsR;(@`@`GtOrtlgW03Y>3CPJJ%8Ns68X(Y9U67Mb<&e<{*nj)GDx$sQY-O znFbq=oq8$`R9BBX9U(XWg%A^#VgyPR#09AsCHi819#!x01WeORgMH{gb+z3Qa;N*h y public partial class ThreeWayValve : ChemicalWeighingControl { + private object lockobj = new object(); public ThreeWayValve() { InitializeComponent(); @@ -43,20 +44,20 @@ namespace Mesnac.Controls.ChemicalWeighing sImages[4] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveVError.png"; //都报警 sImages[5] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveHVError.png"; - + //三个都通 sImages[6] = "Mesnac.Controls.ChemicalWeighing.Resources.ThreeWayValveAll.png"; } - - + + private void ReloadStream() { + int defaultIndex = 0; //如果出现报警 就去判断是直还是斜 - //直报警 斜报警 if (_almtValue && _almdValue) @@ -66,48 +67,38 @@ namespace Mesnac.Controls.ChemicalWeighing else { //如果直的报警 - if (_almdValue) + if (_almdValue && _almtValue == false) { defaultIndex = 3; } - //如果斜的报警 - if (_almtValue) + if (_almtValue && _almdValue == false) { defaultIndex = 4; } - } //如果不是故障 if (_almtValue == false && _almdValue == false) { - - - if (_zltValue && _zldValue) + if (_zltValue && _zldValue == false) { defaultIndex = 2; } - if (_zltValue == false && _zldValue) { defaultIndex = 1; } - - //如果都是假 就变成默认值 可能没有数据 if (_zltValue == false && _zldValue == false) { defaultIndex = 0; } - //如果都是真 就是双通 if (_zltValue && _zldValue) { defaultIndex = 6; } - - } @@ -127,8 +118,11 @@ namespace Mesnac.Controls.ChemicalWeighing private void R() { - ReloadStream(); - Reload(); + lock (lockobj) + { + ReloadStream(); + Reload(); + } } @@ -145,8 +139,10 @@ namespace Mesnac.Controls.ChemicalWeighing get => _zltValue; set { - _zltValue = value; - R(); + if(_zltValue != value) { + _zltValue = value; + R(); + } } } @@ -163,8 +159,10 @@ namespace Mesnac.Controls.ChemicalWeighing get => _zldValue; set { - _zldValue = value; - R(); + if( _zldValue != value ) { + _zldValue = value; + R(); + } } } @@ -181,8 +179,11 @@ namespace Mesnac.Controls.ChemicalWeighing get => _almtValue; set { - _almtValue = value; - R(); + if( _almtValue != value ) { + _almtValue = value; + R(); + } + } } @@ -199,8 +200,10 @@ namespace Mesnac.Controls.ChemicalWeighing get => _almdValue; set { - _almdValue = value; - R(); + if( _almdValue != value ) { + _almdValue = value; + R(); + } } } } diff --git a/Main/MCEdit/Data/ComponentAction.xml b/Main/MCEdit/Data/ComponentAction.xml index dc49421..adbed79 100644 --- a/Main/MCEdit/Data/ComponentAction.xml +++ b/Main/MCEdit/Data/ComponentAction.xml @@ -420,7 +420,7 @@ - + diff --git a/Main/MCEdit/Data/MCProject/nodeDevice.xml b/Main/MCEdit/Data/MCProject/nodeDevice.xml index 9efa5d2..f5c81cd 100644 --- a/Main/MCEdit/Data/MCProject/nodeDevice.xml +++ b/Main/MCEdit/Data/MCProject/nodeDevice.xml @@ -4,7 +4,7 @@
- + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/DeviceDetail_1.xml b/Main/MCEdit/Data/MCProject/nodeForm/DeviceDetail_1.xml index 00379e3..03226cd 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/DeviceDetail_1.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/DeviceDetail_1.xml @@ -1,10 +1,1690 @@ + + + 77, 54 + Line7 + 1, 240 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 273 + MCLabel73 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 273 + MCLabel74 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 243 + MCLabel75 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 243 + MCLabel76 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 213 + MCLabel77 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 213 + MCLabel78 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 183 + MCLabel79 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 183 + MCLabel80 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 153 + MCLabel81 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 153 + MCLabel82 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 123 + MCLabel83 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 123 + MCLabel84 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 93 + MCLabel85 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 93 + MCLabel86 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 速度 + Transparent + ButtonHighlight + 18, 273 + MCLabel87 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 温度 + Transparent + ButtonHighlight + 18, 243 + MCLabel88 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 时间 + Transparent + ButtonHighlight + 18, 213 + MCLabel89 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 配方代码 + Transparent + ButtonHighlight + 18, 183 + MCLabel90 + 53, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 公差 + Transparent + ButtonHighlight + 18, 153 + MCLabel91 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 设定重量 + Transparent + ButtonHighlight + 18, 123 + MCLabel92 + 53, 12 + + + 14, 78 + Line8 + 170, 1 + + + + + Red + DarkGray + + + False + + + + None + True + True + 冷水 + Transparent + ButtonHighlight + 99, 58 + MCLabel93 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 热水 + Transparent + ButtonHighlight + 155, 58 + MCLabel94 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 罐号 + Transparent + ButtonHighlight + 18, 93 + MCLabel95 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 水称 + Transparent + 黑体, 14.25pt, style=Bold + White + 77, 16 + MCLabel96 + 51, 19 + + + True + True + 763, 354 + InfoPanel3 + 203, 317 + + + + 77, 54 + Line5 + 1, 240 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 271 + MCLabel49 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 273 + MCLabel50 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 241 + MCLabel51 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 243 + MCLabel52 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 211 + MCLabel53 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 213 + MCLabel54 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 181 + MCLabel55 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 183 + MCLabel56 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 151 + MCLabel57 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 153 + MCLabel58 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 121 + MCLabel59 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 123 + MCLabel60 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 156, 91 + MCLabel61 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 99, 93 + MCLabel62 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 速度 + Transparent + ButtonHighlight + 18, 273 + MCLabel63 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 温度 + Transparent + ButtonHighlight + 18, 243 + MCLabel64 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 时间 + Transparent + ButtonHighlight + 18, 213 + MCLabel65 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 配方代码 + Transparent + ButtonHighlight + 18, 183 + MCLabel66 + 53, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 公差 + Transparent + ButtonHighlight + 18, 153 + MCLabel67 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 设定重量 + Transparent + ButtonHighlight + 18, 123 + MCLabel68 + 53, 12 + + + 14, 78 + Line6 + 170, 1 + + + + + Red + DarkGray + + + False + + + + None + True + True + A + Transparent + ButtonHighlight + 99, 58 + MCLabel69 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + B + Transparent + ButtonHighlight + 156, 58 + MCLabel70 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 罐号 + Transparent + ButtonHighlight + 18, 93 + MCLabel71 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 湿混机 + Transparent + 黑体, 14.25pt, style=Bold + White + 66, 16 + MCLabel72 + 72, 19 + + + True + True + 763, 28 + InfoPanel4 + 203, 317 + + + + 77, 54 + Line3 + 1, 240 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 273 + MCLabel25 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 273 + MCLabel26 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 243 + MCLabel27 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 243 + MCLabel28 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 213 + MCLabel29 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 213 + MCLabel30 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 183 + MCLabel31 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 183 + MCLabel32 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 153 + MCLabel33 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 153 + MCLabel34 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 123 + MCLabel35 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 123 + MCLabel36 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 93 + MCLabel37 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 93 + MCLabel38 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 速度 + Transparent + ButtonHighlight + 18, 273 + MCLabel39 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 温度 + Transparent + ButtonHighlight + 18, 243 + MCLabel40 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 时间 + Transparent + ButtonHighlight + 18, 213 + MCLabel41 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 配方代码 + Transparent + ButtonHighlight + 18, 183 + MCLabel42 + 53, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 公差 + Transparent + ButtonHighlight + 18, 153 + MCLabel43 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 设定重量 + Transparent + ButtonHighlight + 18, 123 + MCLabel44 + 53, 12 + + + 14, 78 + Line4 + 170, 1 + + + + + Red + DarkGray + + + False + + + + None + True + True + A + Transparent + ButtonHighlight + 98, 58 + MCLabel45 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + B + Transparent + ButtonHighlight + 151, 58 + MCLabel46 + 11, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 罐号 + Transparent + ButtonHighlight + 18, 93 + MCLabel47 + 29, 12 + + + + + Red + DarkGray + + + False + + + + None + True + True + 糊化机 + Transparent + 黑体, 14.25pt, style=Bold + White + 66, 16 + MCLabel48 + 72, 19 + + + True + True + 554, 354 + InfoPanel5 + 203, 317 + - - - + + 77, 54 + Line2 + 1, 240 + + + + + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 151, 273 + MCLabel24 + 11, 12 + + + + ParametersWithPc.RecipeDataFromPC.DryerD1Step0_MixSpeed + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent + ButtonHighlight + 98, 273 + MCLabel23 + 11, 12 + + + Red DarkGray @@ -19,16 +1699,37 @@ True MiddleRight 0 - Black + Transparent + ButtonHighlight + 151, 243 + MCLabel22 + 11, 12 + + + + ParametersWithPc.RecipeDataFromPC.DryerD1Step0_MixTemp + Red + DarkGray + + + False + + + + None + True + True + MiddleRight + 0 + Transparent ButtonHighlight - 158, 250 + 98, 243 MCLabel21 11, 12 - - - + + ParametersWithPc.RecipeDataFromPC.DryerD2Step0_MixTime Red DarkGray @@ -42,16 +1743,15 @@ True MiddleRight 0 - Black + Transparent ButtonHighlight - 240, 217 + 151, 213 MCLabel1 11, 12 - - - + + ParametersWithPc.RecipeDataFromPC.DryerD1Step0_MixTime Red DarkGray @@ -65,16 +1765,15 @@ True MiddleRight 0 - Black + Transparent ButtonHighlight - 158, 217 + 98, 213 MCLabel2 11, 12 - - - + + ParametersWithPc.RecipeDataFromPC.DryerD2Step0_MixCode Red DarkGray @@ -88,16 +1787,15 @@ True MiddleRight 0 - Black + Transparent ButtonHighlight - 240, 183 + 151, 183 MCLabel3 11, 12 - - - + + ParametersWithPc.RecipeDataFromPC.DryerD1Step0_MixCode Red DarkGray @@ -111,16 +1809,15 @@ True MiddleRight 0 - Black + Transparent ButtonHighlight - 158, 181 + 98, 183 MCLabel4 11, 12 - - - + + ParametersWithPc.RecipeDataFromPC.DryerD2Recip0_Tolerance Red DarkGray @@ -134,16 +1831,15 @@ True MiddleRight 0 - Black + Transparent ButtonHighlight - 240, 151 + 151, 153 MCLabel5 11, 12 - - - + + ParametersWithPc.RecipeDataFromPC.DryerD1Recip0_Tolerance Red DarkGray @@ -157,16 +1853,15 @@ True MiddleRight 0 - Black + Transparent ButtonHighlight - 158, 151 + 98, 153 MCLabel6 11, 12 - - - + + ParametersWithPc.RecipeDataFromPC.DryerD2Recip0_Set Red DarkGray @@ -180,16 +1875,15 @@ True MiddleRight 0 - Black + Transparent ButtonHighlight - 240, 121 + 151, 123 MCLabel7 11, 12 - - - + + ParametersWithPc.RecipeDataFromPC.DryerD1Recip0_Set Red DarkGray @@ -203,16 +1897,15 @@ True MiddleRight 0 - Black + Transparent ButtonHighlight - 158, 121 + 98, 123 MCLabel8 11, 12 - - - + + ParametersWithPc.RecipeDataFromPC.DryerD2Recip0_Bin Red DarkGray @@ -226,16 +1919,15 @@ True MiddleRight 0 - Black + Transparent ButtonHighlight - 241, 92 + 151, 93 MCLabel9 11, 12 - - - + + ParametersWithPc.RecipeDataFromPC.DryerD1Recip0_Bin Red DarkGray @@ -249,15 +1941,14 @@ True MiddleRight 0 - Black + Transparent ButtonHighlight - 158, 93 + 98, 93 MCLabel10 11, 12 - - + Red DarkGray @@ -272,15 +1963,14 @@ True MiddleRight 速度 - Black + Transparent ButtonHighlight - 18, 290 + 18, 273 MCLabel11 29, 12 - - + Red DarkGray @@ -295,15 +1985,14 @@ True MiddleRight 温度 - Black + Transparent ButtonHighlight - 18, 250 + 18, 243 MCLabel12 29, 12 - - + Red DarkGray @@ -318,15 +2007,14 @@ True MiddleRight 时间 - Black + Transparent ButtonHighlight - 18, 217 + 18, 213 MCLabel13 29, 12 - - + Red DarkGray @@ -341,15 +2029,14 @@ True MiddleRight 配方代码 - Black + Transparent ButtonHighlight 18, 183 MCLabel14 53, 12 - - + Red DarkGray @@ -364,15 +2051,14 @@ True MiddleRight 公差 - Black + Transparent ButtonHighlight - 18, 151 + 18, 153 MCLabel15 29, 12 - - + Red DarkGray @@ -387,20 +2073,19 @@ True MiddleRight 设定重量 - Black + Transparent ButtonHighlight - 18, 121 + 18, 123 MCLabel16 53, 12 - 18, 78 + 14, 78 Line1 - 291, 1 + 170, 1 - - + Red DarkGray @@ -414,15 +2099,14 @@ True True A - Black + Transparent ButtonHighlight - 158, 58 + 98, 58 MCLabel17 11, 12 - - + Red DarkGray @@ -436,15 +2120,14 @@ True True B - Black + Transparent ButtonHighlight - 241, 58 + 151, 58 McLabel 11, 12 - - + Red DarkGray @@ -459,7 +2142,7 @@ True MiddleRight 罐号 - Black + Transparent ButtonHighlight 18, 93 MCLabel19 @@ -480,19 +2163,19 @@ True True 干混机 - Black - 黑体, 15.75pt, style=Bold + Transparent + 黑体, 14.25pt, style=Bold White - 127, 15 + 66, 16 MCLabel20 - 79, 21 + 72, 19 True True - 552, 31 + 554, 28 InfoPanel6 - 331, 336 + 203, 317 @@ -1536,7 +3219,7 @@ Fill 0, 0 Panel1 - 1908, 1037 + 1443, 847 AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL @@ -1550,11 +3233,11 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - False + True False False White - 1924, 1076 + 1459, 886 WindowsDefaultLocation DeviceDetail_1 Normal diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml index 9329529..4700b40 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml @@ -4022,7 +4022,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAEtNZXNuYWMuQ29udHJvbHMuQmFzZSwgVmVyc2lvbj0xLjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAQAAAJMBU3lzdGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tNZXNuYWMuQ29udHJvbHMuQmFzZS5EZXNpZ25BY3Rpb24sIE1lc25hYy5Db250cm9scy5CYXNlLCBWZXJzaW9uPTEuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49bnVsbF1dAwAAAAZfaXRlbXMFX3NpemUIX3ZlcnNpb24EAAAjTWVzbmFjLkNvbnRyb2xzLkJhc2UuRGVzaWduQWN0aW9uW10CAAAACAgJAwAAAAAAAAAAAAAABwMAAAAAAQAAAAAAAAAEIU1lc25hYy5Db250cm9scy5CYXNlLkRlc2lnbkFjdGlvbgIAAAAL - False + True False False Control diff --git a/Main/MCEdit/MCEdit.csproj b/Main/MCEdit/MCEdit.csproj index d66ef44..82faa5d 100644 --- a/Main/MCEdit/MCEdit.csproj +++ b/Main/MCEdit/MCEdit.csproj @@ -460,9 +460,7 @@ PreserveNewest - - PreserveNewest - + PreserveNewest