From 9f53661d5ae70ffcd2182c9c515af4cdc817f894 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 28 Apr 2016 11:39:57 +0200 Subject: [PATCH] riconfigurazioni x agent --- MTC_Sim/.vs/MTC_Sim/v14/.suo | Bin 131072 -> 131072 bytes MTC_Sim/MTC_Sim/AdapterGeneric.cs | 24 ++++--- MTC_Sim/MTC_Sim/App.config | 6 +- MTC_Sim/MTC_Sim/CMS_MachineSim.Designer.cs | 71 ++++++++++++--------- MTC_Sim/MTC_Sim/CMS_MachineSim.resx | 18 ------ 5 files changed, 58 insertions(+), 61 deletions(-) diff --git a/MTC_Sim/.vs/MTC_Sim/v14/.suo b/MTC_Sim/.vs/MTC_Sim/v14/.suo index a82688d98625b80294cef35ed9df6b5c5cd9703c..0e21400d80cd761932d7a59c2b6b7fb0cf9ab414 100644 GIT binary patch delta 2678 zcmcIm3v82B6#mcc-)`-?7u#U40bTcguyufQ;21?lB9HJGbB-}ZmnEWXgPAUZC@Wxm zF%s+*E+7*42SpTl^vC{0h}n3BEECuQF(8wn(I6rM4hRcS&*?e=P1I;O$=7r5Irp6J zoO^F?>vRS?ox!ULVnQWJ(jo5od_GhXAR_n7h+{^}(XP(i&Fx_0^~?viczw`{hA8yj z#g%#RR|<)Mk_ zrnHnw<_QT=4YvY;{R27J5Y*K!#Bc=p^r$Jb88tOUHewr! z<1j>DQ)Dme_4Cw(P;(lNhas{Nd`IxAfz%}}>XRg#mm^m2myE(QNM@>RsscVYe1V?$ z?(xo$M2~6i0~WP2{@M$_rNm6~Oz+71l?ueew4`u|ar!RHoR23l~i1u+QWMr=cT zjA-MVi!)(ApOG|_UoN)0;^mm1(0l?xeYFR42cIx=b|huJgqEKX(TF=3HkMzV8Li4G zSVlHeGMLBK4TcfuEH71iq72M6aJ+$%U<&II) zj6kfGfW=skgPRCRy*p9IgmN65sxxmBsFv6+@CK^#HsMNl0ldAn%?i!U^kE`AD`KKA>tC7F+b;&mu8ODRzC!M^jY^<`%zieEB~hvi zm7B6+XG)Jjsbb1pc?&S5TIS0>*voBeMrs#jhz0(N)6ExfE1$CDtT+b{uYOtgWWI7U zSXkp>sy5XC9#HPdoHc#H?T!eo)dYF)Pzs%Te8Wf`H#8pQSxYRQCKIf_16`UN0i{eU z?+2xFpVN+tgHg5C@gbc>}sAy+t)U=g>m zpl!~H0NyYtm$|*E6`9U?qv1;U|I6o21KB$TT0m==1tmIhIvp~Fb0(CEjmeOqH9rgM z^`f;DQbMVwJSkr)k{*|G#raAYp)Wgu52QHq3_M{9$ES~eQ-URNz6MUhSLt0~`LH(OUv`=B@(fejayi&H~7Xw%%0x-vOJ*dmVbbl~4}}hc(&+V z4vO$CfFRMZ986;6B1qGkmO(m1mg)M|TAE+OaWbuq6W5l4Q|zvRoJUKhA(_m?nN46e zy^4j{5JmSJvTLW_f{EZiI$4&AI%vx`uBiiqzc%gQYA9sh^>CT#mty1~?b-&=gQ%Ma z&Dy>a6OAPhtJxc&8Njv;zj^q&SHp1eMlBwLKb-!tSbM|wcz|olHh7NxDO4QP zFiY$wa52>V9T>o-VJ2UsyA{})4k!aJ-@I;x*u4wFcw22eo??z@*#R}$!4BA`7nM6; zk~n+{oZhQ2U+z~>TVGvWh^#0tj~`v}^je`wI^N1-nZyS^u{-KV%Gtl}7OK@L@ Gu-^gL0Fprf delta 3432 zcmbVOeNa@_6@TaPc3E)w1_ePxL_iQ-KKu;os*7LM2r7ukn1ay4L=gl`V=`fr(5e+j z-J9X6HCopOVr>#-EzdL=XKfPO5Ta;xI%6He2=O|k=svgxuVx!*+ zVP|-o^)SW)_ji>=Ouq&O=ANiQdUuerj7Kci;g85(13wA~1T5m9DWbX^+yr1i-{awE zcqBoVH7GZNh5+%vee9VAX$oirkO`y%Y&Q;cJP-_|0qidabg%22_A3fVDE`~F;Ye*c zr$(1VqrYexifwjl1`Pn%&5%Jl67&R+0kA6#)R&Y2Jlh=sWgAY4X(*^akO)KrZvZ2J z7$6Q{KO7#X2sYd^Y=H4R%yCy)ti!B{Zd3EF+Q^vV!EN@kR9eKGWm)o zYJ(~Q29z+nE{A+U;=R~eLNm9Rx%6!S7hLQ!N1NH`Ei9M{w>d}jB}I>TAA%2n(}Nql z`62i&;3IL<93gUpQngE1iK?Jl(>GxF@`x)zajJpDgRs*k?iyEIgicI#^@W?su`*F4 zS>jwXLOaR08ao#?SAT|4?HFoPUA8IjQb(Ysy0o}^1 zIN4qHNxvqMkabAB7n&*hvX%r8-ygnS~psxw-3l+4%o*&6Ut z0xzNPQj)J)6k$ynFB(?0bj0P-lziwE084>oz;d7vC<0ahe1W-AK9mlwMZ<^|XO8Mz zq&X7%=uhHSqQ`h1d)(~N<>uXB_xMz+k`iJLVeuOv0pP35ZGRm&EDk26(>c_Cq_~!3 zjp>H$W8f^n?dNlOd?oV6tcv;vq*sA20bfM@u+26_LUIofH|90dN>^iQ6B+ng6}j%D z-zDQjuq8#Je`-IKh+ET|4DUeTZJfi_Ku2ATwr%7nny>L6E0@gGP-G@ioRTVjoDwHa zrsod!$ha5^S5?=h)gS)gRvEmla@|?sul>)XoaLIcYKF61b@m&b6{@pJb9HRaB6-_H zXT*l*+eGb-M6qboCDHqKoa^K|wEL(k&evI8)>`*e=K~GPHY2Gbt3Fc1Z+_R+bHYNx za;RJH4x}7E@zT!Y!s5tr{rzM#3H87qgtazQ?+T`!{-S5?QPJ~i8k~1`X3_N!k*b;v zYm^41UV6sT^r6ZurGo$c7(Dp3qr{78ZSkR`#4pC>nWH?#N=liur_r)yc||+dLY@n~8t~(k z1f?F7?P`>tDl@PygSF4T()(ssec^y|M7PTeW}f!{OW4k3O1OK;A@v~d^M-ebI(r0P z(42=7h?#%X4VKS%W2^+_vj>~fnnt;i2r1+7j>?@jvUvL^r{>W-Zk}$ROSAlBW;)Gm zT}bYBtBt7L{Uc2FJR-TY+gA3nXR3Hg+!Luao+mMy2` zftyj#NF$`Xk4Bn`&+^L~-9AuA!$u){@?~FbJx{i27W|%@IN4^&%Fdjektb)ZpwW8o zW(p>mSxIMy7-9y#L`+I|>sESI{%$j}|D=vyleG;rL2fUi<+{6o_L8i7(RaGLf|BLc z?KD(|)zizY^H;j$wMIxYB>kK&vWpASvxR#2S|X;#!)*(%ls;`e554_zeIo_Q&?-vR z_taCe8n()t15a`8D$Jd-r;(;~ULq^WB`;Epyk)2M&VF)}JXJwsCgZ1`ls!kvno#2e~u+awUsk|;*knG z7MnLQp7wL8r#_M*eOoKtSVxEH`)4|EHqUA9BqlmC)zq*UU)xZDT=2J~CT>bdO#(YFte=_38CwS`inYZ}+CodHi68|O?bEv&EHP+wYKwoY1GaK$F* zbb>r#kA;%@U7;WvZ%A@i2knsi-l7UVOWrJ`XdQmtH0U^}t&7yoUMe=~ksni{QHI9Q zaQ&4Fw3Zx!kp?54B!7_^ILu`U?7^Q>3)x9t>!J`D(nWP`Z&G0E=TtmkDvDCl@ZXs5 SJuyP33sj@&>-%WekpBR3J{7_M diff --git a/MTC_Sim/MTC_Sim/AdapterGeneric.cs b/MTC_Sim/MTC_Sim/AdapterGeneric.cs index b31d25f..a5efc1c 100644 --- a/MTC_Sim/MTC_Sim/AdapterGeneric.cs +++ b/MTC_Sim/MTC_Sim/AdapterGeneric.cs @@ -444,11 +444,11 @@ namespace MTC_Sim /// /// D.D1.AVAIL - disponibilità /// - public Event mAvail = new Event("avail"); + public Event mAvail = new Event("AVAIL"); /// /// XX.XX.STOP - stop per pressione emergenze /// - public Event mEStop = new Event("PROTECTION_STATUS"); + public Event mEStop = new Event("E_STOP"); /// /// STATUS macchina (ON/OFF) /// @@ -456,20 +456,21 @@ namespace MTC_Sim /// /// Minuti funzionamento globale macchina /// - public Event mAccTime = new Event("ACC_TIME"); + public Sample mAccTime = new Sample("ACC_TIME"); /// /// Orologio /// - public Event mClock = new Event("CLOCK_TIME"); + public Sample mClock = new Sample("CLOCK"); /// /// Consumo elettrico globale /// - public Event mPower = new Event("POWER"); + public Sample mPower = new Sample("POWER"); +#if false /// /// D.D1.NAME /// - public Event mName = new Event("Name"); + public Event mName = new Event("Name"); /// /// D.D1.ID /// @@ -477,11 +478,12 @@ namespace MTC_Sim /// /// D.D1.UUID /// - public Event mUUID = new Event("UUID"); + public Event mUUID = new Event("UUID"); /// /// D.D1.SAMPLE_INTERVAL /// public Event mSampleInt = new Event("SampleInt"); +#endif /// @@ -616,10 +618,12 @@ namespace MTC_Sim mAdapter.AddDataItem(mPower); mAdapter.AddDataItem(mEStop); +#if false // nome ed ID/UUID - e li imposto... mAdapter.AddDataItem(mName); mAdapter.AddDataItem(mID); - mAdapter.AddDataItem(mUUID); + mAdapter.AddDataItem(mUUID); +#endif // programma e produzione mAdapter.AddDataItem(mProgram); @@ -881,9 +885,11 @@ namespace MTC_Sim /// public void getConfigParam() { +#if false mName.Value = utils.CRS("D1_NAME"); mID.Value = utils.CRS("D1_ID"); - mUUID.Value = utils.CRS("D1_UUID"); + mUUID.Value = utils.CRS("D1_UUID"); +#endif } /// /// dati relativi al programma diff --git a/MTC_Sim/MTC_Sim/App.config b/MTC_Sim/MTC_Sim/App.config index c953b7a..0807903 100644 --- a/MTC_Sim/MTC_Sim/App.config +++ b/MTC_Sim/MTC_Sim/App.config @@ -5,9 +5,9 @@ - - - + + + diff --git a/MTC_Sim/MTC_Sim/CMS_MachineSim.Designer.cs b/MTC_Sim/MTC_Sim/CMS_MachineSim.Designer.cs index c014587..95bc406 100644 --- a/MTC_Sim/MTC_Sim/CMS_MachineSim.Designer.cs +++ b/MTC_Sim/MTC_Sim/CMS_MachineSim.Designer.cs @@ -153,11 +153,8 @@ this.label30 = new System.Windows.Forms.Label(); this.txtPower = new System.Windows.Forms.TextBox(); this.label16 = new System.Windows.Forms.Label(); - this.D1_UUID = new System.Windows.Forms.TextBox(); this.label15 = new System.Windows.Forms.Label(); - this.D1_ID = new System.Windows.Forms.TextBox(); this.label14 = new System.Windows.Forms.Label(); - this.D1_NAME = new System.Windows.Forms.TextBox(); this.groupBox10 = new System.Windows.Forms.GroupBox(); this.enableDataSim = new System.Windows.Forms.CheckBox(); this.groupBox8 = new System.Windows.Forms.GroupBox(); @@ -195,6 +192,9 @@ this.CncErr_03 = new System.Windows.Forms.CheckBox(); this.CncErr_01 = new System.Windows.Forms.CheckBox(); this.ErrRT_02 = new System.Windows.Forms.CheckBox(); + this.D1_NAME = new System.Windows.Forms.Label(); + this.D1_ID = new System.Windows.Forms.Label(); + this.D1_UUID = new System.Windows.Forms.Label(); this.groupBox4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.PosAct)).BeginInit(); this.groupBox3.SuspendLayout(); @@ -1148,7 +1148,7 @@ this.tpStatus.Location = new System.Drawing.Point(4, 22); this.tpStatus.Name = "tpStatus"; this.tpStatus.Padding = new System.Windows.Forms.Padding(3); - this.tpStatus.Size = new System.Drawing.Size(786, 649); + this.tpStatus.Size = new System.Drawing.Size(772, 649); this.tpStatus.TabIndex = 0; this.tpStatus.Text = "STATUS"; // @@ -1367,16 +1367,16 @@ // // groupBox7 // + this.groupBox7.Controls.Add(this.D1_UUID); + this.groupBox7.Controls.Add(this.D1_ID); + this.groupBox7.Controls.Add(this.D1_NAME); this.groupBox7.Controls.Add(this.lblAT); this.groupBox7.Controls.Add(this.txtAccTime); this.groupBox7.Controls.Add(this.label30); this.groupBox7.Controls.Add(this.txtPower); this.groupBox7.Controls.Add(this.label16); - this.groupBox7.Controls.Add(this.D1_UUID); this.groupBox7.Controls.Add(this.label15); - this.groupBox7.Controls.Add(this.D1_ID); this.groupBox7.Controls.Add(this.label14); - this.groupBox7.Controls.Add(this.D1_NAME); this.groupBox7.Location = new System.Drawing.Point(385, 3); this.groupBox7.Name = "groupBox7"; this.groupBox7.Size = new System.Drawing.Size(380, 75); @@ -1425,13 +1425,6 @@ this.label16.TabIndex = 59; this.label16.Text = "UUID"; // - // D1_UUID - // - this.D1_UUID.Location = new System.Drawing.Point(234, 50); - this.D1_UUID.Name = "D1_UUID"; - this.D1_UUID.Size = new System.Drawing.Size(140, 20); - this.D1_UUID.TabIndex = 58; - // // label15 // this.label15.AutoSize = true; @@ -1441,13 +1434,6 @@ this.label15.TabIndex = 57; this.label15.Text = "ID"; // - // D1_ID - // - this.D1_ID.Location = new System.Drawing.Point(51, 50); - this.D1_ID.Name = "D1_ID"; - this.D1_ID.Size = new System.Drawing.Size(124, 20); - this.D1_ID.TabIndex = 56; - // // label14 // this.label14.AutoSize = true; @@ -1457,13 +1443,6 @@ this.label14.TabIndex = 54; this.label14.Text = "Nome"; // - // D1_NAME - // - this.D1_NAME.Location = new System.Drawing.Point(51, 17); - this.D1_NAME.Name = "D1_NAME"; - this.D1_NAME.Size = new System.Drawing.Size(124, 20); - this.D1_NAME.TabIndex = 53; - // // groupBox10 // this.groupBox10.Controls.Add(this.enableDataSim); @@ -1820,6 +1799,36 @@ this.ErrRT_02.Text = "ERR_fill"; this.ErrRT_02.UseVisualStyleBackColor = true; // + // D1_NAME + // + this.D1_NAME.AutoSize = true; + this.D1_NAME.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.D1_NAME.Location = new System.Drawing.Point(54, 20); + this.D1_NAME.Name = "D1_NAME"; + this.D1_NAME.Size = new System.Drawing.Size(19, 13); + this.D1_NAME.TabIndex = 64; + this.D1_NAME.Text = "..."; + // + // D1_ID + // + this.D1_ID.AutoSize = true; + this.D1_ID.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.D1_ID.Location = new System.Drawing.Point(54, 53); + this.D1_ID.Name = "D1_ID"; + this.D1_ID.Size = new System.Drawing.Size(19, 13); + this.D1_ID.TabIndex = 65; + this.D1_ID.Text = "..."; + // + // D1_UUID + // + this.D1_UUID.AutoSize = true; + this.D1_UUID.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.D1_UUID.Location = new System.Drawing.Point(233, 54); + this.D1_UUID.Name = "D1_UUID"; + this.D1_UUID.Size = new System.Drawing.Size(19, 13); + this.D1_UUID.TabIndex = 66; + this.D1_UUID.Text = "..."; + // // CMS_MachineSim // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1981,11 +1990,8 @@ private System.Windows.Forms.Label label30; private System.Windows.Forms.TextBox txtPower; private System.Windows.Forms.Label label16; - private System.Windows.Forms.TextBox D1_UUID; private System.Windows.Forms.Label label15; - private System.Windows.Forms.TextBox D1_ID; private System.Windows.Forms.Label label14; - private System.Windows.Forms.TextBox D1_NAME; private System.Windows.Forms.GroupBox groupBox10; private System.Windows.Forms.CheckBox enableDataSim; private System.Windows.Forms.GroupBox groupBox8; @@ -2043,6 +2049,9 @@ private System.Windows.Forms.CheckBox CncErr_02; private System.Windows.Forms.CheckBox CncErr_03; private System.Windows.Forms.CheckBox CncErr_01; + private System.Windows.Forms.Label D1_NAME; + private System.Windows.Forms.Label D1_UUID; + private System.Windows.Forms.Label D1_ID; } } diff --git a/MTC_Sim/MTC_Sim/CMS_MachineSim.resx b/MTC_Sim/MTC_Sim/CMS_MachineSim.resx index 707fc60..d24e7d7 100644 --- a/MTC_Sim/MTC_Sim/CMS_MachineSim.resx +++ b/MTC_Sim/MTC_Sim/CMS_MachineSim.resx @@ -138,24 +138,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - 104, 17