diff --git a/IOB-WIN/AdapterForm.Designer.cs b/IOB-WIN/AdapterForm.Designer.cs index 4dd73157..03e4ec74 100644 --- a/IOB-WIN/AdapterForm.Designer.cs +++ b/IOB-WIN/AdapterForm.Designer.cs @@ -55,7 +55,12 @@ this.label3 = new System.Windows.Forms.Label(); this.lblOutMessage3 = new System.Windows.Forms.Label(); this.lblOutMessage2 = new System.Windows.Forms.Label(); - this.tabStats = new System.Windows.Forms.TabPage(); + this.tabLog = new System.Windows.Forms.TabPage(); + this.btnOpenLog = new System.Windows.Forms.Button(); + this.label6 = new System.Windows.Forms.Label(); + this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.lblLogfile = new System.Windows.Forms.Label(); + this.tabPlc = new System.Windows.Forms.TabPage(); this.panel4 = new System.Windows.Forms.Panel(); this.lblBitmap_03 = new System.Windows.Forms.Label(); this.lblBitmap_02 = new System.Windows.Forms.Label(); @@ -67,18 +72,12 @@ this.label17 = new System.Windows.Forms.Label(); this.label16 = new System.Windows.Forms.Label(); this.panel3 = new System.Windows.Forms.Panel(); - this.btnSendPLC = new System.Windows.Forms.Button(); - this.chkEdit = new System.Windows.Forms.CheckBox(); - this.txtOrdCode = new System.Windows.Forms.TextBox(); - this.label15 = new System.Windows.Forms.Label(); - this.txtPrgName = new System.Windows.Forms.TextBox(); - this.label14 = new System.Windows.Forms.Label(); - this.txtItemCode = new System.Windows.Forms.TextBox(); - this.label13 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.panel2 = new System.Windows.Forms.Panel(); this.lblTaskLog = new System.Windows.Forms.Label(); + this.btnSendPLC = new System.Windows.Forms.Button(); this.label5 = new System.Windows.Forms.Label(); + this.chkEdit = new System.Windows.Forms.CheckBox(); + this.label12 = new System.Windows.Forms.Label(); + this.tabMes = new System.Windows.Forms.TabPage(); this.panel1 = new System.Windows.Forms.Panel(); this.label21 = new System.Windows.Forms.Label(); this.lblQueueFLogLen = new System.Windows.Forms.Label(); @@ -91,23 +90,29 @@ this.label10 = new System.Windows.Forms.Label(); this.lblDataProc = new System.Windows.Forms.Label(); this.lblQueueLen = new System.Windows.Forms.Label(); - this.tabLog = new System.Windows.Forms.TabPage(); - this.btnOpenLog = new System.Windows.Forms.Button(); - this.label6 = new System.Windows.Forms.Label(); - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.lblLogfile = new System.Windows.Forms.Label(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.cmbParamValues = new System.Windows.Forms.ComboBox(); + this.label22 = new System.Windows.Forms.Label(); + this.txtValue = new System.Windows.Forms.TextBox(); + this.label23 = new System.Windows.Forms.Label(); + this.panel2 = new System.Windows.Forms.Panel(); this.statusStrip1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.tabData.SuspendLayout(); this.tabRealtime.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); - this.tabStats.SuspendLayout(); - this.panel4.SuspendLayout(); - this.panel3.SuspendLayout(); - this.panel2.SuspendLayout(); - this.panel1.SuspendLayout(); this.tabLog.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); + this.tabPlc.SuspendLayout(); + this.panel4.SuspendLayout(); + this.panel3.SuspendLayout(); + this.tabMes.SuspendLayout(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.panel2.SuspendLayout(); this.SuspendLayout(); // // gather @@ -299,8 +304,9 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.tabData.Controls.Add(this.tabRealtime); - this.tabData.Controls.Add(this.tabStats); this.tabData.Controls.Add(this.tabLog); + this.tabData.Controls.Add(this.tabPlc); + this.tabData.Controls.Add(this.tabMes); this.tabData.Location = new System.Drawing.Point(2, 36); this.tabData.Name = "tabData"; this.tabData.SelectedIndex = 0; @@ -447,19 +453,74 @@ this.lblOutMessage2.TabIndex = 62; this.lblOutMessage2.Text = "..."; // - // tabStats + // tabLog // - this.tabStats.BackColor = System.Drawing.Color.Transparent; - this.tabStats.Controls.Add(this.panel4); - this.tabStats.Controls.Add(this.panel3); - this.tabStats.Controls.Add(this.panel2); - this.tabStats.Controls.Add(this.panel1); - this.tabStats.Location = new System.Drawing.Point(4, 22); - this.tabStats.Name = "tabStats"; - this.tabStats.Padding = new System.Windows.Forms.Padding(3); - this.tabStats.Size = new System.Drawing.Size(952, 553); - this.tabStats.TabIndex = 1; - this.tabStats.Text = "Statistiche"; + this.tabLog.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.tabLog.Controls.Add(this.btnOpenLog); + this.tabLog.Controls.Add(this.label6); + this.tabLog.Controls.Add(this.flowLayoutPanel1); + this.tabLog.ForeColor = System.Drawing.SystemColors.MenuHighlight; + this.tabLog.Location = new System.Drawing.Point(4, 22); + this.tabLog.Name = "tabLog"; + this.tabLog.Size = new System.Drawing.Size(952, 553); + this.tabLog.TabIndex = 3; + this.tabLog.Text = "logfile"; + // + // btnOpenLog + // + this.btnOpenLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnOpenLog.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; + this.btnOpenLog.Location = new System.Drawing.Point(791, 1); + this.btnOpenLog.Margin = new System.Windows.Forms.Padding(2); + this.btnOpenLog.Name = "btnOpenLog"; + this.btnOpenLog.Size = new System.Drawing.Size(158, 22); + this.btnOpenLog.TabIndex = 5; + this.btnOpenLog.Text = "Open Machine FULL LOG"; + this.btnOpenLog.UseVisualStyleBackColor = true; + this.btnOpenLog.Click += new System.EventHandler(this.BtnOpenLog_Click); + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label6.Location = new System.Drawing.Point(12, 6); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(215, 13); + this.label6.TabIndex = 4; + this.label6.Text = "Log message watcher (last message)"; + // + // flowLayoutPanel1 + // + this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.flowLayoutPanel1.Controls.Add(this.lblLogfile); + this.flowLayoutPanel1.Location = new System.Drawing.Point(6, 22); + this.flowLayoutPanel1.Name = "flowLayoutPanel1"; + this.flowLayoutPanel1.Size = new System.Drawing.Size(943, 528); + this.flowLayoutPanel1.TabIndex = 3; + // + // lblLogfile + // + this.lblLogfile.AutoSize = true; + this.lblLogfile.Font = new System.Drawing.Font("Arial Narrow", 7.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblLogfile.ForeColor = System.Drawing.Color.Yellow; + this.lblLogfile.Location = new System.Drawing.Point(3, 0); + this.lblLogfile.Name = "lblLogfile"; + this.lblLogfile.Size = new System.Drawing.Size(307, 336); + this.lblLogfile.TabIndex = 2; + this.lblLogfile.Text = resources.GetString("lblLogfile.Text"); + // + // tabPlc + // + this.tabPlc.BackColor = System.Drawing.Color.LightGray; + this.tabPlc.Controls.Add(this.splitContainer1); + this.tabPlc.Location = new System.Drawing.Point(4, 22); + this.tabPlc.Name = "tabPlc"; + this.tabPlc.Padding = new System.Windows.Forms.Padding(3); + this.tabPlc.Size = new System.Drawing.Size(952, 553); + this.tabPlc.TabIndex = 4; + this.tabPlc.Text = "PLC <--> IOB"; // // panel4 // @@ -473,11 +534,12 @@ this.panel4.Controls.Add(this.label18); this.panel4.Controls.Add(this.label17); this.panel4.Controls.Add(this.label16); - this.panel4.Location = new System.Drawing.Point(4, 171); + this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel4.Location = new System.Drawing.Point(0, 0); this.panel4.Margin = new System.Windows.Forms.Padding(2); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(343, 147); - this.panel4.TabIndex = 91; + this.panel4.Size = new System.Drawing.Size(467, 547); + this.panel4.TabIndex = 92; // // lblBitmap_03 // @@ -572,97 +634,64 @@ // panel3 // this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; + this.panel3.Controls.Add(this.panel2); + this.panel3.Controls.Add(this.txtValue); + this.panel3.Controls.Add(this.label23); + this.panel3.Controls.Add(this.label22); + this.panel3.Controls.Add(this.cmbParamValues); this.panel3.Controls.Add(this.btnSendPLC); + this.panel3.Controls.Add(this.label5); this.panel3.Controls.Add(this.chkEdit); - this.panel3.Controls.Add(this.txtOrdCode); - this.panel3.Controls.Add(this.label15); - this.panel3.Controls.Add(this.txtPrgName); - this.panel3.Controls.Add(this.label14); - this.panel3.Controls.Add(this.txtItemCode); - this.panel3.Controls.Add(this.label13); this.panel3.Controls.Add(this.label12); - this.panel3.Location = new System.Drawing.Point(4, 323); + this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel3.Location = new System.Drawing.Point(0, 0); this.panel3.Margin = new System.Windows.Forms.Padding(2); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(343, 162); - this.panel3.TabIndex = 90; + this.panel3.Size = new System.Drawing.Size(469, 547); + this.panel3.TabIndex = 91; + // + // lblTaskLog + // + this.lblTaskLog.AutoSize = true; + this.lblTaskLog.Location = new System.Drawing.Point(3, 0); + this.lblTaskLog.Name = "lblTaskLog"; + this.lblTaskLog.Size = new System.Drawing.Size(16, 13); + this.lblTaskLog.TabIndex = 81; + this.lblTaskLog.Text = "..."; // // btnSendPLC // - this.btnSendPLC.Location = new System.Drawing.Point(223, 21); + this.btnSendPLC.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnSendPLC.Location = new System.Drawing.Point(19, 132); this.btnSendPLC.Margin = new System.Windows.Forms.Padding(2); this.btnSendPLC.Name = "btnSendPLC"; - this.btnSendPLC.Size = new System.Drawing.Size(101, 19); + this.btnSendPLC.Size = new System.Drawing.Size(312, 30); this.btnSendPLC.TabIndex = 6; this.btnSendPLC.Text = "SEND --> PLC"; this.btnSendPLC.UseVisualStyleBackColor = true; this.btnSendPLC.Click += new System.EventHandler(this.BtnSendPLC_Click); // + // label5 + // + this.label5.AutoSize = true; + this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label5.Location = new System.Drawing.Point(14, 184); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(115, 25); + this.label5.TabIndex = 1; + this.label5.Text = "TASK LIST"; + // // chkEdit // this.chkEdit.AutoSize = true; - this.chkEdit.Location = new System.Drawing.Point(155, 24); + this.chkEdit.Location = new System.Drawing.Point(252, 22); this.chkEdit.Margin = new System.Windows.Forms.Padding(2); this.chkEdit.Name = "chkEdit"; - this.chkEdit.Size = new System.Drawing.Size(43, 17); + this.chkEdit.Size = new System.Drawing.Size(79, 17); this.chkEdit.TabIndex = 8; - this.chkEdit.Text = "edit"; + this.chkEdit.Text = "SET DATA"; this.chkEdit.UseVisualStyleBackColor = true; - this.chkEdit.CheckedChanged += new System.EventHandler(this.ChkEdit_CheckedChanged); - // - // txtOrdCode - // - this.txtOrdCode.Location = new System.Drawing.Point(88, 94); - this.txtOrdCode.Margin = new System.Windows.Forms.Padding(2); - this.txtOrdCode.Name = "txtOrdCode"; - this.txtOrdCode.Size = new System.Drawing.Size(236, 20); - this.txtOrdCode.TabIndex = 4; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(18, 94); - this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(52, 13); - this.label15.TabIndex = 6; - this.label15.Text = "Ord Code"; - // - // txtPrgName - // - this.txtPrgName.Location = new System.Drawing.Point(88, 127); - this.txtPrgName.Margin = new System.Windows.Forms.Padding(2); - this.txtPrgName.Name = "txtPrgName"; - this.txtPrgName.Size = new System.Drawing.Size(236, 20); - this.txtPrgName.TabIndex = 5; - // - // label14 - // - this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(18, 127); - this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(54, 13); - this.label14.TabIndex = 4; - this.label14.Text = "Prg Name"; - // - // txtItemCode - // - this.txtItemCode.Location = new System.Drawing.Point(88, 58); - this.txtItemCode.Margin = new System.Windows.Forms.Padding(2); - this.txtItemCode.Name = "txtItemCode"; - this.txtItemCode.Size = new System.Drawing.Size(236, 20); - this.txtItemCode.TabIndex = 3; - // - // label13 - // - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(18, 58); - this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(55, 13); - this.label13.TabIndex = 2; - this.label13.Text = "Item Code"; + this.chkEdit.Click += new System.EventHandler(this.ChkEdit_CheckedChanged); // // label12 // @@ -674,38 +703,16 @@ this.label12.TabIndex = 1; this.label12.Text = "MES --> PLC"; // - // panel2 + // tabMes // - this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.panel2.Controls.Add(this.lblTaskLog); - this.panel2.Controls.Add(this.label5); - this.panel2.Location = new System.Drawing.Point(362, 6); - this.panel2.Margin = new System.Windows.Forms.Padding(2); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(578, 479); - this.panel2.TabIndex = 89; - // - // lblTaskLog - // - this.lblTaskLog.AutoSize = true; - this.lblTaskLog.Location = new System.Drawing.Point(15, 50); - this.lblTaskLog.Name = "lblTaskLog"; - this.lblTaskLog.Size = new System.Drawing.Size(16, 13); - this.lblTaskLog.TabIndex = 81; - this.lblTaskLog.Text = "..."; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label5.Location = new System.Drawing.Point(14, 12); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(115, 25); - this.label5.TabIndex = 1; - this.label5.Text = "TASK LIST"; + this.tabMes.BackColor = System.Drawing.Color.Transparent; + this.tabMes.Controls.Add(this.panel1); + this.tabMes.Location = new System.Drawing.Point(4, 22); + this.tabMes.Name = "tabMes"; + this.tabMes.Padding = new System.Windows.Forms.Padding(3); + this.tabMes.Size = new System.Drawing.Size(952, 553); + this.tabMes.TabIndex = 1; + this.tabMes.Text = "IOB <--> MES"; // // panel1 // @@ -832,59 +839,72 @@ this.lblQueueLen.TabIndex = 83; this.lblQueueLen.Text = "###"; // - // tabLog + // splitContainer1 // - this.tabLog.Controls.Add(this.btnOpenLog); - this.tabLog.Controls.Add(this.label6); - this.tabLog.Controls.Add(this.flowLayoutPanel1); - this.tabLog.Location = new System.Drawing.Point(4, 22); - this.tabLog.Name = "tabLog"; - this.tabLog.Size = new System.Drawing.Size(952, 553); - this.tabLog.TabIndex = 3; - this.tabLog.Text = "logfile"; - this.tabLog.UseVisualStyleBackColor = true; - // - // btnOpenLog - // - this.btnOpenLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnOpenLog.Location = new System.Drawing.Point(791, 6); - this.btnOpenLog.Margin = new System.Windows.Forms.Padding(2); - this.btnOpenLog.Name = "btnOpenLog"; - this.btnOpenLog.Size = new System.Drawing.Size(158, 22); - this.btnOpenLog.TabIndex = 5; - this.btnOpenLog.Text = "Open Machine FULL LOG"; - this.btnOpenLog.UseVisualStyleBackColor = true; - this.btnOpenLog.Click += new System.EventHandler(this.BtnOpenLog_Click); - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label6.Location = new System.Drawing.Point(12, 6); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(215, 13); - this.label6.TabIndex = 4; - this.label6.Text = "Log message watcher (last message)"; - // - // flowLayoutPanel1 - // - this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.flowLayoutPanel1.Controls.Add(this.lblLogfile); - this.flowLayoutPanel1.Location = new System.Drawing.Point(6, 30); - this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(943, 520); - this.flowLayoutPanel1.TabIndex = 3; + this.splitContainer1.Location = new System.Drawing.Point(7, 3); + this.splitContainer1.Name = "splitContainer1"; // - // lblLogfile + // splitContainer1.Panel1 // - this.lblLogfile.AutoSize = true; - this.lblLogfile.Location = new System.Drawing.Point(3, 0); - this.lblLogfile.Name = "lblLogfile"; - this.lblLogfile.Size = new System.Drawing.Size(157, 13); - this.lblLogfile.TabIndex = 2; - this.lblLogfile.Text = "--------------------------------------------------"; + this.splitContainer1.Panel1.Controls.Add(this.panel3); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.panel4); + this.splitContainer1.Size = new System.Drawing.Size(940, 547); + this.splitContainer1.SplitterDistance = 469; + this.splitContainer1.TabIndex = 94; + // + // cmbParamValues + // + this.cmbParamValues.FormattingEnabled = true; + this.cmbParamValues.Location = new System.Drawing.Point(95, 54); + this.cmbParamValues.Name = "cmbParamValues"; + this.cmbParamValues.Size = new System.Drawing.Size(236, 21); + this.cmbParamValues.TabIndex = 82; + // + // label22 + // + this.label22.AutoSize = true; + this.label22.Location = new System.Drawing.Point(26, 57); + this.label22.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label22.Name = "label22"; + this.label22.Size = new System.Drawing.Size(55, 13); + this.label22.TabIndex = 83; + this.label22.Text = "Parameter"; + // + // txtValue + // + this.txtValue.Location = new System.Drawing.Point(95, 91); + this.txtValue.Margin = new System.Windows.Forms.Padding(2); + this.txtValue.Name = "txtValue"; + this.txtValue.Size = new System.Drawing.Size(236, 20); + this.txtValue.TabIndex = 85; + // + // label23 + // + this.label23.AutoSize = true; + this.label23.Location = new System.Drawing.Point(25, 91); + this.label23.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label23.Name = "label23"; + this.label23.Size = new System.Drawing.Size(34, 13); + this.label23.TabIndex = 84; + this.label23.Text = "Value"; + // + // panel2 + // + this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.panel2.AutoScroll = true; + this.panel2.Controls.Add(this.lblTaskLog); + this.panel2.Location = new System.Drawing.Point(3, 212); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(459, 328); + this.panel2.TabIndex = 86; // // AdapterForm // @@ -909,19 +929,24 @@ this.tabRealtime.ResumeLayout(false); this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel2.PerformLayout(); - this.tabStats.ResumeLayout(false); - this.panel4.ResumeLayout(false); - this.panel4.PerformLayout(); - this.panel3.ResumeLayout(false); - this.panel3.PerformLayout(); - this.panel2.ResumeLayout(false); - this.panel2.PerformLayout(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); this.tabLog.ResumeLayout(false); this.tabLog.PerformLayout(); this.flowLayoutPanel1.ResumeLayout(false); this.flowLayoutPanel1.PerformLayout(); + this.tabPlc.ResumeLayout(false); + this.panel4.ResumeLayout(false); + this.panel4.PerformLayout(); + this.panel3.ResumeLayout(false); + this.panel3.PerformLayout(); + this.tabMes.ResumeLayout(false); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -943,7 +968,7 @@ private System.Windows.Forms.CheckBox chkForceDequeue; private System.Windows.Forms.TabControl tabData; private System.Windows.Forms.TabPage tabRealtime; - private System.Windows.Forms.TabPage tabStats; + private System.Windows.Forms.TabPage tabMes; private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2; private System.Windows.Forms.Label lblOutMessage; private System.Windows.Forms.Label label2; @@ -968,11 +993,17 @@ private System.Windows.Forms.Label lblLogfile; private System.Windows.Forms.Label label6; private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Button btnOpenLog; + private System.Windows.Forms.Label lblQueueLenTop; + private System.Windows.Forms.Label label21; + private System.Windows.Forms.Label lblQueueFLogLen; + private System.Windows.Forms.TabPage tabPlc; + private System.Windows.Forms.Label lblTaskLog; private System.Windows.Forms.Label label5; private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Button btnSendPLC; + private System.Windows.Forms.CheckBox chkEdit; private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label lblTaskLog; private System.Windows.Forms.Panel panel4; private System.Windows.Forms.Label lblBitmap_03; private System.Windows.Forms.Label lblBitmap_02; @@ -983,17 +1014,11 @@ private System.Windows.Forms.Label label18; private System.Windows.Forms.Label label17; private System.Windows.Forms.Label label16; - private System.Windows.Forms.Button btnSendPLC; - private System.Windows.Forms.CheckBox chkEdit; - private System.Windows.Forms.TextBox txtOrdCode; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.TextBox txtPrgName; - private System.Windows.Forms.Label label14; - private System.Windows.Forms.TextBox txtItemCode; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.Button btnOpenLog; - private System.Windows.Forms.Label lblQueueLenTop; - private System.Windows.Forms.Label label21; - private System.Windows.Forms.Label lblQueueFLogLen; + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.TextBox txtValue; + private System.Windows.Forms.Label label23; + private System.Windows.Forms.Label label22; + private System.Windows.Forms.ComboBox cmbParamValues; + private System.Windows.Forms.Panel panel2; } } \ No newline at end of file diff --git a/IOB-WIN/AdapterForm.cs b/IOB-WIN/AdapterForm.cs index bb046f56..be307b08 100644 --- a/IOB-WIN/AdapterForm.cs +++ b/IOB-WIN/AdapterForm.cs @@ -290,57 +290,6 @@ namespace IOB_WIN } displayTaskAndLog("Main Form OK"); } - - private void checkEditMes2Plc() - { - txtItemCode.Enabled = enableEditMes2Plc; - txtOrdCode.Enabled = enableEditMes2Plc; - txtPrgName.Enabled = enableEditMes2Plc; - btnSendPLC.Enabled = enableEditMes2Plc; - } - /// - /// Item in produzione - /// - public string currItemCode - { - get - { - return txtItemCode.Text.Trim(); - } - set - { - txtItemCode.Text = value; - } - } - /// - /// Ordine in produzione - /// - public string currOrdCode - { - get - { - return txtOrdCode.Text.Trim(); - } - set - { - txtOrdCode.Text = value; - } - } - /// - /// Programma in esecuzione - /// - public string currPrgName - { - get - { - return txtPrgName.Text.Trim(); - } - set - { - txtPrgName.Text = value; - } - } - /// /// Fase chiusura Form /// @@ -1160,9 +1109,40 @@ namespace IOB_WIN private void TabData_Selected(object sender, TabControlEventArgs e) { - //showLog(false); } + private void fixComboParameters() + { + if (iobObj != null) + { + if (iobObj.memMap != null) + { + if (iobObj.memMap.mMapWrite != null) + { + if (iobObj.memMap.mMapWrite.Count > 0) + { + List parametri = new List(); + foreach (var item in iobObj.memMap.mMapWrite) + { + parametri.Add(item.Key); + } + cmbParamValues.DataSource = parametri; + } + } + } + } + } + + private void checkEditMes2Plc() + { + cmbParamValues.Enabled = enableEditMes2Plc; + txtValue.Enabled = enableEditMes2Plc; + if (enableEditMes2Plc) + { + // aggiorno (se possibile) i parametri selezionabili... + fixComboParameters(); + } + } public bool enableEditMes2Plc { get; set; } private void ChkEdit_CheckedChanged(object sender, EventArgs e) @@ -1179,8 +1159,14 @@ namespace IOB_WIN private void BtnSendPLC_Click(object sender, EventArgs e) { - // invia a MES i dati selezionati x ART / ODL / PRG NAME (come task2exe..) + // invia a MES il parametro selezionato (es ART / ODL / PRG NAME, come task2exe..) Dictionary forcedTask = new Dictionary(); + // guardo i parametri... + if (txtValue.Text != "") + { + forcedTask.Add(cmbParamValues.SelectedValue.ToString(), txtValue.Text); + } +#if false // accodo SE !="" if (currItemCode != "") { @@ -1193,8 +1179,8 @@ namespace IOB_WIN if (currPrgName != "") { forcedTask.Add("setProg", currPrgName); - } - //forcedTask.Add("forceResetPzCount", ""); + } +#endif // chiedo esecuzione task! iobObj.processTask(forcedTask); toggleEditMes2Plc(); @@ -1212,5 +1198,10 @@ namespace IOB_WIN lgError($"Eccezione in show log (MAIN):{Environment.NewLine}{exc}"); } } + + private void splitContainer1_Panel1_Paint(object sender, PaintEventArgs e) + { + + } } } diff --git a/IOB-WIN/AdapterForm.resx b/IOB-WIN/AdapterForm.resx index a5dfab54..05d5a47f 100644 --- a/IOB-WIN/AdapterForm.resx +++ b/IOB-WIN/AdapterForm.resx @@ -126,6 +126,32 @@ 645, 17 + + ---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- + diff --git a/IOB-WIN/DATA/CONF/MAIN.ini b/IOB-WIN/DATA/CONF/MAIN.ini index 58d9bc02..006bdfb9 100644 --- a/IOB-WIN/DATA/CONF/MAIN.ini +++ b/IOB-WIN/DATA/CONF/MAIN.ini @@ -46,7 +46,8 @@ CMDIOB2CALL=/IOB/getIob2call?GWIP= ; SIMULAZIONE verso server ufficio -STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04 +;STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04 +STARTLIST=SIMUL_01 ;STARTLIST=SIM_DP_02 ;STARTLIST=SIMUL_03,SIMUL_04,SIMUL_05,SIMUL_06,SIMUL_07,SIMUL_08 diff --git a/IOB-WIN/DATA/CONF/SIMUL_01.json b/IOB-WIN/DATA/CONF/SIMUL_01.json index 28bd7f5e..ec22527f 100644 --- a/IOB-WIN/DATA/CONF/SIMUL_01.json +++ b/IOB-WIN/DATA/CONF/SIMUL_01.json @@ -1,5 +1,29 @@ { "mMapWrite": { + "setArt": { + "name": "setArt", + "tipoMem": "String", + "index": 4, + "size": 32 + }, + "setComm": { + "name": "setComm", + "tipoMem": "String", + "index": 38, + "size": 12 + }, + "setPzComm": { + "name": "setPzComm", + "tipoMem": "Int", + "index": 52, + "size": 4 + }, + "setParameter": { + "name": "setParameter", + "tipoMem": "Int", + "index": 56, + "size": 4 + } }, "mMapRead": { "TEMP_AMB": { diff --git a/IOB-WIN/DATA/CONF/SIMUL_02.json b/IOB-WIN/DATA/CONF/SIMUL_02.json index 28bd7f5e..ec22527f 100644 --- a/IOB-WIN/DATA/CONF/SIMUL_02.json +++ b/IOB-WIN/DATA/CONF/SIMUL_02.json @@ -1,5 +1,29 @@ { "mMapWrite": { + "setArt": { + "name": "setArt", + "tipoMem": "String", + "index": 4, + "size": 32 + }, + "setComm": { + "name": "setComm", + "tipoMem": "String", + "index": 38, + "size": 12 + }, + "setPzComm": { + "name": "setPzComm", + "tipoMem": "Int", + "index": 52, + "size": 4 + }, + "setParameter": { + "name": "setParameter", + "tipoMem": "Int", + "index": 56, + "size": 4 + } }, "mMapRead": { "TEMP_AMB": { diff --git a/IOB-WIN/DATA/CONF/SIMUL_03.json b/IOB-WIN/DATA/CONF/SIMUL_03.json index 28bd7f5e..ec22527f 100644 --- a/IOB-WIN/DATA/CONF/SIMUL_03.json +++ b/IOB-WIN/DATA/CONF/SIMUL_03.json @@ -1,5 +1,29 @@ { "mMapWrite": { + "setArt": { + "name": "setArt", + "tipoMem": "String", + "index": 4, + "size": 32 + }, + "setComm": { + "name": "setComm", + "tipoMem": "String", + "index": 38, + "size": 12 + }, + "setPzComm": { + "name": "setPzComm", + "tipoMem": "Int", + "index": 52, + "size": 4 + }, + "setParameter": { + "name": "setParameter", + "tipoMem": "Int", + "index": 56, + "size": 4 + } }, "mMapRead": { "TEMP_AMB": { diff --git a/IOB-WIN/DATA/CONF/SIMUL_04.json b/IOB-WIN/DATA/CONF/SIMUL_04.json index 28bd7f5e..ec22527f 100644 --- a/IOB-WIN/DATA/CONF/SIMUL_04.json +++ b/IOB-WIN/DATA/CONF/SIMUL_04.json @@ -1,5 +1,29 @@ { "mMapWrite": { + "setArt": { + "name": "setArt", + "tipoMem": "String", + "index": 4, + "size": 32 + }, + "setComm": { + "name": "setComm", + "tipoMem": "String", + "index": 38, + "size": 12 + }, + "setPzComm": { + "name": "setPzComm", + "tipoMem": "Int", + "index": 52, + "size": 4 + }, + "setParameter": { + "name": "setParameter", + "tipoMem": "Int", + "index": 56, + "size": 4 + } }, "mMapRead": { "TEMP_AMB": { diff --git a/IOB-WIN/IobGeneric.cs b/IOB-WIN/IobGeneric.cs index 60aa350b..8035c164 100644 --- a/IOB-WIN/IobGeneric.cs +++ b/IOB-WIN/IobGeneric.cs @@ -1263,7 +1263,7 @@ namespace IOB_WIN // converto richiesta in enum... taskType tName = taskType.nihil; Enum.TryParse(item.Key, out tName); - // controllo sulla KEY + // controllo sulla KEY... switch (tName) { case taskType.nihil: @@ -1274,16 +1274,10 @@ namespace IOB_WIN lgInfo($"Chiamata senza processing: taskOk: {taskOk} | taskVal: {taskVal}"); break; case taskType.setArt: - parentForm.currItemCode = item.Value; - taskVal = $"SET value: {item.Value}"; - break; case taskType.setComm: - parentForm.currOrdCode = item.Value; - taskVal = $"SET value: {item.Value}"; - break; case taskType.setProg: - parentForm.currPrgName = item.Value; - taskVal = $"SET value: {item.Value}"; + case taskType.setPzComm: + taskVal = $"SET task: {item.Key} --> {item.Value}"; break; case taskType.forceResetPzCount: // reset contapezzi inizio setup @@ -1306,6 +1300,18 @@ namespace IOB_WIN taskVal = taskOk ? "RESET: SETUP END" : "PZ RESET DISABLED | NO EXEC"; lgInfo($"Chiamata stopSetup: taskOk: {taskOk} | taskVal: {taskVal}"); break; + case taskType.setParameter: + // i parametri me li aspetto come stringa composta paramName|paramvalue + if (item.Value.Contains("|")) + { + string[] paramsJob = item.Value.Split('|'); + taskVal = $"REQUEST SET PARAMETERS: {paramsJob[0]} --> {paramsJob[1]}"; + } + else + { + taskVal = $"WRONG REQUEST FOR SET PARAMETERS: {item.Value} doesnt contain pipe for splitting key/value"; + } + break; default: taskVal = "SKIPPED | NO EXEC"; lgInfo($"Chiamata default senza processing: taskOk: {taskOk} | taskVal: {taskVal}");