From 877b53e1db32a713e2cd02658e4fa1094b0352bc Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Mon, 4 Apr 2016 18:43:37 +0200 Subject: [PATCH] Fix lista stati HALT --- MTC_Sim/.vs/MTC_Sim/v14/.suo | Bin 118784 -> 107520 bytes MTC_Sim/MTC_Sim/AdapterGeneric.cs | 4 +-- MTC_Sim/MTC_Sim/CMS_MachineSim.Designer.cs | 19 ++++---------- MTC_Sim/MTC_Sim/CMS_MachineSim.cs | 27 +++++++++++++++++++- MTC_Sim/MTC_Sim/HaltTypeList.txt | 8 ++++++ MTC_Sim/MTC_Sim/MTC_Sim.csproj | 5 ++++ MTC_Sim/MTC_Sim/utils.cs | 28 ++++++++++++++++++++- 7 files changed, 73 insertions(+), 18 deletions(-) create mode 100644 MTC_Sim/MTC_Sim/HaltTypeList.txt diff --git a/MTC_Sim/.vs/MTC_Sim/v14/.suo b/MTC_Sim/.vs/MTC_Sim/v14/.suo index 6780cbca4104558ead1c399975d19f8fb0bd76db..118fd62ee4409c25947a07dc2d2399c7b1b3c140 100644 GIT binary patch delta 5807 zcmeHLe{|E;760CEo6uj-v`yQT7WnqtiY+8*lD0`IZE0z2K?@T3Auyzb!L$auVOr+fg`NQ^tk{qmG!<3aQ8GRLzP8{ivftp-NFU_=}>~_QxkwV2ipa?HH z_|GA-P5BVKa9!^+29-ZTE!O*t<~b@PGZ5Jb1%h?_ImseHN8$kDASo9L za-K%&2;vtA^0-+bm06X;eO05`mGBL9S(WHg7@aAD(t*PqFC~MsCLlzDxgpp^#xXxk zf~pW4BIB4pMS^+P6mC>}f(+#ERDKVsBRrYNAA}7gSP)XyB4b}BnaCZSYN!74c17`a z#UZFAr6e5Zc#Rv_8?Pm&Q$@*L@=OKh-ojjaT zr%oxc(v%XM7d8{ELY;0$2A&9^ETy#(8TTSKA-WKo5hPr$)-r`|tn?sK%3G24B6^cN zf3hSog+axXb|)EOEJqgb@PlD{DH$@S!%0$Jbt@bnws)8P3S}pfde|hMMzQ`Pf}F3? z<}pqTE5AiBx_H?B=|0mZsU;-Aian!RnTI(fs1GSCQ0tKzGNB)YQWC5Q!R*L*O*X$z z(Ed*@^UUj(Ir4e!A|41j9`)n64nIXOImPlx1le3w*~!k~^n3d{)_;k32JtN77~(m^ z^9Z)wsq_NYBS{|Ho0k#f?W(%G*N|YR@(hBF_BJWB%$s=uYi}hvqr>)B_E|pxBN?}b zz(9fxq0AbTv2)A~+xM^|5!riNT}JmuFTK*Zct@{S*e>-4Jbqu3Xw(}-LGn5ME|0If zNes$vomE`i+_>7)7nss=N!yKvg<^B#N{`Pcxlq{LxD2U&qy&#k^2r`~K)>AY^K6y+ zn?%|w!a923O~?z0Q{t8WfJcrGYOXb#Md5yj?Ce=4OTBIWpigcRYp1acO=4Bme6PG{ zez&~H-PP6V^ZN#R{lUQMfj-H=1Od4pE!GN&lBrd@gFYu4z~No)cS-tHl2-~jWy!_H zsMfD_c!SckA&lS95K|-EDGf~P-_#_!gQ1%&N~w#2)8E^RD;H=IMIq4RzaOX5Hpy~3 zyaBW}=<{p~O3RWf+$8Qan4Bi5zTU0dVsSR;>I_av=P*fbo!M-)Sjn}Sho**|t7c++L&qN1cp_KE zDv9^3I)}MwNHKlCt0OIKo#Zl>v9=ac(OO69#yUrB{e_V;&o*jE%o&b^&#VLT$Qy$s zJZ8z{Je-s3=lonGHWq`?L77(`#oj*Fq#m?gA;m6atR?@@?M!$xXeZzIN{OQ?)M5=c2; zK*HzJvssNbxyW(!iV05A&l;ez{48=<9L7o(2(bV?l~V1C3tEu1oLkMcq0TD2;Juul zY%|VV?BX1pjP;fA3-3ZL_Clr-Yya66`{J<~f6NWIipA;m;n=WCDi8KR?v8wQQCns?O+*%yi%LS2MiIfM2Z{z}KN2xFx%uvv4-fz?rz(Xov>@5`K5Et`1dpau(ELK{Xa>+^p*tl)sU2hU|XtWT6Wu z(1k|!;ZM))z?zGjOTx$IMmpcS3Unk74JpM9?#nY9DQ*jk#yXSR(i1lz?~BzQX0IKM25i|xVmkRSX5)VWK1SUJcYFJ+S3#`iQULNN?p&wZK|HBUq?Vu{8cn$`}C*;5#I7o%ndN=T?u{ zf#A3~^!tmUHyUe&-8}6LgGj9%a8~hTX-~_vIfC+woiatI{1CNwfQ4E*po}hPhxNr% zE)@Hp^cn)$+9ITJ02DgFOdsulm+9TjFkhuV^5S0?{^9n*Vi@4IosZ3lsxH9afDTtf zS@e!-_z;fX2WlD?p(OrAOfN5h`{;=`A)mfdjc@1GN+_hU{h<8fr{P=i(%Pe8NT_~;>Z6w5g9_*tj8f=(9Z+!7Zc<}AXy}eG?$m;%ctY5g{|nu0 Bv?Krk delta 3315 zcmd^>eNbH06~Nzl`^6Hzc3Hk8d~8?(l63o{WGmsb*@ckx+!#rfJADPN(BIIuk}qNATQbH$kGE z`tgtBo%y|c&bjy8d*8k1-1o#k>ctlgPu&FOV?|4O-G!;7Uq6aX{C;=>CwZ@a6UTAu zc=TvI`qLz?GUJqHC0N>Bu}NCeXQ)I3YbH+<;aI7C5)$!KZ8E%!k(tY6L1zcuC)MuZ z{n(_RKeEB2?+A`;Se0TTQAdOk3kWvo7wkbL2Ft^i7`Kyk5s`t9hgIlqB+1q8x&w=i z1re1&2et}qGd_=f;Wk`LbS$WCZ?yXt*kHaXvIX={kXv*-dZMOa8@i*ta1Tz>b1%AM zyzmH4(sK{GO*6VO>S)7<&3p9gN$TNn%Itv>bjN!2nPl)8aVpw#)z9+He(?dn1TSRb zWWo%@;$-3sUbfmX{kqXvP0wC}qbZU-ut0V%^n!jL&2fqkSyJa%GV;BwJ0prZu{wro zwwdOjZlOAkh$j+=L?Vf}jz}gJ5-CI~kw&Bwp)px)3+juh&LXmj>xmp<39a*$up<1I zt=JawDJA;`BBZl=V^GI3qb-6NDnbS^(_*bArG}^_b`lN5eMB8mPfX*hx@B>5$78aW zT15OJ?KAi}PNsXoCA+N(|5MqHq_5o$+LFiGUCFvO5<1bEot20rJxx4A93muwx#Bjb z&B%l+j_viynu(7C_%M>>7I_rHuaM0F~ZM=ApU^wI#-wibCUKZ z@fL9k<5r~QF{k%P8z#;WBg9{bQR01Kj2I_azYnOUS6K3uRr?AqLk3P3cwrH`3%y3R zZWj7nyX%15wz44X&;bzG;tjy86vz{<1hh}2qI!D?maJKh!WzN9wmA-)yADdjnXpO{ zG9U^|PDbfk8vk7Ppj>hC2y_nfc;O#8a?bg&WWT3{*UL20)hlJMS9cE?HsgP8*fYC- zQmz)X{QM0JV^=9F^Hv>kW!2Q?ze&~qP>YtDjo`%eOBQ+E)Nw;sPepv^c^)rLw@HnW zpjQssVI5%Uf8(VWZvZojYee5eD~xq5?&hkZhAOurIAEhjYo?t;YyI`8zMP1~-Pr(W z%6k1m$GUpcD9kzR*E8+d(A`ZOL2QSJS0A=9G? zb~?cmnxnD(+QHq=-OE*S>`IWr034c>pP|sd8J|~jy3~Fiw>Q+vwHG_mN+7eFH+5*as*Kh_Zj8msfhjp-hLlGwZN!!$PIn0?&fnQ_u6bX~-^rJm3TTcpwqa zswbfaD~Hn1(H}>n&LY?>E3X9DM7veD3WYpyq{iK3cTC{kmNJPCg&E`O2QAs}GR8 zf`%!^i8s$F{aauS;PA-bv^uVM1dolsAeW482Oax1IPt^>ome^^E?11XG^PnM&6Z_q z5)D$wnx*G{300W>ex6jSfpF!m56Gr{7&%wR>kx!`2;mJL z@sfWpIHbC};NJnGL`I=I7C=#3K>$hU0=;C?z{(iMOMRD?oVhJ70UqX>-ceJOvQ}t> z<90X;y2iZR;(Y0ZneLJwIt%Ep;YS+zvf3~5EXrkJK;XYq{Qi&FUE942ESR_2BK@Wc z@_hpfmAvED*#@)wFb(uWYl?0 zVgyp=+N5}p;`vSr%5R+%w~*s(iC3FQHhsUOP-1G~Blx=TZcT?ArPc-=@GYWR%FO~n zN!$w4pu}&5lmEYO?`+DeMVP~D`z9Th{&{sYd^G?TN<46XoZ(LUTs-XnF1a&7+ AV*mgE diff --git a/MTC_Sim/MTC_Sim/AdapterGeneric.cs b/MTC_Sim/MTC_Sim/AdapterGeneric.cs index 0152fe0..58ca33a 100644 --- a/MTC_Sim/MTC_Sim/AdapterGeneric.cs +++ b/MTC_Sim/MTC_Sim/AdapterGeneric.cs @@ -146,11 +146,11 @@ namespace MTC_Sim /// /// D.D1.P1.PATH_MODE - modalità esecuzione /// - public Event mMode = new Event("mode"); + public Event mMode = new Event("PATH_MODE"); /// /// D.D1.P1.PATH_STATUS - status macchina /// - public Event mExec = new Event("exec"); + public Event mExec = new Event("PATH_STATUS"); /// /// M_CODE diff --git a/MTC_Sim/MTC_Sim/CMS_MachineSim.Designer.cs b/MTC_Sim/MTC_Sim/CMS_MachineSim.Designer.cs index 773931e..6002688 100644 --- a/MTC_Sim/MTC_Sim/CMS_MachineSim.Designer.cs +++ b/MTC_Sim/MTC_Sim/CMS_MachineSim.Designer.cs @@ -323,28 +323,19 @@ // functionalMode // this.functionalMode.FormattingEnabled = true; - this.functionalMode.Items.AddRange(new object[] { - "MACCHINA_DISPONIBILE", - "MANUTENZIONE", - "PRODUZIONE", - "PULIZIA", - "REGOLAZIONI", - "SETUP", - "TEARDOWN"}); - this.functionalMode.Location = new System.Drawing.Point(252, 71); + this.functionalMode.Location = new System.Drawing.Point(80, 71); this.functionalMode.Name = "functionalMode"; - this.functionalMode.Size = new System.Drawing.Size(121, 21); + this.functionalMode.Size = new System.Drawing.Size(293, 21); this.functionalMode.TabIndex = 47; - this.functionalMode.Text = "SETUP"; // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(164, 74); + this.label12.Location = new System.Drawing.Point(15, 74); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(86, 13); + this.label12.Size = new System.Drawing.Size(53, 13); this.label12.TabIndex = 46; - this.label12.Text = "Functional Mode"; + this.label12.Text = "Halt Type"; // // commonVariables // diff --git a/MTC_Sim/MTC_Sim/CMS_MachineSim.cs b/MTC_Sim/MTC_Sim/CMS_MachineSim.cs index 760ff9d..20fe2a9 100644 --- a/MTC_Sim/MTC_Sim/CMS_MachineSim.cs +++ b/MTC_Sim/MTC_Sim/CMS_MachineSim.cs @@ -20,6 +20,7 @@ namespace MTC_Sim using MTConnect; using System.Configuration; using System.Diagnostics; + using System.IO; public partial class CMS_MachineSim : Form { @@ -86,6 +87,29 @@ namespace MTC_Sim MainProgrBar.Value = 0; MainProgrBar.Step = 1; + // compilo combobox causali fermo... + string[] contenuto = File.ReadAllLines("HaltTypeList.txt"); + + System.Collections.Generic.Dictionary comboSource = new Dictionary(); + foreach (var line in contenuto) + { + // se la linea non è commento e non è vuota... + if (line.Length > 0 && line[0] != '#') + { + string[] tokens = line.Split(':'); + comboSource.Add(tokens[0], tokens[1]); + //riga.value = tokens[0]; + //riga.label = tokens[1]; + //functionalMode.Items.Add(new { Value = riga.label, Key = riga.value }); + + //functionalMode.Items.Add(new { label = tokens[1], value = tokens[0] }); + } + } + functionalMode.DataSource = new BindingSource(comboSource, null); + functionalMode.DisplayMember = "Value"; + functionalMode.ValueMember = "Key"; + + string[] row = { "1", "2", "3", "4" }; commonVariables.Rows.Add(row); } @@ -173,7 +197,7 @@ namespace MTC_Sim else if (stopped.Checked) answ.ExeMode = "STOPPED"; else if (ready.Checked) answ.ExeMode = "READY"; - answ.FuncMode = functionalMode.Text; + answ.FuncMode = ((KeyValuePair)functionalMode.SelectedItem).Key; answ.MessageCode = messageCode.Text; answ.MessageText = messageText.Text; @@ -472,5 +496,6 @@ namespace MTC_Sim #endregion + } } diff --git a/MTC_Sim/MTC_Sim/HaltTypeList.txt b/MTC_Sim/MTC_Sim/HaltTypeList.txt new file mode 100644 index 0000000..df383db --- /dev/null +++ b/MTC_Sim/MTC_Sim/HaltTypeList.txt @@ -0,0 +1,8 @@ +# Commenti con "#", elenco tipo codice:valore delle causali di HALT + +001:[COD 001] - PRODUZIONE +002:[COD 002] - SETUP +003:[COD 003] - MACCHINA_DISPONIBILE +004:[COD 004] - MANUTENZIONE +005:[COD 005] - PULIZIA +006:[COD 006] - REGOLAZIONI diff --git a/MTC_Sim/MTC_Sim/MTC_Sim.csproj b/MTC_Sim/MTC_Sim/MTC_Sim.csproj index b27b1a8..aeb77f3 100644 --- a/MTC_Sim/MTC_Sim/MTC_Sim.csproj +++ b/MTC_Sim/MTC_Sim/MTC_Sim.csproj @@ -92,6 +92,11 @@ DotNetAdapterSDK + + + Always + +