From ba87e9b6775389f761a4d66ae6d78f9809b4960c Mon Sep 17 00:00:00 2001 From: "DESKTOP-999R8N3\\CJY" Date: Mon, 14 Aug 2023 17:45:01 +0900 Subject: [PATCH] =?UTF-8?q?Part11=20=EC=B6=94=EA=B0=80=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DB_2A.suo | Bin 181248 -> 183296 bytes INT69DB_2A/DataStore.cs | 23 +- INT69DB_2A/Forms/FormDataBackup_Part11.cs | 1 + INT69DB_2A/Forms/FormFactoryReset.cs | 2 - INT69DB_2A/Forms/FormMainDisplay.cs | 8 +- INT69DB_2A/Forms/FormMenu.cs | 10 + INT69DB_2A/Forms/FormMotorSetting.Designer.cs | 22 +- INT69DB_2A/Forms/FormMotorSetting.cs | 348 ++++++++++++++++-- INT69DB_2A/Forms/FormProgramUpdate.cs | 1 - .../Forms/FormSystemSetting.Designer.cs | 1 + INT69DB_2A/Forms/FormSystemSetting.cs | 233 ++++++++++-- INT69DB_2A/Forms/FormUserEditor.Designer.cs | 2 +- INT69DB_2A/Forms/FormUserGroupEditor.cs | 6 + INT69DB_2A/Part11_UserManager/UserItem.cs | 3 +- .../Release/Refactor/INT69DB_2A_ImageDll.dll | Bin 32256 -> 32256 bytes 15 files changed, 571 insertions(+), 89 deletions(-) diff --git a/INT69DB_2A.suo b/INT69DB_2A.suo index afad08560fcecf99b985717d7d1aa7052caa533d..91919c4e56a31aab96d5698edc0b34a1ddf43e45 100644 GIT binary patch delta 6339 zcmb7I3s}_Ew*Rlq3=If4;0Oo<4i6PQgn-}^Y#{Waq9B5rA%ZV76-Gou5*Sd)LKH0enVo!~Q;wC7v8Q#qijVGhJ00sl9Y))BpX=7_a}jbK|ar>>I~zSNT_d zJ$IrQ{ zhE!084C1ChVY}UT!ecIQm%lzeW1J^)XF!hGDdWfCTY51`2wF_R`gBTO(452o}b$10(t5d|WRo+}a_!QR4EQSRPV zgaSY3^BRisZCvaKp_aPJ7^E>k204nv*FFoCTxFh8q!cKH%4)^}Wd);%A`8R}TC!BQ zKI(eY)%E&Wc#Q%jkN@W?%aoOhMVZf~B4vSGF%Yw#nuKxVL$IYR4c(qf#<^)ewxi?E z0e-PA+g6io6LksWF}T@E)@Ow)wx(#d<%kB@N2UA36)42BDId{?0+OCywPRpP^_P5!b_FYZ2nXGXw)tKlIf%Vwk`KTuVp1Tw!9zyTpEk-OuvBK zr`-riqqFK}hU4F-^~UlQt{7kLS63d2mKFVE(Kcu1M5vo(&}?IIwE5181h+eUjTcxF zeqyF##?uxk!H=FEgN0e29sUF~05j=qrWh(B6%0rZ!9OIY;HqjL{QRjHyj(a0uTS$- zx4F11NbO@5pwFB(+&Om$1}-SYv{lad=hfb}{y8Z^4zL;KIXU5_igZj_5!!voNL-k= z%l6cw*%~~xG7}H17>7SE{U1D7_zdPucg5O;p=w)sg%9p6EWpzA60#mzH( z@STE%YFV=6iREStTb_?|#)smIb4OvTH54bz8RG=XWQ6i~TXkW)6E4i2iv4p2VB|Dj zyv!Ao=Lg{IX_>ZDtBlTaX5Eb5_{+2*wx-hF!1dXO$}b6w$efS8rVYiM%5q$t)~uHM z%?Rmc#27xQ2X0;xfCVf6fRT$laL-DUTGpq#qf2!V&Rp6zU4#iqqr()XucFs(dNd81YiA8I16c~h!`v>lpnOLgSuKH){Y&B zmO~~mQR>r>hmpgKXx-%uPI#iO8auCLV@+KQHgBoHo3)29roIy9V#0tvcp0bTTOAYe zX1gD@pb_V8t%BW{Fn9r3Jw=>cLOX)hy9A@6e86rmJuF-RauBvXPhQoKjOLh;Xx%(e z?m%ttKqOSMrP+l^FR#O#?d{ZF0Y=iVh8S$!7YYW9s?VjJ*TAGL=S8#m1pX*?Btr?E zd<|BTbqP2_EuAcZNvLm_PBG_UBBn)#qhp6RY((%M+`Lnu*Y?q58pwp^j0PQe;qoh! zFtBkZnfF7zZF^Iw01XCZB{aV(Q0Fm{%sW_z96P)qUykguftOQFXxZfrsmvWd(5o;I z&>p{0I02vH)ZDd}=)Wwh#b|v48VgvK9+hu+g#I;u5T~$G^uNkc+?iEdgNLW5>25 zt}sxgy)Ge|S{Jen9&RtSi4f3Q_#9R`IT#ku@H`|WZ0Kgy4>{nStkqblwUcRR1 zn>*0aW9HG9x!6N7nbN@*PoE2>t2-c&EKfr;)doN!c-nuh7VZEG>7?M}L=KC7j9nV< zr(+(@ZvGEvO3xEjOu7d)UNlnYLeb6@gVR#>M&z15b8v+&SAqx3v!%8%HAPo8 z(ak2%qrP3EN(oupAOoMd;>zZ?r1`4wT+DVnUx`&B*gve`%?@Ex`zvT@uVp!^vpbFn zXTY1+G??`DZt5(CDlGdpkgS!E4{IpuJWOVxh(mpcGvDmga|_V&ogX=j@C*oyy559` zIx4Y_O0c#gmxclD_0%{W!dpISh+bUxGQ;lPJ;%Ch*4PALmkF6GX#S zy66PE$PoyY;4DSskKkvAO{^dk@g;ck;TO=A3h1xuHsxp`3}dd>qW(iyd*WkIDRjqp zcNrI`Aq#c7z{lMLhEbY31lrH_0yiM@vrq+PUFuQFWVB#v8`*^ijCIlGajZ~CFPdPC z-Rc9rE?~iyCnp40*yR_p(~si6IUEGYkfM;ofm{}-Ts+t@p*zY!Uwc^)Z0twY1F*)a zLW=8FSWVV_V6vOy;4+XHDTdILvEZkQ7}bp7;K+PrCk7sM1%DY4)g^@PHiHMXR&tCK zLC4bIIU1e{DRl{>(fX@58?}U&bI}xSVs@-!vo~&c8VE|Phv^X3t;jK50oG`~p3?4- z!{jW=UJ0(dGkEw9zknAtP6w$Q9GX;$UiA13sIJ>t$!2WVmhvvmN~8D=$kV>g9Bre7 zeE5WowJ)TjXZvJIbB4Iby7cHxwV~x_F!PZ%(U}a9D{tSZt>THl;H}rskaYrcKQIfj zg(mCn?Eke}v%%^@=b9h_@}%q7%skk`)=M7JIt#iidt-=*;1&PWrF^x~aiq6^Gp4ug z#@cJa98yM5;znp7(|OR__b!DDC#_WLOqJ}k#$bq2y^^FlSmVw;Xx={``qI$lu=sEx zSe>+YFN>!W=!zGM)SgCgL(@BYYJLu~$hZnZDKVDaNX{zI1jtC+pJ8MKF+v#w7y}tG zxctjL{aE?bj~kSD#=SZ={pdsH4w&!qy4No?KX8zxpy!}IQV1Q?93sM*LaqJo3(!ZJ zu;eZ|YP~xglI3MKq2o{`IZ8l7<^j;m=e$)6GswDz9g%4bgt)*O9` zy@oxQ4Cm!`oeGt#VH55vYF4vgT}XM0t`)N&v&Y`8 zI>&z_>n14%o50Im^B&VpF@J;>e`&PJxVDB-%8>OM{_}fsZ}G4)ViIe;ZR31`(b`yuw=&D>9WiQ$Z zZi2=h<%h;wpF*g8ZzC98wGFq^(_$!S0dR0T&;WgC&SBwW*S`rdpp#ngO3!>M+6%2Z zdC9NcZ`uc`^yDFkvUlzS4=2pn>q~$7o~6p->?fIEChI{^A7I*HOx|f)eF#!DdwS;E zI}bscMz@md%{^^YWQR14P2^LJI_;1`=6Au0!REPmd~hVCzXLbO@h)`YtD#|Z`8_af zJI1x7o!>s0OkFcKoQ{h9x!`%&Y?(vI5f`%AWjaY*Sl z$dAn5K$&(;$@VV{*fem2{q{HPRwywV40Ll6zpop=gGHG0WemkEgBTk9vN%FZzvro~ z2UrrWv-YPq2s2&vVpq`eICCl@mSx4f*Nf^J#7HXsJF~*to7>CMxoSPa@^eThvgpnY zc8aTRK)S&c%aM~)AVaJ<#5hika2TX~P43G8MCmxndPcxguRs&n7*ScJYAM8T}sUlar<~<}l>fGe@>p zb6uK$>5+Qcd)9K}es6~9p+03U$1u@?1D8ur`qD%nX3^iCG{{0AMXndYWd06DYqs;O zx?6j+k|jB8Oed%&b~WC*Hd%)LNpP6Gb&&o2SdkC*{2AhlUeer9(L9mbl^1%SC#uG_ zR|9MEe{zjKoLZki`!mHr5*y)^Tqv0?WQuT(2WQc&`NBg6`@fJmoRdfVs;EnlmfekC z2Wrko=6NV@xj2WL#~FgU@-Vqfj?DNhQFAkMI6reQR8w<4L*%xP{s^Y$7XK^D=ZV3!tz9mpI$rr{!2Tb9~wnUF+)+p>Dc>Xx$~>?EDD|tA4(_k#X=XERVt9@CWl2V zrs`#4VZE;&~uz0>4h8v8iteCCw9&+K>1~ z_MoSZ9gEIrPpS}W05|>^EG>Je%RSqITN0w&gLuJUMhGJm=h*t<#y2?3KM>yk-Z+_) z!}*3Jxd`28;b)Px~$^VVx3TyvaD_V(9Ay+8X;4tNJq>uUx_%8U98FkgV JKEGCE{vU-=P4NH# delta 5614 zcma)A3tW`dw*S_i862Jt4*_8qhk=xg5D4vLgaer(q5@iy4+ImRfT*NE2m>mSsUgc| znHeG(>h%#i<@7{+q?HzAdTvi451C~ec0K2oSL3ezA)eFkckb`{@%uCT+mE%^UhnOgcrCFO0OAJb2WrZ-&bNZpABj!*?7W)5bW8 z{3d}boa9cIJ5z>mYZo|f3>eo>&T&cM_g_~yN<*qGWZ4QPO)4LC)SG~?hBl6Z#gv^V zOuA^Ebpx;Md>a!Z@4=amWm4rLu{7MM+bi4@rKd*`3jC14XH=9+@%juQ8~n&NhHCws z^OlGiaQD+sEf$XfUQ3R|h7<#i9}|Wjm4)NFvHfvE$xuhg*fW5$=7wYW!htyK*|9tz zf5RM}DgOm%&TvDwv^VVJ+X5#GW)|LDJQvR`$#Kjs z^aoW^e#rr7TR8$#$5=3=G#neA8Hm$LEto%NF~6OI0G$aHL>=NzPJ*aiy$3 zT65i4xYg>Wz2m)`vf}aU>J|8W_F`#$STy@#$CYO<30%1PNw%9*T$~kv>z^+o?-N-eXP#heFY*UQOdJpwgQkKSGPQ|wfz za#Yoq171ip;r@n9`~9#^<0He;et6NbWqY_lzpkXl9fGRn!8DkJU_XUv(UI8tijSs1 z&f5WN0P)(c9!K|1EkL>B+U}Wru#cg_}{0KYP(8jR;KMz?|1Go@1-|ei>Wd0es|-ZDf5M z8eyU;{PN2qDQZ9Xs6k{5w#|&8=F>15Z4U=h!xP{_tpc>F;M1bx*}dkoH2v{FsXGH)Ebft*_5X-?ekXk1T zKiWH4xE%@weGrXKfE{p%!`)=E?E|yZ91op9XT}H%)s7WbN=N{g+hUHT&ey@nCMIhe zGpMLng}O3f|)S-rC5mI*mi$Y8VF39^cQRyYJ$~L zDP)}tnRKB9l2Q7G8s|oGbY0Xmg{LkZ5y-|b+|{_4^)x$msTu;*0LaFmrH(e3z_C9_ zt_-Kv<&fJK?#HO|;+UrTw{8#fc%Bjqn5DgE0wF_^#Lfnbc4aT~yI5mfHLQo5T%(1N z%>pK;X$E8o?T!scTAa2lu(_h;><(;xX#~uZfv-|-&=&>PsfS4`giO{<6E!b_G;FqN zHIK7?4>!RItUF&%=3}D2b6*}z*7)YIj*65R{_Au98Z|F9go!9V*ndb~=8-(I&XXCe zqa!AGhND~{=xEpyc<9hluxWHxXZcoGar@w4s&@(xw7&00RV6TkjLTUVNwLrh3Z;{{ zcR&KuC{so&BiSfYl^kWZG!h!Mf+Ov{xbf2fvMqriN?Qv@r6p8TcRS}=w@GfAfz1D? zdpIl(l7gRrokN0D;oF~Ke_^%NbHGYgldJ6(SH6mpOcn7EO6D>Mlf|*_E4ItER8j^h zuCST8kU2}Wc$Z&!q+OxXcodU)Y*+~sb>8>+L^#>V z)kj*opzjJ`2uD7DieCj86gwOu>xO7yAf}&Bw6BKZejoQvzD;B`Wb2&K#oz-6uNOD?ti9moNsyGdy_EupeV?7KJN;##!Duy|W>cK@TCJE!4T^H9`rc! zxQDZ~0rYOVwc(Y)aTJ;h0eE__fudg(TG|l-1|6$G337Vwfd@gqi`%aeUf%~^8d|+t7(F9-^Z`a3V>rPc@MVwONQq=S0LSRqK8Vphz^6S= zCHt7IhJ!qsyeHCm{UD@i^{?}yM#gROPDq2N)dSIWC!~_?3fP=nc-w%i{GYtig`Se% zfuAX3o3P?H;d(J0s5~AlWPT6A1k~M@#(S_DT*{?76)Jd_yQ3OJw9I5jP4c?fD|EgY z{i!YADLY-5DY^x0oL?KA7h1tC#BYkT^cYm@X?6k|ME6jR7JB?Fbv$)n<{N_bG^9}S zbFdajjSwia0Y_(#I|gr}3vEzCwp_63Ch(R9HS}}t*OQm4@TWpA;m?=A6+A@NYOw2G z;Z`HUwT-fBf`@U^`R~*cQ#XwVs%iVTTpP8V1tX`D-Q1JyJn}i5>_6a2-osyv;rBpB z2*bh%r^_v3hr>2I9B90DDgSmH#D`#mJq<}8%@9!LpV2=-Tvq>&+pUH9gX953d4X&m?{v+x)rnIZ4RcWBc4%VD1Dq>c~u((e@t&4;lx@@27( zFOkW2RFpu*pZRXN`gJ4KUtrxtT!uip-~&P6L+%G4*ww^q2Qkd#y;ZzTzx~V_JE#{k zq@04B%dbL)A8?5) zGB7mK>|kM{=pbRG?!#cU8^v$XO1~Qghp%^;nlD3j1Kl@*3m*FYJ?SnXqBnXuuZIYa zXlSEZ+eNS>I$QAOtJs%#R)?g7uOScLis(TXFQEHkf z@?F5i;=DV#BAXY=>qb6V)0tCo3TD%FFBX;U6#HMoLlBLfmML}vho`lZL^K}%yMaDU z6HD1<`V@kuuT7Nd%ffCvW6_o{!Mba^V7N?deBIh@ge_{)wayWP`Cb+2JUUzyfU{t# zIOk5sY$Aq=o)T)5ao@^u;|pHT4{gsC3n;c2KBTBzkxYg>u~e{#z&srcvj zlIw%i;BhIw^e?Op^^tA)y@Z?##2H+fWOjX;OCecjFT=eUt8AEaqG8ZV^|UX^(y{S7gyI`NBI)cb8l*`cPb@^-qi0*tXvPE|2QmRwT0E zE+RSo;w?No*w5K|R9NAE0dUo-5dZ)H diff --git a/INT69DB_2A/DataStore.cs b/INT69DB_2A/DataStore.cs index 5ffa822..ca35b0b 100644 --- a/INT69DB_2A/DataStore.cs +++ b/INT69DB_2A/DataStore.cs @@ -406,6 +406,8 @@ namespace INT69DB_2A Clear, UserEditor, MainCut, + DataBackup, + GroupEditor, Bypass, Update, @@ -420,6 +422,10 @@ namespace INT69DB_2A ProductPaste, ProductAllPaste, Initialization, + MotorInitDown, + MotorChangeID, + MotorChangeValueEach, + MotorChangeValueAll, } public enum TrackingParameter { @@ -436,15 +442,18 @@ namespace INT69DB_2A JudgmentFilter, JudgmentDelayTime, - JudgmentDamperDelayTime, + JudgmentDoubleDelayTime, JudgmentCount, + JudgmentCVSpeed, + JudgmentDynamic, + ForcedZeroDelayTime, SorterDelayTime, SorterRunTime, - DischargeCVDelay, - DischargeCVRun, - FeedingCVDelay, - FeedingCVRun, + RejectCVDelayTime, + RejectCVRunTime, + FeedingCVDelayTime, + FeedingCVRunTime, Com3Baudrate, Com3Mode, @@ -475,6 +484,10 @@ namespace INT69DB_2A EtcDecimalpoint, EtcBypass, + MotorDirection, + MotorAnglePass, + MotorAngleNG, + MotorOriginOffset, MotorOriginSpeed, MotorSpeed, diff --git a/INT69DB_2A/Forms/FormDataBackup_Part11.cs b/INT69DB_2A/Forms/FormDataBackup_Part11.cs index 3fba661..2f90d7a 100644 --- a/INT69DB_2A/Forms/FormDataBackup_Part11.cs +++ b/INT69DB_2A/Forms/FormDataBackup_Part11.cs @@ -276,6 +276,7 @@ namespace INT69DB_2A.Forms // 복사 완료 메시지 DialogFormMessage msg = new DialogFormMessage(count.ToString(), this.ParentForm.SystemConfig.Language); + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.DataBackup, type.ToString()); this.SplashFinish(); msg.ShowDialog(); #endregion diff --git a/INT69DB_2A/Forms/FormFactoryReset.cs b/INT69DB_2A/Forms/FormFactoryReset.cs index 190e971..499cb9f 100644 --- a/INT69DB_2A/Forms/FormFactoryReset.cs +++ b/INT69DB_2A/Forms/FormFactoryReset.cs @@ -350,8 +350,6 @@ namespace INT69DB_2A.Forms this.ResetCountFile(); this.progressBarResetBar.Value = 100; - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Initialization, ""); - this.labelResetWait.Visible = false; this.labelResetRestart.Visible = true; } diff --git a/INT69DB_2A/Forms/FormMainDisplay.cs b/INT69DB_2A/Forms/FormMainDisplay.cs index d4581bd..2744063 100644 --- a/INT69DB_2A/Forms/FormMainDisplay.cs +++ b/INT69DB_2A/Forms/FormMainDisplay.cs @@ -2683,7 +2683,7 @@ namespace INT69DB_2A.Forms this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); if (before != after) - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.DischargeCVDelay, "", before, after); + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RejectCVDelayTime, "", before, after); } } } @@ -2719,7 +2719,7 @@ namespace INT69DB_2A.Forms this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); if (before != after) - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.DischargeCVRun, "", before, after); + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RejectCVRunTime, "", before, after); } } } @@ -2755,7 +2755,7 @@ namespace INT69DB_2A.Forms this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); if (before != after) - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVDelay, "", before, after); + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVDelayTime, "", before, after); } } } @@ -2791,7 +2791,7 @@ namespace INT69DB_2A.Forms this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); if (before != after) - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVRun, "", before, after); + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVRunTime, "", before, after); } } } diff --git a/INT69DB_2A/Forms/FormMenu.cs b/INT69DB_2A/Forms/FormMenu.cs index 27f94ac..5520432 100644 --- a/INT69DB_2A/Forms/FormMenu.cs +++ b/INT69DB_2A/Forms/FormMenu.cs @@ -542,6 +542,10 @@ namespace INT69DB_2A.Forms DialogResult dr = myDlg.ShowDialog(); if (dr == DialogResult.Yes) { + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Initialization, ""); + ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormFactory); this.ParentForm.ChildFormFactoryInitialize.timer1.Enabled = true; } @@ -553,7 +557,13 @@ namespace INT69DB_2A.Forms DialogFormYesNo myDlg = new DialogFormYesNo(this.ParentForm.SystemConfig.Language, 3); DialogResult dr = myDlg.ShowDialog(); if (dr == DialogResult.Yes) + { + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Update, ""); + this.ParentForm.ChildFormProgramUpdate.DisplayRefresh(); + } #endregion } else if (button == this.buttonEquipment) diff --git a/INT69DB_2A/Forms/FormMotorSetting.Designer.cs b/INT69DB_2A/Forms/FormMotorSetting.Designer.cs index fdba8d1..c649b31 100644 --- a/INT69DB_2A/Forms/FormMotorSetting.Designer.cs +++ b/INT69DB_2A/Forms/FormMotorSetting.Designer.cs @@ -1354,7 +1354,7 @@ this.groupBoxDirection.Location = new System.Drawing.Point(5, 302); this.groupBoxDirection.Name = "groupBoxDirection"; this.groupBoxDirection.RoundRadius = 10; - this.groupBoxDirection.Size = new System.Drawing.Size(620, 92); + this.groupBoxDirection.Size = new System.Drawing.Size(782, 92); this.groupBoxDirection.TabIndex = 248; this.groupBoxDirection.Text = "열별 회전 방향(기본:정방향, Click:역방향)"; this.groupBoxDirection.TextColor = System.Drawing.Color.Black; @@ -1372,7 +1372,7 @@ this.buttonDirectionLine10.Font = new System.Drawing.Font("Arial", 36F, System.Drawing.FontStyle.Bold); this.buttonDirectionLine10.GroupID = 0; this.buttonDirectionLine10.InitVisible = true; - this.buttonDirectionLine10.Location = new System.Drawing.Point(536, 23); + this.buttonDirectionLine10.Location = new System.Drawing.Point(633, 24); this.buttonDirectionLine10.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonDirectionLine10.Name = "buttonDirectionLine10"; this.buttonDirectionLine10.NestedClickEventPrevent = false; @@ -1405,7 +1405,7 @@ this.buttonDirectionLine9.Font = new System.Drawing.Font("Arial", 36F, System.Drawing.FontStyle.Bold); this.buttonDirectionLine9.GroupID = 0; this.buttonDirectionLine9.InitVisible = true; - this.buttonDirectionLine9.Location = new System.Drawing.Point(480, 23); + this.buttonDirectionLine9.Location = new System.Drawing.Point(577, 24); this.buttonDirectionLine9.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonDirectionLine9.Name = "buttonDirectionLine9"; this.buttonDirectionLine9.NestedClickEventPrevent = false; @@ -1438,7 +1438,7 @@ this.buttonDirectionLine8.Font = new System.Drawing.Font("Arial", 36F, System.Drawing.FontStyle.Bold); this.buttonDirectionLine8.GroupID = 0; this.buttonDirectionLine8.InitVisible = true; - this.buttonDirectionLine8.Location = new System.Drawing.Point(424, 23); + this.buttonDirectionLine8.Location = new System.Drawing.Point(521, 24); this.buttonDirectionLine8.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonDirectionLine8.Name = "buttonDirectionLine8"; this.buttonDirectionLine8.NestedClickEventPrevent = false; @@ -1471,7 +1471,7 @@ this.buttonDirectionLine7.Font = new System.Drawing.Font("Arial", 36F, System.Drawing.FontStyle.Bold); this.buttonDirectionLine7.GroupID = 0; this.buttonDirectionLine7.InitVisible = true; - this.buttonDirectionLine7.Location = new System.Drawing.Point(368, 23); + this.buttonDirectionLine7.Location = new System.Drawing.Point(465, 24); this.buttonDirectionLine7.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonDirectionLine7.Name = "buttonDirectionLine7"; this.buttonDirectionLine7.NestedClickEventPrevent = false; @@ -1503,7 +1503,7 @@ this.buttonDirectionLine1.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonDirectionLine1.DownImage"))); this.buttonDirectionLine1.GroupID = 0; this.buttonDirectionLine1.InitVisible = true; - this.buttonDirectionLine1.Location = new System.Drawing.Point(32, 23); + this.buttonDirectionLine1.Location = new System.Drawing.Point(129, 24); this.buttonDirectionLine1.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonDirectionLine1.Name = "buttonDirectionLine1"; this.buttonDirectionLine1.NestedClickEventPrevent = false; @@ -1535,7 +1535,7 @@ this.buttonDirectionLine2.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonDirectionLine2.DownImage"))); this.buttonDirectionLine2.GroupID = 0; this.buttonDirectionLine2.InitVisible = true; - this.buttonDirectionLine2.Location = new System.Drawing.Point(88, 23); + this.buttonDirectionLine2.Location = new System.Drawing.Point(185, 24); this.buttonDirectionLine2.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonDirectionLine2.Name = "buttonDirectionLine2"; this.buttonDirectionLine2.NestedClickEventPrevent = false; @@ -1567,7 +1567,7 @@ this.buttonDirectionLine3.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonDirectionLine3.DownImage"))); this.buttonDirectionLine3.GroupID = 0; this.buttonDirectionLine3.InitVisible = true; - this.buttonDirectionLine3.Location = new System.Drawing.Point(144, 23); + this.buttonDirectionLine3.Location = new System.Drawing.Point(241, 24); this.buttonDirectionLine3.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonDirectionLine3.Name = "buttonDirectionLine3"; this.buttonDirectionLine3.NestedClickEventPrevent = false; @@ -1599,7 +1599,7 @@ this.buttonDirectionLine4.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonDirectionLine4.DownImage"))); this.buttonDirectionLine4.GroupID = 0; this.buttonDirectionLine4.InitVisible = true; - this.buttonDirectionLine4.Location = new System.Drawing.Point(200, 23); + this.buttonDirectionLine4.Location = new System.Drawing.Point(297, 24); this.buttonDirectionLine4.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonDirectionLine4.Name = "buttonDirectionLine4"; this.buttonDirectionLine4.NestedClickEventPrevent = false; @@ -1631,7 +1631,7 @@ this.buttonDirectionLine5.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonDirectionLine5.DownImage"))); this.buttonDirectionLine5.GroupID = 0; this.buttonDirectionLine5.InitVisible = true; - this.buttonDirectionLine5.Location = new System.Drawing.Point(256, 23); + this.buttonDirectionLine5.Location = new System.Drawing.Point(353, 24); this.buttonDirectionLine5.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonDirectionLine5.Name = "buttonDirectionLine5"; this.buttonDirectionLine5.NestedClickEventPrevent = false; @@ -1663,7 +1663,7 @@ this.buttonDirectionLine6.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonDirectionLine6.DownImage"))); this.buttonDirectionLine6.GroupID = 0; this.buttonDirectionLine6.InitVisible = true; - this.buttonDirectionLine6.Location = new System.Drawing.Point(312, 23); + this.buttonDirectionLine6.Location = new System.Drawing.Point(409, 24); this.buttonDirectionLine6.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonDirectionLine6.Name = "buttonDirectionLine6"; this.buttonDirectionLine6.NestedClickEventPrevent = false; diff --git a/INT69DB_2A/Forms/FormMotorSetting.cs b/INT69DB_2A/Forms/FormMotorSetting.cs index 09c4552..109645e 100644 --- a/INT69DB_2A/Forms/FormMotorSetting.cs +++ b/INT69DB_2A/Forms/FormMotorSetting.cs @@ -47,6 +47,10 @@ namespace INT69DB_2A.Forms private int m_Value5Max; private int m_Value6Max; + private string BeforeDirection; + private string AfterDirection; + + private Collection CollectionDirection; private Collection CollectionButtonLine; #endregion @@ -390,6 +394,19 @@ namespace INT69DB_2A.Forms this.CollectionButtonLine.Add(this.buttonLine8); this.CollectionButtonLine.Add(this.buttonLine9); this.CollectionButtonLine.Add(this.buttonLine10); + + this.CollectionDirection = new Collection(); + this.CollectionDirection.Clear(); + this.CollectionDirection.Add(this.buttonDirectionLine1); + this.CollectionDirection.Add(this.buttonDirectionLine2); + this.CollectionDirection.Add(this.buttonDirectionLine3); + this.CollectionDirection.Add(this.buttonDirectionLine4); + this.CollectionDirection.Add(this.buttonDirectionLine5); + this.CollectionDirection.Add(this.buttonDirectionLine6); + this.CollectionDirection.Add(this.buttonDirectionLine7); + this.CollectionDirection.Add(this.buttonDirectionLine8); + this.CollectionDirection.Add(this.buttonDirectionLine9); + this.CollectionDirection.Add(this.buttonDirectionLine10); } private void ButtonEnable(bool enable) { @@ -752,6 +769,53 @@ namespace INT69DB_2A.Forms } } + private string ReturnAngle(int num) + { + string tempString = ""; + + switch (num) + { + case 1: + tempString = "60"; + break; + case 2: + tempString = "90"; + break; + case 3: + tempString = "120"; + break; + case 4: + tempString = "180"; + break; + case 5: + tempString = "50"; + break; + case 6: + tempString = "60"; + break; + case 7: + tempString = "70"; + break; + case 8: + tempString = "80"; + break; + case 9: + tempString = "100"; + break; + case 10: + tempString = "110"; + break; + case 11: + tempString = "120"; + break; + case 12: + tempString = "130"; + break; + default: + break; + } + return tempString; + } public void Visible2StepRotate(bool bValue) { this.labelTitleStep1.Visible = bValue; @@ -765,40 +829,21 @@ namespace INT69DB_2A.Forms } public void UpdateMotorDirectionDisplay(DataStore.EquipmentStatus status, Collection values) { - this.buttonDirectionLine1.Click -= new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine2.Click -= new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine3.Click -= new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine4.Click -= new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine5.Click -= new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine6.Click -= new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine7.Click -= new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine8.Click -= new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine9.Click -= new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine10.Click -= new EventHandler(this.buttonDirection_Click); + for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++) + { + this.CollectionDirection[i].Click -= new EventHandler(this.buttonDirection_Click); - if (values[0] == "0") this.buttonDirectionLine1.ButtonUp(); else this.buttonDirectionLine1.ButtonDown(); - if (values[1] == "0") this.buttonDirectionLine2.ButtonUp(); else this.buttonDirectionLine2.ButtonDown(); - if (values[2] == "0") this.buttonDirectionLine3.ButtonUp(); else this.buttonDirectionLine3.ButtonDown(); - if (values[3] == "0") this.buttonDirectionLine4.ButtonUp(); else this.buttonDirectionLine4.ButtonDown(); - if (values[4] == "0") this.buttonDirectionLine5.ButtonUp(); else this.buttonDirectionLine5.ButtonDown(); - if (values[5] == "0") this.buttonDirectionLine6.ButtonUp(); else this.buttonDirectionLine6.ButtonDown(); - if (values[6] == "0") this.buttonDirectionLine7.ButtonUp(); else this.buttonDirectionLine7.ButtonDown(); - if (values[7] == "0") this.buttonDirectionLine8.ButtonUp(); else this.buttonDirectionLine8.ButtonDown(); - if (values[8] == "0") this.buttonDirectionLine9.ButtonUp(); else this.buttonDirectionLine9.ButtonDown(); - if (values[9] == "0") this.buttonDirectionLine10.ButtonUp(); else this.buttonDirectionLine10.ButtonDown(); + if (values[i] == "0") this.CollectionDirection[i].ButtonUp(); else this.CollectionDirection[i].ButtonDown(); + + if (i == 0) + this.BeforeDirection = values[i]; + else + this.BeforeDirection += values[i]; + + this.CollectionDirection[i].Click += new EventHandler(this.buttonDirection_Click); + } this.buttonSave.Visible = false; - - this.buttonDirectionLine1.Click += new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine2.Click += new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine3.Click += new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine4.Click += new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine5.Click += new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine6.Click += new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine7.Click += new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine8.Click += new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine9.Click += new EventHandler(this.buttonDirection_Click); - this.buttonDirectionLine10.Click += new EventHandler(this.buttonDirection_Click); } public byte[] SendCommand(Byte Address, Byte Command, Byte Type, Byte Motor, int iValue) @@ -1774,9 +1819,23 @@ namespace INT69DB_2A.Forms this.TransferDirectSTXETX0x0A(this.ArrayDeviceName[i] + value); Thread.Sleep(100); } + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MotorChangeValueAll, "MDrive" + "/" + + this.CurrentImpellerMotorItem.Rc + "," + this.CurrentImpellerMotorItem.Hc + "," + this.CurrentImpellerMotorItem.Ms + "," + + this.CurrentImpellerMotorItem.Vi + "," + this.CurrentImpellerMotorItem.Vm + "," + this.CurrentImpellerMotorItem.A); } else + { this.TransferDirectSTXETX0x0A(this.DeviceName + value); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MotorChangeValueEach, "MDrive" + "/" + this.DeviceName + "/" + + this.CurrentImpellerMotorItem.Rc + "," + this.CurrentImpellerMotorItem.Hc + "," + this.CurrentImpellerMotorItem.Ms + "," + + this.CurrentImpellerMotorItem.Vi + "," + this.CurrentImpellerMotorItem.Vm + "," + this.CurrentImpellerMotorItem.A); + } } #endregion break; @@ -1829,9 +1888,25 @@ namespace INT69DB_2A.Forms if (value != "") { if (this.IsAllDownload == true) + { this.TransferDirectETX0x0D(value); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MotorChangeValueAll, "Moons" + "/" + + this.CurrentImpellerMotorItem.CC + "," + this.CurrentImpellerMotorItem.PI + "," + this.CurrentImpellerMotorItem.EG + "," + + this.CurrentImpellerMotorItem.VE + "," + this.CurrentImpellerMotorItem.AC + "," + this.CurrentImpellerMotorItem.DE); + } else + { this.TransferDirectETX0x0D(this.SelectImpellerTag + value); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MotorChangeValueEach, "Moons" + "/" + this.SelectImpellerTag + "/" + + this.CurrentImpellerMotorItem.CC + "," + this.CurrentImpellerMotorItem.PI + "," + this.CurrentImpellerMotorItem.EG + "," + + this.CurrentImpellerMotorItem.VE + "," + this.CurrentImpellerMotorItem.AC + "," + this.CurrentImpellerMotorItem.DE); + } } #endregion break; @@ -1844,7 +1919,187 @@ namespace INT69DB_2A.Forms } private void timerInitialDownload_Tick(object sender, EventArgs e) { + string value = ""; + string str = ""; + this.timerInitialDownload.Enabled = false; + this.Time += 1; + this.progressBarDownload.Value += 5; + switch ((int)this.ParentForm.SystemConfig.StepMotorType) + { + case (int)DataStore.StepMotorType.MDrive: + #region MDrive + switch (this.Time) + { + case 1: + this.SerialPort1OpenForMotor(115200); + + value = "*FD"; + this.TransferDirectSTXETX0x0ACOM1(value); + break; + case 2: + this.SerialPort1OpenForMotor(9600); + + value = "ex 1"; + this.TransferDirectETX0x0DCOM1(value); + break; + case 3: + value = "PG 1"; + this.TransferDirectETX0x0DCOM1(value); + break; + case 4: + value = "LB SU"; + this.TransferDirectETX0x0DCOM1(value); + break; + case 5: + this.CurrentImpellerMotorItem.Rc = this.label1.Text.Trim(); + value = "Rc=" + this.label1.Text.Trim(); + this.TransferDirectETX0x0DCOM1(value); + break; + case 6: + this.CurrentImpellerMotorItem.Hc = this.label2.Text.Trim(); + value = "Hc=" + this.label2.Text.Trim(); + this.TransferDirectETX0x0DCOM1(value); + break; + case 7: + this.CurrentImpellerMotorItem.Ms = this.label3.Text.Trim(); + value = "Ms=" + this.label3.Text.Trim(); + this.TransferDirectETX0x0DCOM1(value); + break; + case 8: + this.CurrentImpellerMotorItem.Vi = this.label4.Text.Trim(); + value = "Vi=" + this.label4.Text.Trim(); + this.TransferDirectETX0x0DCOM1(value); + break; + case 9: + this.CurrentImpellerMotorItem.Vm = this.label5.Text.Trim(); + value = "Vm=" + this.label5.Text.Trim(); + this.TransferDirectETX0x0DCOM1(value); + break; + case 10: + this.CurrentImpellerMotorItem.A = this.label6.Text.Trim(); + value = "A=" + this.label6.Text.Trim(); + this.TransferDirectETX0x0DCOM1(value); + break; + case 11: + value = "EM=2"; + this.TransferDirectETX0x0DCOM1(value); + break; + case 12: + value = "D=A"; + this.TransferDirectETX0x0DCOM1(value); + break; + case 13: + value = "E"; + this.TransferDirectETX0x0DCOM1(value); + break; + case 14: + value = "PG"; + this.TransferDirectETX0x0DCOM1(value); + break; + case 15: + value = this.DNValueForComm; + this.TransferDirectETX0x0DCOM1(value); + break; + case 16: + value = "PY=1"; + this.TransferDirectETX0x0DCOM1(value); + break; + case 17: + value = this.DeviceName + "BD=11"; + this.TransferDirectSTXETX0x0ACOM1(value); + break; + case 18: + value = this.DeviceName + "S"; + this.TransferDirectSTXETX0x0ACOM1(value); + break; + case 19: + value = this.DeviceName + "ex 1"; + this.TransferDirectSTXETX0x0ACOM1(value); + + this.progressBarDownload.Value = 100; + this.SaveImpellerFile(this.CurrentImpellerMotorItem); + + this.Time = 0; + this.serialPort1.Close(); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MotorInitDown, "MDrive"); + + this.ButtonEnable(true); + break; + default: + break; + } + #endregion + break; + case (int)DataStore.StepMotorType.Moons: + #region Moons + switch (this.Time) + { + case 1: + this.SerialPort1OpenForMotor(9600); + + value = "DA" + this.SelectImpellerTag; + break; + case 2: + value = "EG36000"; + break; + case 3: + this.CurrentImpellerMotorItem.CC = (double.Parse(this.label1.Text) / 100).ToString(); + value = "CC" + this.CurrentImpellerMotorItem.CC; + break; + case 4: + this.CurrentImpellerMotorItem.PI = (double.Parse(this.label2.Text) / 100).ToString(); + value = "PI" + this.CurrentImpellerMotorItem.PI; + break; + case 5: + this.CurrentImpellerMotorItem.VE = this.label4.Text.Trim(); + value = "VE" + this.label4.Text.Trim(); + break; + case 6: + this.CurrentImpellerMotorItem.AC = this.label5.Text.Trim(); + value = "AC" + this.label5.Text; + break; + case 7: + this.CurrentImpellerMotorItem.DE = this.label6.Text.Trim(); + value = "DE" + this.label6.Text; + break; + case 8: + value = "PR3"; + break; + case 9: + value = "BR5"; + break; + case 10: + this.SerialPort1OpenForMotor(115200); + value = "SA"; + break; + case 11: + this.progressBarDownload.Value = 100; + this.SaveImpellerFile(this.CurrentImpellerMotorItem); + + this.Time = 0; + this.serialPort1.Close(); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MotorInitDown, "Moons"); + + this.ButtonEnable(true); + break; + default: + break; + } + #endregion + this.TransferDirectETX0x0DCOM1(value); + break; + default: + break; + } + if (this.Time != 0) + this.timerInitialDownload.Enabled = true; } private void timerChangeDeviceNo_Tick(object sender, EventArgs e) { @@ -1870,6 +2125,10 @@ namespace INT69DB_2A.Forms this.Time = 0; this.serialPort1.Close(); + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MotorChangeID, "Moons" + "/" + this.SelectImpellerTag); + this.ButtonEnable(true); break; default: @@ -2000,12 +2259,12 @@ namespace INT69DB_2A.Forms } private void buttonSave_Click(object sender, EventArgs e) { + string beforeAnglePass = "", afterAnglePass = ""; + string beforeAngleNG = "", afterAngleNG = ""; string value = ""; string[] tempArray = new string[12]; string[] array = new string[3]; - - - + if (this.buttonDirectionLine1.ButtonStatus == SmartButton.BUTSTATUS.UP) tempArray[11] = "0"; else tempArray[11] = "1"; if (this.buttonDirectionLine2.ButtonStatus == SmartButton.BUTSTATUS.UP) tempArray[10] = "0"; else tempArray[10] = "1"; if (this.buttonDirectionLine3.ButtonStatus == SmartButton.BUTSTATUS.UP) tempArray[9] = "0"; else tempArray[9] = "1"; @@ -2019,6 +2278,14 @@ namespace INT69DB_2A.Forms tempArray[1] = "0"; tempArray[0] = "0"; + for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++) + { + if (i == 0) + this.AfterDirection = tempArray[11 - i]; + else + this.AfterDirection += tempArray[11 - i]; + } + for (int i = 0; i < 3; i++) { int a = 0; @@ -2029,6 +2296,9 @@ namespace INT69DB_2A.Forms } value = "0" + array[0] + array[1] + array[2]; this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._1104_ImpellerMotorIndividualDirection, value); + + beforeAnglePass = this.ReturnAngle(this.ParentForm.SystemConfig.ImpellerMotorAnglePass); + beforeAngleNG = this.ReturnAngle(this.ParentForm.SystemConfig.ImpellerMotorAngleNG); if (this.radioButtonImpellerMotorAngle60.Checked == true) { @@ -2058,6 +2328,9 @@ namespace INT69DB_2A.Forms this.ParentForm.SystemConfig.ImpellerMotorAngleNG = this.comboBoxTwoStepNGAngle.SelectedIndex + 5; } + afterAnglePass = this.ReturnAngle(this.ParentForm.SystemConfig.ImpellerMotorAnglePass); + afterAngleNG = this.ReturnAngle(this.ParentForm.SystemConfig.ImpellerMotorAngleNG); + // SystemConfig 파일 저장 this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); @@ -2067,6 +2340,13 @@ namespace INT69DB_2A.Forms this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._1105_ImpellerMotorAngleNG, value); this.buttonSave.Visible = false; + + if (this.BeforeDirection != this.AfterDirection) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.MotorDirection, "", this.BeforeDirection, this.AfterDirection); + if (beforeAnglePass != afterAnglePass) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.MotorAnglePass, "", beforeAnglePass, afterAnglePass); + if (beforeAngleNG != afterAngleNG) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.MotorAngleNG, "", beforeAngleNG, afterAngleNG); } #endregion } diff --git a/INT69DB_2A/Forms/FormProgramUpdate.cs b/INT69DB_2A/Forms/FormProgramUpdate.cs index 1524336..d1e7a03 100644 --- a/INT69DB_2A/Forms/FormProgramUpdate.cs +++ b/INT69DB_2A/Forms/FormProgramUpdate.cs @@ -147,7 +147,6 @@ namespace INT69DB_2A.Forms this.TreatmentCopyNewFile(newFiles); this.progressBarUpdateBar.Value += 100; - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Update, ""); } private void TreatmentRemoveOldFile() { diff --git a/INT69DB_2A/Forms/FormSystemSetting.Designer.cs b/INT69DB_2A/Forms/FormSystemSetting.Designer.cs index b66ba0d..05bb156 100644 --- a/INT69DB_2A/Forms/FormSystemSetting.Designer.cs +++ b/INT69DB_2A/Forms/FormSystemSetting.Designer.cs @@ -1519,6 +1519,7 @@ this.smartKeyboard.TopMargin = 5; this.smartKeyboard.Visible = false; this.smartKeyboard.OnXKeyClick += new System.EventHandler(this.smartKeyboard_OnXKeyClick); + this.smartKeyboard.OnHanYoungKeyChange += new System.EventHandler(this.smartKeyboard_OnHanYoungKeyChange); // // labelTitle // diff --git a/INT69DB_2A/Forms/FormSystemSetting.cs b/INT69DB_2A/Forms/FormSystemSetting.cs index 615a4c2..e491294 100644 --- a/INT69DB_2A/Forms/FormSystemSetting.cs +++ b/INT69DB_2A/Forms/FormSystemSetting.cs @@ -19,7 +19,11 @@ namespace INT69DB_2A.Forms #region Field private FormMain m_ParentForm; + private bool IsHanyoung; private int SelectedProductNo; + private string BeforeName; + private string BeforeLot; + private ProductItem SelectedProductItem; private JudgmentSetItem SelectedJudgmentSetItem; private JudgmentSetItem CaptureJudgmentSetItem; @@ -163,6 +167,10 @@ namespace INT69DB_2A.Forms } private void DefaultSetting() { + this.IsHanyoung = false; + this.BeforeName = ""; + this.BeforeLot = ""; + this.CollectionButtonLine = new Collection(); this.CollectionButtonLine.Clear(); @@ -701,6 +709,10 @@ namespace INT69DB_2A.Forms } private void buttonItemNo_Click(object sender, EventArgs e) { + string before = "", after = ""; + + before = this.labelItemNo.Text; + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonItemNo.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); myKeyPad.Location = new Point(280, 90); @@ -714,7 +726,7 @@ namespace INT69DB_2A.Forms } else { - this.buttonItemNo.Text = this.labelItemNo.Text = myKeyPad.StringValue; + after = this.buttonItemNo.Text = this.labelItemNo.Text = myKeyPad.StringValue; this.SelectedProductNo = myKeyPad.IntValue; this.listBoxProductList.SelectedIndexChanged -= new EventHandler(this.listBoxProductList_SelectedIndexChanged); @@ -727,6 +739,10 @@ namespace INT69DB_2A.Forms this.buttonItemNo.Text = "**"; this.ParentForm.TransferProductParameter(this.SelectedProductNo); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ProductNumber, "", before, after); } } } @@ -758,11 +774,15 @@ namespace INT69DB_2A.Forms #region 품목설정 private void listBoxProductList_SelectedIndexChanged(object sender, EventArgs e) { + string before = "", after = ""; + if (this.listBoxProductList.SelectedItem == null) return; + before = this.SelectedProductNo.ToString(); + this.SelectedProductNo = this.listBoxProductList.SelectedIndex + 1; - this.labelItemNo.Text = this.SelectedProductNo.ToString(); + after = this.labelItemNo.Text = this.SelectedProductNo.ToString(); this.ParentForm.LoadProductFile(ref this.SelectedProductItem, this.listBoxProductList.SelectedIndex); @@ -770,10 +790,16 @@ namespace INT69DB_2A.Forms this.buttonItemNo.Text = "**"; this.ParentForm.TransferProductParameter(this.SelectedProductNo); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ProductNumber, "", before, after); } private void textBoxProductName_KeyPress(object sender, KeyPressEventArgs e) { + string after = "", number = ""; + if (e.KeyChar == '\r') { this.SelectedProductItem.Name = this.textBoxProductName.Text; @@ -791,6 +817,21 @@ namespace INT69DB_2A.Forms this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1); this.textBoxLotNo.Enabled = true; + + if (this.IsHanyoung == true) + { + this.smartKeyboard.HanYoungKeyToggle(); + this.IsHanyoung = false; + } + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + { + after = this.textBoxProductName.Text; + number = this.SelectedProductItem.Number.ToString(); + + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ChangeName, number, this.BeforeName, after); + } } else if (e.KeyChar == 27) { @@ -807,9 +848,10 @@ namespace INT69DB_2A.Forms e.Handled = true; } } - private void textBoxLotNo_KeyPress(object sender, KeyPressEventArgs e) { + string after = "", number = ""; + if (e.KeyChar == '\r') { this.SelectedProductItem.LotNo = this.textBoxLotNo.Text; @@ -820,6 +862,21 @@ namespace INT69DB_2A.Forms this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1); this.textBoxProductName.Enabled = true; + + if (this.IsHanyoung == true) + { + this.smartKeyboard.HanYoungKeyToggle(); + this.IsHanyoung = false; + } + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + { + after = this.textBoxLotNo.Text; + number = this.SelectedProductItem.Number.ToString(); + + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ChangeLOT, number, this.BeforeLot, after); + } } else if (e.KeyChar == 27) { @@ -850,8 +907,9 @@ namespace INT69DB_2A.Forms this.textBoxProductName.Select(this.textBoxProductName.Text.Length, 0); this.textBoxLotNo.Enabled = false; - } + this.BeforeName = this.textBoxProductName.Text; + } private void buttonLotEdit_Click(object sender, EventArgs e) { this.smartKeyboard.KeyboardType = SmartX.SmartKeyboard.KEYBOARDTYPES.NORMAL; @@ -865,19 +923,33 @@ namespace INT69DB_2A.Forms this.textBoxLotNo.Select(this.textBoxLotNo.Text.Length, 0); this.textBoxProductName.Enabled = false; + + this.BeforeLot = this.textBoxLotNo.Text; } + private void smartKeyboard_OnHanYoungKeyChange(object sender, EventArgs e) + { + if (this.IsHanyoung == false) + this.IsHanyoung = true; + else + this.IsHanyoung = false; + } private void smartKeyboard_OnXKeyClick(object sender, EventArgs e) { this.smartKeyboard.Hide(); this.ParentForm.LoadProductFile(ref this.SelectedProductItem, this.listBoxProductList.SelectedIndex); this.DisplayControls(this.SelectedProductItem); + this.buttonNameEdit.Enabled = true; + this.buttonLotEdit.Enabled = true; this.textBoxProductName.Enabled = true; this.textBoxLotNo.Enabled = true; } private void buttonUnder_Click(object sender, EventArgs e) { + string before = "", after = ""; + + before = this.buttonUnder.Text; DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonUnder.Text, 5, this.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.SystemConfig.Language); myKeyPad.Location = new Point(100, 90); @@ -891,15 +963,21 @@ namespace INT69DB_2A.Forms } else { - this.buttonUnder.Text = myKeyPad.StringValue; + after = this.buttonUnder.Text = myKeyPad.StringValue; this.SelectedProductItem.UnderRange = myKeyPad.StringValue.Replace(".", ""); this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1); + + if (before != after) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightUnderRange, "", before, after); } } } private void buttonPass_Click(object sender, EventArgs e) { + string before = "", after = ""; + + before = this.buttonPass.Text; DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonPass.Text, 5, this.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.SystemConfig.Language); myKeyPad.Location = new Point(100, 90); @@ -914,15 +992,21 @@ namespace INT69DB_2A.Forms } else { - this.buttonPass.Text = myKeyPad.StringValue; + after = this.buttonPass.Text = myKeyPad.StringValue; this.SelectedProductItem.PassRange = myKeyPad.StringValue.Replace(".", ""); this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1); + + if (before != after) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightPassRange, "", before, after); } } } private void buttonOver_Click(object sender, EventArgs e) { + string before = "", after = ""; + + before = this.buttonOver.Text; DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonOver.Text, 5, this.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.SystemConfig.Language); myKeyPad.Location = new Point(100, 90); @@ -936,15 +1020,21 @@ namespace INT69DB_2A.Forms } else { - this.buttonOver.Text = myKeyPad.StringValue; + after = this.buttonOver.Text = myKeyPad.StringValue; this.SelectedProductItem.OverRange = myKeyPad.StringValue.Replace(".", ""); this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1); + + if (before != after) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightOverRange, "", before, after); } } } private void buttonTare_Click(object sender, EventArgs e) { + string before = "", after = ""; + + before = this.buttonTare.Text; DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonTare.Text, 5, this.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.SystemConfig.Language); myKeyPad.Location = new Point(100, 90); @@ -958,10 +1048,13 @@ namespace INT69DB_2A.Forms } else { - this.buttonTare.Text = myKeyPad.StringValue; + after = this.buttonTare.Text = myKeyPad.StringValue; this.SelectedProductItem.TareRange = myKeyPad.StringValue.Replace(".", ""); this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1); + + if (before != after) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightTareRange, "", before, after); } } } @@ -970,7 +1063,10 @@ namespace INT69DB_2A.Forms #region 판정설정 private void labelFilter_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelFilter.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelFilter.Text, 2, 0, false, this.ParentForm.SystemConfig.Language); myKeyPad.Location = new Point(300, 90); @@ -985,19 +1081,26 @@ namespace INT69DB_2A.Forms } else { - this.labelFilter.Text = myKeyPad.StringValue; + after = this.labelFilter.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.Filter = myKeyPad.IntValue; value = Helper.StringZeroFillDigits4(this.labelFilter.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5001_Filter, value); this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentFilter, number, before, after); } } } private void labelJudgmentDelayTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelJudgmentDelayTime.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelJudgmentDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); myKeyPad.Location = new Point(300, 90); @@ -1012,20 +1115,26 @@ namespace INT69DB_2A.Forms } else { - this.labelJudgmentDelayTime.Text = myKeyPad.StringValue; + after = this.labelJudgmentDelayTime.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.JudgmentDelayTime = myKeyPad.IntValue; - value = Helper.StringZeroFillDigits4(this.labelJudgmentDelayTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5002_JudgmentDelayTime, value); this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentDelayTime, number, before, after); } } } private void labelDoubleDelayTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelDoubleDelayTime.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelDoubleDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); myKeyPad.Location = new Point(300, 90); @@ -1040,19 +1149,26 @@ namespace INT69DB_2A.Forms } else { - this.labelDoubleDelayTime.Text = myKeyPad.StringValue; + after = this.labelDoubleDelayTime.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.DoubleDelayTime = myKeyPad.IntValue; value = Helper.StringZeroFillDigits4(this.labelDoubleDelayTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5003_DoubleDelayTime, value); this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentDoubleDelayTime, number, before, after); } } } private void labelJudgmentCount_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelJudgmentCount.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelJudgmentCount.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); myKeyPad.Location = new Point(300, 90); @@ -1067,7 +1183,7 @@ namespace INT69DB_2A.Forms } else { - this.labelJudgmentCount.Text = myKeyPad.StringValue; + after = this.labelJudgmentCount.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.JudgmentCount = myKeyPad.IntValue; this.GraphBackRedraw(); @@ -1076,12 +1192,19 @@ namespace INT69DB_2A.Forms this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5004_JudgmentCount, value); this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentCount, number, before, after); } } } private void labelDynamicCorrection_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelDynamicCorrection.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelDynamicCorrection.Text, 7, 6, false, this.ParentForm.SystemConfig.Language); myKeyPad.Location = new Point(300, 90); @@ -1096,7 +1219,7 @@ namespace INT69DB_2A.Forms } else { - this.labelDynamicCorrection.Text = myKeyPad.StringValue; + after = this.labelDynamicCorrection.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.DynamicCorrection = myKeyPad.doubleValue; value = string.Format("{0:f6}", this.labelDynamicCorrection.Text); @@ -1105,12 +1228,20 @@ namespace INT69DB_2A.Forms this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5006_DynamicCorrection, value); this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentDynamic, number, before, after); } } } private void labelForcedZeroDelayTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelForcedZeroDelayTime.Text; + number = this.SelectedProductNo.ToString(); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelForcedZeroDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); myKeyPad.Location = new Point(300, 90); @@ -1124,13 +1255,17 @@ namespace INT69DB_2A.Forms } else { - this.labelForcedZeroDelayTime.Text = myKeyPad.StringValue; + after = this.labelForcedZeroDelayTime.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.ForcedZeroDelayTime = myKeyPad.IntValue; value = Helper.StringZeroFillDigits4(this.labelForcedZeroDelayTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._4501_ForcedZeroDelayTime, value); this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ForcedZeroDelayTime, number, before, after); } } } @@ -1143,7 +1278,10 @@ namespace INT69DB_2A.Forms private void labelRejectConveyorDelayTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelRejectConveyorDelayTime.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelRejectConveyorDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); myKeyPad.Location = new Point(300, 90); @@ -1158,19 +1296,26 @@ namespace INT69DB_2A.Forms } else { - this.labelRejectConveyorDelayTime.Text = myKeyPad.StringValue; + after = this.labelRejectConveyorDelayTime.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.RejectConveyorDelayTime = myKeyPad.IntValue; value = Helper.StringZeroFillDigits4(this.labelRejectConveyorDelayTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5009_DischargeConveyorDelayTime, value); this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RejectCVDelayTime, number, before, after); } } } private void labelRejectConveyorRunTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelRejectConveyorRunTime.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelRejectConveyorRunTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); myKeyPad.Location = new Point(300, 90); @@ -1185,19 +1330,26 @@ namespace INT69DB_2A.Forms } else { - this.labelRejectConveyorRunTime.Text = myKeyPad.StringValue; + after = this.labelRejectConveyorRunTime.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.RejectConveyorRunTime = myKeyPad.IntValue; value = Helper.StringZeroFillDigits4(this.labelRejectConveyorRunTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5010_DischargeConveyorRunTime, value); this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RejectCVRunTime, number, before, after); } } } private void labelFeedingConveyorDelayTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelFeedingConveyorDelayTime.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelFeedingConveyorDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); myKeyPad.Location = new Point(300, 90); @@ -1212,19 +1364,26 @@ namespace INT69DB_2A.Forms } else { - this.labelFeedingConveyorDelayTime.Text = myKeyPad.StringValue; + after = this.labelFeedingConveyorDelayTime.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.FeedingConveyorDelayTime = myKeyPad.IntValue; value = Helper.StringZeroFillDigits4(this.labelFeedingConveyorDelayTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5007_FeedingConveyorDelayTime, value); this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVDelayTime, number, before, after); } } } private void labelFeedingConveyorRunTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelFeedingConveyorRunTime.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelFeedingConveyorRunTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); myKeyPad.Location = new Point(300, 90); @@ -1239,13 +1398,17 @@ namespace INT69DB_2A.Forms } else { - this.labelFeedingConveyorRunTime.Text = myKeyPad.StringValue; + after = this.labelFeedingConveyorRunTime.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.FeedingConveyorRunTime = myKeyPad.IntValue; value = Helper.StringZeroFillDigits4(this.labelFeedingConveyorRunTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5008_FeedingConveyorRunTime, value); this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVRunTime, number, before, after); } } } @@ -1299,6 +1462,10 @@ namespace INT69DB_2A.Forms this.CaptureJudgmentSetItem.Sorter4Mode = this.SelectedJudgmentSetItem.Sorter4Mode; this.CaptureJudgmentSetItem.Sorter4DelayTime = this.SelectedJudgmentSetItem.Sorter4DelayTime; this.CaptureJudgmentSetItem.Sorter4RunTime = this.SelectedJudgmentSetItem.Sorter4RunTime; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.ProductCopy, this.buttonCopy.Text); } private void buttonPaste_Click(object sender, EventArgs e) { @@ -1335,6 +1502,10 @@ namespace INT69DB_2A.Forms this.buttonItemNo.Text = "**"; this.ParentForm.TransferProductParameter(this.SelectedProductNo); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.ProductPaste, this.SelectedProductNo.ToString()); } private void buttonPasteAll_Click(object sender, EventArgs e) { @@ -1438,6 +1609,10 @@ namespace INT69DB_2A.Forms this.buttonPasteAll.Enabled = true; splash.Finish(); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.ProductAllPaste, ""); } #endregion diff --git a/INT69DB_2A/Forms/FormUserEditor.Designer.cs b/INT69DB_2A/Forms/FormUserEditor.Designer.cs index 6e4eab5..2f59968 100644 --- a/INT69DB_2A/Forms/FormUserEditor.Designer.cs +++ b/INT69DB_2A/Forms/FormUserEditor.Designer.cs @@ -245,7 +245,7 @@ this.labelAccessRightAdmin.LineSpacing = 0F; this.labelAccessRightAdmin.Location = new System.Drawing.Point(209, 67); this.labelAccessRightAdmin.Name = "labelAccessRightAdmin"; - this.labelAccessRightAdmin.Size = new System.Drawing.Size(277, 26); + this.labelAccessRightAdmin.Size = new System.Drawing.Size(270, 26); this.labelAccessRightAdmin.TabIndex = 238; this.labelAccessRightAdmin.Text = "Administrator"; this.labelAccessRightAdmin.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; diff --git a/INT69DB_2A/Forms/FormUserGroupEditor.cs b/INT69DB_2A/Forms/FormUserGroupEditor.cs index 0e1c484..5dd1a73 100644 --- a/INT69DB_2A/Forms/FormUserGroupEditor.cs +++ b/INT69DB_2A/Forms/FormUserGroupEditor.cs @@ -335,6 +335,8 @@ namespace INT69DB_2A.Forms } private void buttonSave_Click(object sender, EventArgs e) { + string detail; + #region Level1 this.ParentForm.CurrentUserGroup.Level1.IsMainDisplayProductNo = this.checkBoxL1MainProductNo.Checked; this.ParentForm.CurrentUserGroup.Level1.IsMainDisplayWeightSetting = this.checkBoxL1MainWeightSet.Checked; @@ -432,6 +434,10 @@ namespace INT69DB_2A.Forms this.ParentForm.SaveUserGroupFile(this.ParentForm.CurrentUserGroup); + // Part 11 + detail = "Change access right"; + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.GroupEditor, detail); + this.buttonSave.Visible = false; } diff --git a/INT69DB_2A/Part11_UserManager/UserItem.cs b/INT69DB_2A/Part11_UserManager/UserItem.cs index d6ea7c5..dee5d75 100644 --- a/INT69DB_2A/Part11_UserManager/UserItem.cs +++ b/INT69DB_2A/Part11_UserManager/UserItem.cs @@ -252,8 +252,7 @@ namespace INT69DB_2A.Part11_UserManager private bool m_IsMenuStatistics; private bool m_IsMenuUser; private bool m_IsMenuUserGroupEditor; - private bool m_IsMenuViewer; - + private bool m_IsMenuViewer; #endregion #region Constructor diff --git a/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/Refactor/INT69DB_2A_ImageDll.dll b/INT69DB_2A_ImageDll/INT69DB_2A_ImageDll/obj/Release/Refactor/INT69DB_2A_ImageDll.dll index 57e044999b87b0a6f1e9d36a5cdb508a72a6b4a6..5a902d195a7eecc6a61e8be8bfde25a6634813bd 100644 GIT binary patch delta 125 zcmZqp!`SeLaY6_4j;@;HArX!Gn!c1Bd8$?L1EQAIWzmT@s|W~}+o F2msaCD02V+ delta 125 zcmZqp!`SeLaY6@kN6XcX-P`q9)+_e7Y<4qfvlqCn{`BK{{i$9nd->w#&b)hP^PT(+ z9NaxF>lGOo7#V={