From 46705d265e03e952a05ee18768aee08fcd3b7d66 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 23 May 2022 11:28:10 +0200 Subject: [PATCH] Aggiunto start x IobIcoel DB/Soap --- IOB-UT-NEXT/Enums.cs | 12 +++++++- IOB-WIN-NEXT/AdapterForm.Designer.cs | 42 ++++++++++++++-------------- IOB-WIN-NEXT/AdapterForm.cs | 9 ++++++ 3 files changed, 41 insertions(+), 22 deletions(-) diff --git a/IOB-UT-NEXT/Enums.cs b/IOB-UT-NEXT/Enums.cs index c67b0ae7..852a0210 100644 --- a/IOB-UT-NEXT/Enums.cs +++ b/IOB-UT-NEXT/Enums.cs @@ -278,10 +278,20 @@ namespace IOB_UT_NEXT //FILE_XYLOG, /// - /// adapter KAWASAKI e-controller + /// Adapter KAWASAKI e-controller /// KAWASAKI, + /// + /// Adapter Icoel per DB (barcode, tracciatura, produzione,...) + /// + IcoelDb, + + /// + /// Adapter Icoel per WS SOAP (sizer) + /// + IcoelSoap, + /// /// Adapter non specificato /// diff --git a/IOB-WIN-NEXT/AdapterForm.Designer.cs b/IOB-WIN-NEXT/AdapterForm.Designer.cs index d5a4057c..52448d2a 100644 --- a/IOB-WIN-NEXT/AdapterForm.Designer.cs +++ b/IOB-WIN-NEXT/AdapterForm.Designer.cs @@ -51,6 +51,8 @@ this.tabMes = new System.Windows.Forms.TabPage(); this.btnForceAutoOdl = new System.Windows.Forms.Button(); this.panel1 = new System.Windows.Forms.Panel(); + this.label24 = new System.Windows.Forms.Label(); + this.lblQueueULog = new System.Windows.Forms.Label(); this.label19 = new System.Windows.Forms.Label(); this.lblQueueAlarmLen = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label(); @@ -107,8 +109,6 @@ this.lblOutMessage3 = new System.Windows.Forms.Label(); this.lblOutMessage2 = new System.Windows.Forms.Label(); this.tabData = new System.Windows.Forms.TabControl(); - this.label24 = new System.Windows.Forms.Label(); - this.lblQueueULog = new System.Windows.Forms.Label(); this.statusStrip1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.tabMes.SuspendLayout(); @@ -387,6 +387,25 @@ this.panel1.Size = new System.Drawing.Size(343, 248); this.panel1.TabIndex = 88; // + // label24 + // + this.label24.AutoSize = true; + this.label24.Location = new System.Drawing.Point(15, 214); + this.label24.Name = "label24"; + this.label24.Size = new System.Drawing.Size(85, 13); + this.label24.TabIndex = 94; + this.label24.Text = "ULog Queue len"; + // + // lblQueueULog + // + this.lblQueueULog.AutoSize = true; + this.lblQueueULog.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblQueueULog.Location = new System.Drawing.Point(105, 214); + this.lblQueueULog.Name = "lblQueueULog"; + this.lblQueueULog.Size = new System.Drawing.Size(31, 13); + this.lblQueueULog.TabIndex = 95; + this.lblQueueULog.Text = "###"; + // // label19 // this.label19.AutoSize = true; @@ -1024,25 +1043,6 @@ this.tabData.TabIndex = 71; this.tabData.Selected += new System.Windows.Forms.TabControlEventHandler(this.TabData_Selected); // - // label24 - // - this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(15, 214); - this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(85, 13); - this.label24.TabIndex = 94; - this.label24.Text = "ULog Queue len"; - // - // lblQueueULog - // - this.lblQueueULog.AutoSize = true; - this.lblQueueULog.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblQueueULog.Location = new System.Drawing.Point(105, 214); - this.lblQueueULog.Name = "lblQueueULog"; - this.lblQueueULog.Size = new System.Drawing.Size(31, 13); - this.lblQueueULog.TabIndex = 95; - this.lblQueueULog.Text = "###"; - // // AdapterForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/IOB-WIN-NEXT/AdapterForm.cs b/IOB-WIN-NEXT/AdapterForm.cs index 580c2479..f0a300fe 100644 --- a/IOB-WIN-NEXT/AdapterForm.cs +++ b/IOB-WIN-NEXT/AdapterForm.cs @@ -1210,6 +1210,15 @@ namespace IOB_WIN_NEXT start.Enabled = true; break; + case tipoAdapter.IcoelDb: + iobObj = new IobIcoelDb(this, IOBConf); + start.Enabled = true; + break; + case tipoAdapter.IcoelSoap: + iobObj = new IobIcoelSoap(this, IOBConf); + start.Enabled = true; + break; + case tipoAdapter.MODBUS_TCP: iobObj = new IobModbusTCP(this, IOBConf); start.Enabled = true;