diff --git a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs index b7f643f..21d7b98 100644 --- a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs +++ b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs @@ -819,10 +819,10 @@ namespace ITC81DB_0H.Controls this.ParentForm.ParentForm.ChildFormMainDisplay.MainLineGraph.InitializeDesign(); this.ParentForm.ParentForm.ChildFormMainDisplay.MainList.InitializeDesign(); this.ParentForm.ParentForm.ChildFormMainDisplay.MainDataStatistics.InitializeDesign(); - this.ParentForm.ParentForm.ChildFormMainDisplay.MainDisplayWeightBigScreen.InitializeDesign(); - this.ParentForm.ParentForm.ChildFormMainDisplay.MainDisplayWeightSmall.InitializeDesign(); - this.ParentForm.ParentForm.ChildFormMainDisplay.MainDisplayFeedback.InitializeDesign(); - this.ParentForm.ParentForm.ChildFormMainDisplay.MainDisplayModbus.InitializeDesign(); + this.ParentForm.ParentForm.ChildFormMainDisplay.MainWeightBigScreen.InitializeDesign(); + this.ParentForm.ParentForm.ChildFormMainDisplay.MainWeightSmall.InitializeDesign(); + this.ParentForm.ParentForm.ChildFormMainDisplay.MainFeedback.InitializeDesign(); + this.ParentForm.ParentForm.ChildFormMainDisplay.MainModbus.InitializeDesign(); Thread.Sleep(50); this.ParentForm.ParentForm.ChildFormMenu.CenterBasicDataStatistics.InitializeDesign(); diff --git a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs index 7caf617..a6f3692 100644 --- a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs +++ b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs @@ -95,6 +95,21 @@ namespace ITC81DB_0H.Controls this.labelControlVer.Text = version; } + private void ServiceList() + { + //if (this.ParentForm.ParentForm.SystemConfig3.IsModbus == true) + // this.labelServiceList.Text += "Modbus"; + //if (this.ParentForm.ParentForm.SystemConfig3.IsPart11 == true) + //{ + // if (this.labelServiceList.Text.Length != 0) + // this.labelServiceList.Text += ", "; + // this.labelServiceList.Text += "Part11"; + //} + + //if (this.labelServiceList.Text == "") + // this.labelTitleService.Visible = false; + } + public void DisplayHiddenMenu(bool bValue) { this.buttonNext.Visible = bValue; diff --git a/ITC81DB_0H/Controls/Etc/ControlConfiOptionBoard1.cs b/ITC81DB_0H/Controls/Etc/ControlConfiOptionBoard1.cs index 0269a18..4c55a62 100644 --- a/ITC81DB_0H/Controls/Etc/ControlConfiOptionBoard1.cs +++ b/ITC81DB_0H/Controls/Etc/ControlConfiOptionBoard1.cs @@ -445,9 +445,9 @@ namespace ITC81DB_0H.Controls this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1OverRange = this.labelUpperLimit.Text.Replace(".", ""); this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1UnderRange = this.labelLowerLimit.Text.Replace(".", ""); this.ParentForm.ParentForm.CurrentFeedbackItem.OverRangeDeviation = - this.ParentForm.ParentForm.ChildFormMainDisplay.MainDisplayFeedback.CaculateDeviation(this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1OverRangeInt); + this.ParentForm.ParentForm.ChildFormMainDisplay.MainFeedback.CaculateDeviation(this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1OverRangeInt); this.ParentForm.ParentForm.CurrentFeedbackItem.UnderRangeDeviation = - this.ParentForm.ParentForm.ChildFormMainDisplay.MainDisplayFeedback.CaculateDeviation(this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1UnderRangeInt); + this.ParentForm.ParentForm.ChildFormMainDisplay.MainFeedback.CaculateDeviation(this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1UnderRangeInt); this.ParentForm.ParentForm.SaveSystemParameter2File(this.ParentForm.ParentForm.CurrentSystemParameter2); this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.OPT1RangeSetting, value); @@ -492,7 +492,7 @@ namespace ITC81DB_0H.Controls after = this.labelUpperLimit.Text = myKeyPad.StringValue; this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1OverRange = myKeyPad.StringValue.Replace(".", ""); this.ParentForm.ParentForm.CurrentFeedbackItem.OverRangeDeviation = - this.ParentForm.ParentForm.ChildFormMainDisplay.MainDisplayFeedback.CaculateDeviation(this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1OverRangeInt); + this.ParentForm.ParentForm.ChildFormMainDisplay.MainFeedback.CaculateDeviation(this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1OverRangeInt); value = Helper.StringZeroFillDigits7(this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1OverRange); this.ParentForm.ParentForm.SaveSystemParameter2File(this.ParentForm.ParentForm.CurrentSystemParameter2); @@ -538,7 +538,7 @@ namespace ITC81DB_0H.Controls after = this.labelLowerLimit.Text = myKeyPad.StringValue; this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1UnderRange = myKeyPad.StringValue.Replace(".", ""); this.ParentForm.ParentForm.CurrentFeedbackItem.UnderRangeDeviation = - this.ParentForm.ParentForm.ChildFormMainDisplay.MainDisplayFeedback.CaculateDeviation(this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1UnderRangeInt); + this.ParentForm.ParentForm.ChildFormMainDisplay.MainFeedback.CaculateDeviation(this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1UnderRangeInt); value = Helper.StringZeroFillDigits7(this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1UnderRange); this.ParentForm.ParentForm.SaveSystemParameter2File(this.ParentForm.ParentForm.CurrentSystemParameter2); diff --git a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayFeedback.cs b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayFeedback.cs index 4c28be1..1c12bce 100644 --- a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayFeedback.cs +++ b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayFeedback.cs @@ -318,7 +318,7 @@ namespace ITC81DB_0H this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1OverRange = myKeyPad.StringValue.Replace(".", ""); this.ParentForm.ParentForm.CurrentFeedbackItem.OverRangeDeviation = - this.ParentForm.ParentForm.ChildFormMainDisplay.MainDisplayFeedback.CaculateDeviation(this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1OverRangeInt); + this.ParentForm.ParentForm.ChildFormMainDisplay.MainFeedback.CaculateDeviation(this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1OverRangeInt); this.labelUpperLimitDev.Text = '+' + Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentFeedbackItem.OverRangeDeviation, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); value = Helper.StringZeroFillDigits7(this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1OverRange); @@ -369,7 +369,7 @@ namespace ITC81DB_0H this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1UnderRange = myKeyPad.StringValue.Replace(".", ""); this.ParentForm.ParentForm.CurrentFeedbackItem.UnderRangeDeviation = - this.ParentForm.ParentForm.ChildFormMainDisplay.MainDisplayFeedback.CaculateDeviation(this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1UnderRangeInt); + this.ParentForm.ParentForm.ChildFormMainDisplay.MainFeedback.CaculateDeviation(this.ParentForm.ParentForm.CurrentSystemParameter2.OPT1UnderRangeInt); this.labelLowerLimitDev.Text = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentFeedbackItem.UnderRangeDeviation, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); this.ParentForm.ParentForm.SaveSystemParameter2File(this.ParentForm.ParentForm.CurrentSystemParameter2); diff --git a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayModbus.Designer.cs b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayModbus.Designer.cs index f891f4f..9521915 100644 --- a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayModbus.Designer.cs +++ b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayModbus.Designer.cs @@ -46,13 +46,17 @@ this.labelAlarmStatus = new SmartX.SmartLabel(); this.labelOperationStatus = new SmartX.SmartLabel(); this.labelWeight = new SmartX.SmartLabel(); - this.labelReceiveCount = new SmartX.SmartLabel(); this.buttonBypassDirection = new SmartX.SmartButton(); - this.labelStartAddress = new SmartX.SmartLabel(); this.smartGroupBox1 = new SmartX.SmartGroupBox(); + this.labelTitleReceiveCount2 = new SmartX.SmartLabel(); + this.labelTitleStartAddr2 = new SmartX.SmartLabel(); + this.labelTitleReceiveCount1 = new SmartX.SmartLabel(); + this.labelTitleStartAddr1 = new SmartX.SmartLabel(); + this.labelStartAddress = new SmartX.SmartLabel(); + this.labelReceiveCount = new SmartX.SmartLabel(); + this.labelOffset1 = new SmartX.SmartLabel(); + this.labelOffset2 = new SmartX.SmartLabel(); this.labelHelp = new SmartX.SmartLabel(); - this.labelTitleReceiveCount = new SmartX.SmartLabel(); - this.labelTitleStartAddr = new SmartX.SmartLabel(); this.labelTitlePort = new SmartX.SmartLabel(); this.labelTitleValue3 = new SmartX.SmartLabel(); this.labelTitleValue2 = new SmartX.SmartLabel(); @@ -105,8 +109,6 @@ this.labelOffset5 = new SmartX.SmartLabel(); this.labelOffset4 = new SmartX.SmartLabel(); this.labelOffset3 = new SmartX.SmartLabel(); - this.labelOffset2 = new SmartX.SmartLabel(); - this.labelOffset1 = new SmartX.SmartLabel(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -467,27 +469,6 @@ this.labelWeight.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelWeight.Wordwrap = false; // - // labelReceiveCount - // - this.labelReceiveCount.BackColor = System.Drawing.Color.Black; - this.labelReceiveCount.BackPictureBox = null; - this.labelReceiveCount.BackPictureBox1 = null; - this.labelReceiveCount.BackPictureBox2 = null; - this.labelReceiveCount.BorderColor = System.Drawing.Color.Black; - this.labelReceiveCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelReceiveCount.Font = new System.Drawing.Font("Arial", 17F, System.Drawing.FontStyle.Bold); - this.labelReceiveCount.ForeColor = System.Drawing.Color.White; - this.labelReceiveCount.InitVisible = true; - this.labelReceiveCount.LineSpacing = 0F; - this.labelReceiveCount.Location = new System.Drawing.Point(541, 22); - this.labelReceiveCount.Name = "labelReceiveCount"; - this.labelReceiveCount.Size = new System.Drawing.Size(136, 28); - this.labelReceiveCount.TabIndex = 726; - this.labelReceiveCount.Text = "9999999999"; - this.labelReceiveCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; - this.labelReceiveCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelReceiveCount.Wordwrap = false; - // // buttonBypassDirection // this.buttonBypassDirection.BackPictureBox = null; @@ -519,36 +500,19 @@ this.buttonBypassDirection.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonBypassDirection.UpImage"))); this.buttonBypassDirection.Click += new System.EventHandler(this.buttonBypassDirection_Click); // - // labelStartAddress - // - this.labelStartAddress.BackColor = System.Drawing.Color.Black; - this.labelStartAddress.BackPictureBox = null; - this.labelStartAddress.BackPictureBox1 = null; - this.labelStartAddress.BackPictureBox2 = null; - this.labelStartAddress.BorderColor = System.Drawing.Color.Black; - this.labelStartAddress.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStartAddress.Font = new System.Drawing.Font("Arial", 17F, System.Drawing.FontStyle.Bold); - this.labelStartAddress.ForeColor = System.Drawing.Color.White; - this.labelStartAddress.InitVisible = true; - this.labelStartAddress.LineSpacing = 0F; - this.labelStartAddress.Location = new System.Drawing.Point(381, 22); - this.labelStartAddress.Name = "labelStartAddress"; - this.labelStartAddress.Size = new System.Drawing.Size(79, 28); - this.labelStartAddress.TabIndex = 729; - this.labelStartAddress.Text = "99999"; - this.labelStartAddress.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelStartAddress.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelStartAddress.Wordwrap = false; - // // smartGroupBox1 // this.smartGroupBox1.BackPictureBox = null; this.smartGroupBox1.BackPictureBox1 = null; + this.smartGroupBox1.Controls.Add(this.labelTitleReceiveCount2); + this.smartGroupBox1.Controls.Add(this.labelTitleStartAddr2); + this.smartGroupBox1.Controls.Add(this.labelTitleReceiveCount1); + this.smartGroupBox1.Controls.Add(this.labelTitleStartAddr1); + this.smartGroupBox1.Controls.Add(this.labelStartAddress); + this.smartGroupBox1.Controls.Add(this.labelReceiveCount); this.smartGroupBox1.Controls.Add(this.labelOffset1); this.smartGroupBox1.Controls.Add(this.labelOffset2); this.smartGroupBox1.Controls.Add(this.labelHelp); - this.smartGroupBox1.Controls.Add(this.labelTitleReceiveCount); - this.smartGroupBox1.Controls.Add(this.labelTitleStartAddr); this.smartGroupBox1.Controls.Add(this.labelTitlePort); this.smartGroupBox1.Controls.Add(this.labelTitleValue3); this.smartGroupBox1.Controls.Add(this.labelTitleValue2); @@ -601,9 +565,7 @@ this.smartGroupBox1.Controls.Add(this.labelOffset5); this.smartGroupBox1.Controls.Add(this.labelOffset4); this.smartGroupBox1.Controls.Add(this.labelOffset3); - this.smartGroupBox1.Controls.Add(this.labelStartAddress); this.smartGroupBox1.Controls.Add(this.buttonBypassDirection); - this.smartGroupBox1.Controls.Add(this.labelReceiveCount); this.smartGroupBox1.Controls.Add(this.labelAlarmStatus); this.smartGroupBox1.Controls.Add(this.labelOperationStatus); this.smartGroupBox1.Controls.Add(this.labelWeight); @@ -635,6 +597,168 @@ this.smartGroupBox1.Text = "smartGroupBox1"; this.smartGroupBox1.TextColor = System.Drawing.Color.Black; // + // labelTitleReceiveCount2 + // + this.labelTitleReceiveCount2.BackColor = System.Drawing.Color.Black; + this.labelTitleReceiveCount2.BackPictureBox1 = null; + this.labelTitleReceiveCount2.BackPictureBox2 = this.smartGroupBox1; + this.labelTitleReceiveCount2.BorderColor = System.Drawing.Color.Black; + this.labelTitleReceiveCount2.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleReceiveCount2.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelTitleReceiveCount2.ForeColor = System.Drawing.Color.White; + this.labelTitleReceiveCount2.InitVisible = true; + this.labelTitleReceiveCount2.LineSpacing = 0F; + this.labelTitleReceiveCount2.Location = new System.Drawing.Point(475, 37); + this.labelTitleReceiveCount2.Name = "labelTitleReceiveCount2"; + this.labelTitleReceiveCount2.Size = new System.Drawing.Size(75, 15); + this.labelTitleReceiveCount2.TabIndex = 796; + this.labelTitleReceiveCount2.Text = "Count"; + this.labelTitleReceiveCount2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleReceiveCount2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleReceiveCount2.Wordwrap = false; + // + // labelTitleStartAddr2 + // + this.labelTitleStartAddr2.BackColor = System.Drawing.Color.Black; + this.labelTitleStartAddr2.BackPictureBox1 = null; + this.labelTitleStartAddr2.BackPictureBox2 = this.smartGroupBox1; + this.labelTitleStartAddr2.BorderColor = System.Drawing.Color.Black; + this.labelTitleStartAddr2.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleStartAddr2.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelTitleStartAddr2.ForeColor = System.Drawing.Color.White; + this.labelTitleStartAddr2.InitVisible = true; + this.labelTitleStartAddr2.LineSpacing = 0F; + this.labelTitleStartAddr2.Location = new System.Drawing.Point(324, 37); + this.labelTitleStartAddr2.Name = "labelTitleStartAddr2"; + this.labelTitleStartAddr2.Size = new System.Drawing.Size(61, 15); + this.labelTitleStartAddr2.TabIndex = 795; + this.labelTitleStartAddr2.Text = "Address"; + this.labelTitleStartAddr2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleStartAddr2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleStartAddr2.Wordwrap = false; + // + // labelTitleReceiveCount1 + // + this.labelTitleReceiveCount1.BackColor = System.Drawing.Color.Black; + this.labelTitleReceiveCount1.BackPictureBox1 = null; + this.labelTitleReceiveCount1.BackPictureBox2 = this.smartGroupBox1; + this.labelTitleReceiveCount1.BorderColor = System.Drawing.Color.Black; + this.labelTitleReceiveCount1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleReceiveCount1.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelTitleReceiveCount1.ForeColor = System.Drawing.Color.White; + this.labelTitleReceiveCount1.InitVisible = true; + this.labelTitleReceiveCount1.LineSpacing = 0F; + this.labelTitleReceiveCount1.Location = new System.Drawing.Point(475, 22); + this.labelTitleReceiveCount1.Name = "labelTitleReceiveCount1"; + this.labelTitleReceiveCount1.Size = new System.Drawing.Size(75, 15); + this.labelTitleReceiveCount1.TabIndex = 794; + this.labelTitleReceiveCount1.Text = "Receive"; + this.labelTitleReceiveCount1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleReceiveCount1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleReceiveCount1.Wordwrap = false; + // + // labelTitleStartAddr1 + // + this.labelTitleStartAddr1.BackColor = System.Drawing.Color.Black; + this.labelTitleStartAddr1.BackPictureBox1 = null; + this.labelTitleStartAddr1.BackPictureBox2 = this.smartGroupBox1; + this.labelTitleStartAddr1.BorderColor = System.Drawing.Color.Black; + this.labelTitleStartAddr1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleStartAddr1.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelTitleStartAddr1.ForeColor = System.Drawing.Color.White; + this.labelTitleStartAddr1.InitVisible = true; + this.labelTitleStartAddr1.LineSpacing = 0F; + this.labelTitleStartAddr1.Location = new System.Drawing.Point(324, 22); + this.labelTitleStartAddr1.Name = "labelTitleStartAddr1"; + this.labelTitleStartAddr1.Size = new System.Drawing.Size(61, 15); + this.labelTitleStartAddr1.TabIndex = 793; + this.labelTitleStartAddr1.Text = "Start"; + this.labelTitleStartAddr1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleStartAddr1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleStartAddr1.Wordwrap = false; + // + // labelStartAddress + // + this.labelStartAddress.BackColor = System.Drawing.Color.Black; + this.labelStartAddress.BackPictureBox = null; + this.labelStartAddress.BackPictureBox1 = null; + this.labelStartAddress.BackPictureBox2 = null; + this.labelStartAddress.BorderColor = System.Drawing.Color.Black; + this.labelStartAddress.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelStartAddress.Font = new System.Drawing.Font("Arial", 15F, System.Drawing.FontStyle.Bold); + this.labelStartAddress.ForeColor = System.Drawing.Color.White; + this.labelStartAddress.InitVisible = true; + this.labelStartAddress.LineSpacing = 0F; + this.labelStartAddress.Location = new System.Drawing.Point(391, 22); + this.labelStartAddress.Name = "labelStartAddress"; + this.labelStartAddress.Size = new System.Drawing.Size(70, 28); + this.labelStartAddress.TabIndex = 792; + this.labelStartAddress.Text = "99999"; + this.labelStartAddress.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelStartAddress.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelStartAddress.Wordwrap = false; + // + // labelReceiveCount + // + this.labelReceiveCount.BackColor = System.Drawing.Color.Black; + this.labelReceiveCount.BackPictureBox = null; + this.labelReceiveCount.BackPictureBox1 = null; + this.labelReceiveCount.BackPictureBox2 = null; + this.labelReceiveCount.BorderColor = System.Drawing.Color.Black; + this.labelReceiveCount.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelReceiveCount.Font = new System.Drawing.Font("Arial", 15F, System.Drawing.FontStyle.Bold); + this.labelReceiveCount.ForeColor = System.Drawing.Color.White; + this.labelReceiveCount.InitVisible = true; + this.labelReceiveCount.LineSpacing = 0F; + this.labelReceiveCount.Location = new System.Drawing.Point(556, 22); + this.labelReceiveCount.Name = "labelReceiveCount"; + this.labelReceiveCount.Size = new System.Drawing.Size(122, 28); + this.labelReceiveCount.TabIndex = 791; + this.labelReceiveCount.Text = "9999999999"; + this.labelReceiveCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; + this.labelReceiveCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelReceiveCount.Wordwrap = false; + // + // labelOffset1 + // + this.labelOffset1.BackColor = System.Drawing.Color.Black; + this.labelOffset1.BackPictureBox1 = null; + this.labelOffset1.BackPictureBox2 = this.smartGroupBox1; + this.labelOffset1.BorderColor = System.Drawing.Color.Black; + this.labelOffset1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelOffset1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.labelOffset1.ForeColor = System.Drawing.Color.Black; + this.labelOffset1.InitVisible = true; + this.labelOffset1.LineSpacing = 0F; + this.labelOffset1.Location = new System.Drawing.Point(21, 95); + this.labelOffset1.Name = "labelOffset1"; + this.labelOffset1.Size = new System.Drawing.Size(51, 21); + this.labelOffset1.TabIndex = 788; + this.labelOffset1.Text = "0x000A"; + this.labelOffset1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelOffset1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelOffset1.Wordwrap = false; + // + // labelOffset2 + // + this.labelOffset2.BackColor = System.Drawing.Color.Black; + this.labelOffset2.BackPictureBox1 = null; + this.labelOffset2.BackPictureBox2 = this.smartGroupBox1; + this.labelOffset2.BorderColor = System.Drawing.Color.Black; + this.labelOffset2.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelOffset2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); + this.labelOffset2.ForeColor = System.Drawing.Color.Black; + this.labelOffset2.InitVisible = true; + this.labelOffset2.LineSpacing = 0F; + this.labelOffset2.Location = new System.Drawing.Point(21, 121); + this.labelOffset2.Name = "labelOffset2"; + this.labelOffset2.Size = new System.Drawing.Size(51, 21); + this.labelOffset2.TabIndex = 731; + this.labelOffset2.Text = "0x000A"; + this.labelOffset2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelOffset2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelOffset2.Wordwrap = false; + // // labelHelp // this.labelHelp.BackColor = System.Drawing.Color.Black; @@ -655,46 +779,6 @@ this.labelHelp.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelHelp.Wordwrap = false; // - // labelTitleReceiveCount - // - this.labelTitleReceiveCount.BackColor = System.Drawing.Color.Black; - this.labelTitleReceiveCount.BackPictureBox1 = null; - this.labelTitleReceiveCount.BackPictureBox2 = this.smartGroupBox1; - this.labelTitleReceiveCount.BorderColor = System.Drawing.Color.Black; - this.labelTitleReceiveCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleReceiveCount.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleReceiveCount.ForeColor = System.Drawing.Color.White; - this.labelTitleReceiveCount.InitVisible = true; - this.labelTitleReceiveCount.LineSpacing = 0F; - this.labelTitleReceiveCount.Location = new System.Drawing.Point(474, 22); - this.labelTitleReceiveCount.Name = "labelTitleReceiveCount"; - this.labelTitleReceiveCount.Size = new System.Drawing.Size(61, 28); - this.labelTitleReceiveCount.TabIndex = 786; - this.labelTitleReceiveCount.Text = "Receive"; - this.labelTitleReceiveCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelTitleReceiveCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleReceiveCount.Wordwrap = false; - // - // labelTitleStartAddr - // - this.labelTitleStartAddr.BackColor = System.Drawing.Color.Black; - this.labelTitleStartAddr.BackPictureBox1 = null; - this.labelTitleStartAddr.BackPictureBox2 = this.smartGroupBox1; - this.labelTitleStartAddr.BorderColor = System.Drawing.Color.Black; - this.labelTitleStartAddr.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleStartAddr.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleStartAddr.ForeColor = System.Drawing.Color.White; - this.labelTitleStartAddr.InitVisible = true; - this.labelTitleStartAddr.LineSpacing = 0F; - this.labelTitleStartAddr.Location = new System.Drawing.Point(323, 22); - this.labelTitleStartAddr.Name = "labelTitleStartAddr"; - this.labelTitleStartAddr.Size = new System.Drawing.Size(61, 28); - this.labelTitleStartAddr.TabIndex = 785; - this.labelTitleStartAddr.Text = "Start Addr"; - this.labelTitleStartAddr.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelTitleStartAddr.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleStartAddr.Wordwrap = false; - // // labelTitlePort // this.labelTitlePort.BackColor = System.Drawing.Color.Black; @@ -723,7 +807,7 @@ this.labelTitleValue3.BorderColor = System.Drawing.Color.Black; this.labelTitleValue3.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelTitleValue3.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleValue3.ForeColor = System.Drawing.Color.White; + this.labelTitleValue3.ForeColor = System.Drawing.Color.Black; this.labelTitleValue3.InitVisible = true; this.labelTitleValue3.LineSpacing = 0F; this.labelTitleValue3.Location = new System.Drawing.Point(613, 70); @@ -743,7 +827,7 @@ this.labelTitleValue2.BorderColor = System.Drawing.Color.Black; this.labelTitleValue2.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelTitleValue2.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleValue2.ForeColor = System.Drawing.Color.White; + this.labelTitleValue2.ForeColor = System.Drawing.Color.Black; this.labelTitleValue2.InitVisible = true; this.labelTitleValue2.LineSpacing = 0F; this.labelTitleValue2.Location = new System.Drawing.Point(391, 70); @@ -763,7 +847,7 @@ this.labelTitleValue1.BorderColor = System.Drawing.Color.Black; this.labelTitleValue1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelTitleValue1.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleValue1.ForeColor = System.Drawing.Color.White; + this.labelTitleValue1.ForeColor = System.Drawing.Color.Black; this.labelTitleValue1.InitVisible = true; this.labelTitleValue1.LineSpacing = 0F; this.labelTitleValue1.Location = new System.Drawing.Point(167, 70); @@ -783,7 +867,7 @@ this.labelTitleContents3.BorderColor = System.Drawing.Color.Black; this.labelTitleContents3.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelTitleContents3.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleContents3.ForeColor = System.Drawing.Color.White; + this.labelTitleContents3.ForeColor = System.Drawing.Color.Black; this.labelTitleContents3.InitVisible = true; this.labelTitleContents3.LineSpacing = 0F; this.labelTitleContents3.Location = new System.Drawing.Point(525, 70); @@ -803,7 +887,7 @@ this.labelTitleContents2.BorderColor = System.Drawing.Color.Black; this.labelTitleContents2.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelTitleContents2.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleContents2.ForeColor = System.Drawing.Color.White; + this.labelTitleContents2.ForeColor = System.Drawing.Color.Black; this.labelTitleContents2.InitVisible = true; this.labelTitleContents2.LineSpacing = 0F; this.labelTitleContents2.Location = new System.Drawing.Point(302, 70); @@ -823,7 +907,7 @@ this.labelTitleContents1.BorderColor = System.Drawing.Color.Black; this.labelTitleContents1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelTitleContents1.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleContents1.ForeColor = System.Drawing.Color.White; + this.labelTitleContents1.ForeColor = System.Drawing.Color.Black; this.labelTitleContents1.InitVisible = true; this.labelTitleContents1.LineSpacing = 0F; this.labelTitleContents1.Location = new System.Drawing.Point(78, 70); @@ -843,7 +927,7 @@ this.labelTitleOffset3.BorderColor = System.Drawing.Color.Black; this.labelTitleOffset3.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelTitleOffset3.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleOffset3.ForeColor = System.Drawing.Color.White; + this.labelTitleOffset3.ForeColor = System.Drawing.Color.Black; this.labelTitleOffset3.InitVisible = true; this.labelTitleOffset3.LineSpacing = 0F; this.labelTitleOffset3.Location = new System.Drawing.Point(469, 70); @@ -863,7 +947,7 @@ this.labelTitleOffset2.BorderColor = System.Drawing.Color.Black; this.labelTitleOffset2.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelTitleOffset2.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleOffset2.ForeColor = System.Drawing.Color.White; + this.labelTitleOffset2.ForeColor = System.Drawing.Color.Black; this.labelTitleOffset2.InitVisible = true; this.labelTitleOffset2.LineSpacing = 0F; this.labelTitleOffset2.Location = new System.Drawing.Point(245, 70); @@ -883,7 +967,7 @@ this.labelTitleOffset1.BorderColor = System.Drawing.Color.Black; this.labelTitleOffset1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelTitleOffset1.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); - this.labelTitleOffset1.ForeColor = System.Drawing.Color.White; + this.labelTitleOffset1.ForeColor = System.Drawing.Color.Black; this.labelTitleOffset1.InitVisible = true; this.labelTitleOffset1.LineSpacing = 0F; this.labelTitleOffset1.Location = new System.Drawing.Point(21, 70); @@ -902,8 +986,8 @@ this.labelContents20.BackPictureBox2 = this.smartGroupBox1; this.labelContents20.BorderColor = System.Drawing.Color.Black; this.labelContents20.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents20.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents20.ForeColor = System.Drawing.Color.White; + this.labelContents20.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents20.ForeColor = System.Drawing.Color.Black; this.labelContents20.InitVisible = true; this.labelContents20.LineSpacing = 0F; this.labelContents20.Location = new System.Drawing.Point(525, 225); @@ -922,8 +1006,8 @@ this.labelContents19.BackPictureBox2 = this.smartGroupBox1; this.labelContents19.BorderColor = System.Drawing.Color.Black; this.labelContents19.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents19.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents19.ForeColor = System.Drawing.Color.White; + this.labelContents19.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents19.ForeColor = System.Drawing.Color.Black; this.labelContents19.InitVisible = true; this.labelContents19.LineSpacing = 0F; this.labelContents19.Location = new System.Drawing.Point(525, 199); @@ -942,8 +1026,8 @@ this.labelContents18.BackPictureBox2 = this.smartGroupBox1; this.labelContents18.BorderColor = System.Drawing.Color.Black; this.labelContents18.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents18.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents18.ForeColor = System.Drawing.Color.White; + this.labelContents18.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents18.ForeColor = System.Drawing.Color.Black; this.labelContents18.InitVisible = true; this.labelContents18.LineSpacing = 0F; this.labelContents18.Location = new System.Drawing.Point(525, 173); @@ -962,8 +1046,8 @@ this.labelContents17.BackPictureBox2 = this.smartGroupBox1; this.labelContents17.BorderColor = System.Drawing.Color.Black; this.labelContents17.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents17.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents17.ForeColor = System.Drawing.Color.White; + this.labelContents17.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents17.ForeColor = System.Drawing.Color.Black; this.labelContents17.InitVisible = true; this.labelContents17.LineSpacing = 0F; this.labelContents17.Location = new System.Drawing.Point(525, 147); @@ -982,8 +1066,8 @@ this.labelContents16.BackPictureBox2 = this.smartGroupBox1; this.labelContents16.BorderColor = System.Drawing.Color.Black; this.labelContents16.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents16.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents16.ForeColor = System.Drawing.Color.White; + this.labelContents16.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents16.ForeColor = System.Drawing.Color.Black; this.labelContents16.InitVisible = true; this.labelContents16.LineSpacing = 0F; this.labelContents16.Location = new System.Drawing.Point(525, 121); @@ -1002,8 +1086,8 @@ this.labelContents15.BackPictureBox2 = this.smartGroupBox1; this.labelContents15.BorderColor = System.Drawing.Color.Black; this.labelContents15.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents15.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents15.ForeColor = System.Drawing.Color.White; + this.labelContents15.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents15.ForeColor = System.Drawing.Color.Black; this.labelContents15.InitVisible = true; this.labelContents15.LineSpacing = 0F; this.labelContents15.Location = new System.Drawing.Point(525, 95); @@ -1022,8 +1106,8 @@ this.labelContents14.BackPictureBox2 = this.smartGroupBox1; this.labelContents14.BorderColor = System.Drawing.Color.Black; this.labelContents14.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents14.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents14.ForeColor = System.Drawing.Color.White; + this.labelContents14.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents14.ForeColor = System.Drawing.Color.Black; this.labelContents14.InitVisible = true; this.labelContents14.LineSpacing = 0F; this.labelContents14.Location = new System.Drawing.Point(302, 251); @@ -1042,8 +1126,8 @@ this.labelContents13.BackPictureBox2 = this.smartGroupBox1; this.labelContents13.BorderColor = System.Drawing.Color.Black; this.labelContents13.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents13.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents13.ForeColor = System.Drawing.Color.White; + this.labelContents13.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents13.ForeColor = System.Drawing.Color.Black; this.labelContents13.InitVisible = true; this.labelContents13.LineSpacing = 0F; this.labelContents13.Location = new System.Drawing.Point(302, 225); @@ -1062,8 +1146,8 @@ this.labelContents12.BackPictureBox2 = this.smartGroupBox1; this.labelContents12.BorderColor = System.Drawing.Color.Black; this.labelContents12.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents12.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents12.ForeColor = System.Drawing.Color.White; + this.labelContents12.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents12.ForeColor = System.Drawing.Color.Black; this.labelContents12.InitVisible = true; this.labelContents12.LineSpacing = 0F; this.labelContents12.Location = new System.Drawing.Point(302, 199); @@ -1082,8 +1166,8 @@ this.labelContents11.BackPictureBox2 = this.smartGroupBox1; this.labelContents11.BorderColor = System.Drawing.Color.Black; this.labelContents11.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents11.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents11.ForeColor = System.Drawing.Color.White; + this.labelContents11.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents11.ForeColor = System.Drawing.Color.Black; this.labelContents11.InitVisible = true; this.labelContents11.LineSpacing = 0F; this.labelContents11.Location = new System.Drawing.Point(302, 173); @@ -1102,8 +1186,8 @@ this.labelContents10.BackPictureBox2 = this.smartGroupBox1; this.labelContents10.BorderColor = System.Drawing.Color.Black; this.labelContents10.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents10.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents10.ForeColor = System.Drawing.Color.White; + this.labelContents10.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents10.ForeColor = System.Drawing.Color.Black; this.labelContents10.InitVisible = true; this.labelContents10.LineSpacing = 0F; this.labelContents10.Location = new System.Drawing.Point(302, 147); @@ -1122,8 +1206,8 @@ this.labelContents9.BackPictureBox2 = this.smartGroupBox1; this.labelContents9.BorderColor = System.Drawing.Color.Black; this.labelContents9.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents9.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents9.ForeColor = System.Drawing.Color.White; + this.labelContents9.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents9.ForeColor = System.Drawing.Color.Black; this.labelContents9.InitVisible = true; this.labelContents9.LineSpacing = 0F; this.labelContents9.Location = new System.Drawing.Point(302, 121); @@ -1142,8 +1226,8 @@ this.labelContents8.BackPictureBox2 = this.smartGroupBox1; this.labelContents8.BorderColor = System.Drawing.Color.Black; this.labelContents8.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents8.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents8.ForeColor = System.Drawing.Color.White; + this.labelContents8.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents8.ForeColor = System.Drawing.Color.Black; this.labelContents8.InitVisible = true; this.labelContents8.LineSpacing = 0F; this.labelContents8.Location = new System.Drawing.Point(302, 95); @@ -1162,8 +1246,8 @@ this.labelContents7.BackPictureBox2 = this.smartGroupBox1; this.labelContents7.BorderColor = System.Drawing.Color.Black; this.labelContents7.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents7.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents7.ForeColor = System.Drawing.Color.White; + this.labelContents7.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents7.ForeColor = System.Drawing.Color.Black; this.labelContents7.InitVisible = true; this.labelContents7.LineSpacing = 0F; this.labelContents7.Location = new System.Drawing.Point(78, 251); @@ -1182,8 +1266,8 @@ this.labelContents6.BackPictureBox2 = this.smartGroupBox1; this.labelContents6.BorderColor = System.Drawing.Color.Black; this.labelContents6.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents6.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents6.ForeColor = System.Drawing.Color.White; + this.labelContents6.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents6.ForeColor = System.Drawing.Color.Black; this.labelContents6.InitVisible = true; this.labelContents6.LineSpacing = 0F; this.labelContents6.Location = new System.Drawing.Point(78, 225); @@ -1202,8 +1286,8 @@ this.labelContents5.BackPictureBox2 = this.smartGroupBox1; this.labelContents5.BorderColor = System.Drawing.Color.Black; this.labelContents5.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents5.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents5.ForeColor = System.Drawing.Color.White; + this.labelContents5.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents5.ForeColor = System.Drawing.Color.Black; this.labelContents5.InitVisible = true; this.labelContents5.LineSpacing = 0F; this.labelContents5.Location = new System.Drawing.Point(78, 199); @@ -1222,8 +1306,8 @@ this.labelContents4.BackPictureBox2 = this.smartGroupBox1; this.labelContents4.BorderColor = System.Drawing.Color.Black; this.labelContents4.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents4.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents4.ForeColor = System.Drawing.Color.White; + this.labelContents4.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents4.ForeColor = System.Drawing.Color.Black; this.labelContents4.InitVisible = true; this.labelContents4.LineSpacing = 0F; this.labelContents4.Location = new System.Drawing.Point(78, 173); @@ -1242,8 +1326,8 @@ this.labelContents3.BackPictureBox2 = this.smartGroupBox1; this.labelContents3.BorderColor = System.Drawing.Color.Black; this.labelContents3.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents3.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents3.ForeColor = System.Drawing.Color.White; + this.labelContents3.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents3.ForeColor = System.Drawing.Color.Black; this.labelContents3.InitVisible = true; this.labelContents3.LineSpacing = 0F; this.labelContents3.Location = new System.Drawing.Point(78, 147); @@ -1262,8 +1346,8 @@ this.labelContents2.BackPictureBox2 = this.smartGroupBox1; this.labelContents2.BorderColor = System.Drawing.Color.Black; this.labelContents2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents2.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents2.ForeColor = System.Drawing.Color.White; + this.labelContents2.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents2.ForeColor = System.Drawing.Color.Black; this.labelContents2.InitVisible = true; this.labelContents2.LineSpacing = 0F; this.labelContents2.Location = new System.Drawing.Point(78, 121); @@ -1282,8 +1366,8 @@ this.labelContents1.BackPictureBox2 = this.smartGroupBox1; this.labelContents1.BorderColor = System.Drawing.Color.Black; this.labelContents1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelContents1.Font = new System.Drawing.Font("새굴림", 8.5F, System.Drawing.FontStyle.Regular); - this.labelContents1.ForeColor = System.Drawing.Color.White; + this.labelContents1.Font = new System.Drawing.Font("새굴림", 9F, System.Drawing.FontStyle.Regular); + this.labelContents1.ForeColor = System.Drawing.Color.Black; this.labelContents1.InitVisible = true; this.labelContents1.LineSpacing = 0F; this.labelContents1.Location = new System.Drawing.Point(78, 95); @@ -1366,7 +1450,7 @@ this.labelOffset20.BorderColor = System.Drawing.Color.Black; this.labelOffset20.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset20.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset20.ForeColor = System.Drawing.Color.White; + this.labelOffset20.ForeColor = System.Drawing.Color.Black; this.labelOffset20.InitVisible = true; this.labelOffset20.LineSpacing = 0F; this.labelOffset20.Location = new System.Drawing.Point(469, 225); @@ -1386,7 +1470,7 @@ this.labelOffset19.BorderColor = System.Drawing.Color.Black; this.labelOffset19.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset19.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset19.ForeColor = System.Drawing.Color.White; + this.labelOffset19.ForeColor = System.Drawing.Color.Black; this.labelOffset19.InitVisible = true; this.labelOffset19.LineSpacing = 0F; this.labelOffset19.Location = new System.Drawing.Point(469, 199); @@ -1406,7 +1490,7 @@ this.labelOffset18.BorderColor = System.Drawing.Color.Black; this.labelOffset18.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset18.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset18.ForeColor = System.Drawing.Color.White; + this.labelOffset18.ForeColor = System.Drawing.Color.Black; this.labelOffset18.InitVisible = true; this.labelOffset18.LineSpacing = 0F; this.labelOffset18.Location = new System.Drawing.Point(469, 173); @@ -1435,7 +1519,7 @@ this.labelOffset17.BorderColor = System.Drawing.Color.Black; this.labelOffset17.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset17.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset17.ForeColor = System.Drawing.Color.White; + this.labelOffset17.ForeColor = System.Drawing.Color.Black; this.labelOffset17.InitVisible = true; this.labelOffset17.LineSpacing = 0F; this.labelOffset17.Location = new System.Drawing.Point(469, 147); @@ -1455,7 +1539,7 @@ this.labelOffset16.BorderColor = System.Drawing.Color.Black; this.labelOffset16.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset16.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset16.ForeColor = System.Drawing.Color.White; + this.labelOffset16.ForeColor = System.Drawing.Color.Black; this.labelOffset16.InitVisible = true; this.labelOffset16.LineSpacing = 0F; this.labelOffset16.Location = new System.Drawing.Point(469, 121); @@ -1475,7 +1559,7 @@ this.labelOffset15.BorderColor = System.Drawing.Color.Black; this.labelOffset15.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset15.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset15.ForeColor = System.Drawing.Color.White; + this.labelOffset15.ForeColor = System.Drawing.Color.Black; this.labelOffset15.InitVisible = true; this.labelOffset15.LineSpacing = 0F; this.labelOffset15.Location = new System.Drawing.Point(469, 95); @@ -1495,7 +1579,7 @@ this.labelOffset14.BorderColor = System.Drawing.Color.Black; this.labelOffset14.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset14.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset14.ForeColor = System.Drawing.Color.White; + this.labelOffset14.ForeColor = System.Drawing.Color.Black; this.labelOffset14.InitVisible = true; this.labelOffset14.LineSpacing = 0F; this.labelOffset14.Location = new System.Drawing.Point(245, 251); @@ -1515,7 +1599,7 @@ this.labelOffset13.BorderColor = System.Drawing.Color.Black; this.labelOffset13.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset13.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset13.ForeColor = System.Drawing.Color.White; + this.labelOffset13.ForeColor = System.Drawing.Color.Black; this.labelOffset13.InitVisible = true; this.labelOffset13.LineSpacing = 0F; this.labelOffset13.Location = new System.Drawing.Point(245, 225); @@ -1535,7 +1619,7 @@ this.labelOffset12.BorderColor = System.Drawing.Color.Black; this.labelOffset12.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset12.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset12.ForeColor = System.Drawing.Color.White; + this.labelOffset12.ForeColor = System.Drawing.Color.Black; this.labelOffset12.InitVisible = true; this.labelOffset12.LineSpacing = 0F; this.labelOffset12.Location = new System.Drawing.Point(245, 199); @@ -1555,7 +1639,7 @@ this.labelOffset11.BorderColor = System.Drawing.Color.Black; this.labelOffset11.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset11.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset11.ForeColor = System.Drawing.Color.White; + this.labelOffset11.ForeColor = System.Drawing.Color.Black; this.labelOffset11.InitVisible = true; this.labelOffset11.LineSpacing = 0F; this.labelOffset11.Location = new System.Drawing.Point(245, 173); @@ -1575,7 +1659,7 @@ this.labelOffset10.BorderColor = System.Drawing.Color.Black; this.labelOffset10.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset10.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset10.ForeColor = System.Drawing.Color.White; + this.labelOffset10.ForeColor = System.Drawing.Color.Black; this.labelOffset10.InitVisible = true; this.labelOffset10.LineSpacing = 0F; this.labelOffset10.Location = new System.Drawing.Point(245, 147); @@ -1595,7 +1679,7 @@ this.labelOffset9.BorderColor = System.Drawing.Color.Black; this.labelOffset9.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset9.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset9.ForeColor = System.Drawing.Color.White; + this.labelOffset9.ForeColor = System.Drawing.Color.Black; this.labelOffset9.InitVisible = true; this.labelOffset9.LineSpacing = 0F; this.labelOffset9.Location = new System.Drawing.Point(245, 121); @@ -1615,7 +1699,7 @@ this.labelOffset8.BorderColor = System.Drawing.Color.Black; this.labelOffset8.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset8.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset8.ForeColor = System.Drawing.Color.White; + this.labelOffset8.ForeColor = System.Drawing.Color.Black; this.labelOffset8.InitVisible = true; this.labelOffset8.LineSpacing = 0F; this.labelOffset8.Location = new System.Drawing.Point(245, 95); @@ -1635,7 +1719,7 @@ this.labelOffset7.BorderColor = System.Drawing.Color.Black; this.labelOffset7.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset7.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset7.ForeColor = System.Drawing.Color.White; + this.labelOffset7.ForeColor = System.Drawing.Color.Black; this.labelOffset7.InitVisible = true; this.labelOffset7.LineSpacing = 0F; this.labelOffset7.Location = new System.Drawing.Point(21, 251); @@ -1655,7 +1739,7 @@ this.labelOffset6.BorderColor = System.Drawing.Color.Black; this.labelOffset6.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset6.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset6.ForeColor = System.Drawing.Color.White; + this.labelOffset6.ForeColor = System.Drawing.Color.Black; this.labelOffset6.InitVisible = true; this.labelOffset6.LineSpacing = 0F; this.labelOffset6.Location = new System.Drawing.Point(21, 225); @@ -1675,7 +1759,7 @@ this.labelOffset5.BorderColor = System.Drawing.Color.Black; this.labelOffset5.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset5.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset5.ForeColor = System.Drawing.Color.White; + this.labelOffset5.ForeColor = System.Drawing.Color.Black; this.labelOffset5.InitVisible = true; this.labelOffset5.LineSpacing = 0F; this.labelOffset5.Location = new System.Drawing.Point(21, 199); @@ -1695,7 +1779,7 @@ this.labelOffset4.BorderColor = System.Drawing.Color.Black; this.labelOffset4.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset4.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset4.ForeColor = System.Drawing.Color.White; + this.labelOffset4.ForeColor = System.Drawing.Color.Black; this.labelOffset4.InitVisible = true; this.labelOffset4.LineSpacing = 0F; this.labelOffset4.Location = new System.Drawing.Point(21, 173); @@ -1715,7 +1799,7 @@ this.labelOffset3.BorderColor = System.Drawing.Color.Black; this.labelOffset3.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelOffset3.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset3.ForeColor = System.Drawing.Color.White; + this.labelOffset3.ForeColor = System.Drawing.Color.Black; this.labelOffset3.InitVisible = true; this.labelOffset3.LineSpacing = 0F; this.labelOffset3.Location = new System.Drawing.Point(21, 147); @@ -1727,46 +1811,6 @@ this.labelOffset3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelOffset3.Wordwrap = false; // - // labelOffset2 - // - this.labelOffset2.BackColor = System.Drawing.Color.Black; - this.labelOffset2.BackPictureBox1 = null; - this.labelOffset2.BackPictureBox2 = this.smartGroupBox1; - this.labelOffset2.BorderColor = System.Drawing.Color.Black; - this.labelOffset2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelOffset2.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset2.ForeColor = System.Drawing.Color.White; - this.labelOffset2.InitVisible = true; - this.labelOffset2.LineSpacing = 0F; - this.labelOffset2.Location = new System.Drawing.Point(21, 121); - this.labelOffset2.Name = "labelOffset2"; - this.labelOffset2.Size = new System.Drawing.Size(51, 21); - this.labelOffset2.TabIndex = 731; - this.labelOffset2.Text = "0x000A"; - this.labelOffset2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelOffset2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelOffset2.Wordwrap = false; - // - // labelOffset1 - // - this.labelOffset1.BackColor = System.Drawing.Color.Black; - this.labelOffset1.BackPictureBox1 = null; - this.labelOffset1.BackPictureBox2 = this.smartGroupBox1; - this.labelOffset1.BorderColor = System.Drawing.Color.Black; - this.labelOffset1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelOffset1.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular); - this.labelOffset1.ForeColor = System.Drawing.Color.White; - this.labelOffset1.InitVisible = true; - this.labelOffset1.LineSpacing = 0F; - this.labelOffset1.Location = new System.Drawing.Point(21, 95); - this.labelOffset1.Name = "labelOffset1"; - this.labelOffset1.Size = new System.Drawing.Size(51, 21); - this.labelOffset1.TabIndex = 788; - this.labelOffset1.Text = "0x000A"; - this.labelOffset1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelOffset1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelOffset1.Wordwrap = false; - // // ControlMainDisplayModbus // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -1799,9 +1843,7 @@ public SmartX.SmartLabel labelAlarmStatus; public SmartX.SmartLabel labelOperationStatus; public SmartX.SmartLabel labelWeight; - public SmartX.SmartLabel labelReceiveCount; private SmartX.SmartButton buttonBypassDirection; - public SmartX.SmartLabel labelStartAddress; public SmartX.SmartLabel labelOffset2; public SmartX.SmartLabel labelOffset3; public SmartX.SmartLabel labelOffset4; @@ -1855,11 +1897,15 @@ public SmartX.SmartLabel labelTitleValue1; public SmartX.SmartLabel labelTitleContents3; public SmartX.SmartLabel labelTitleContents2; - public SmartX.SmartLabel labelTitleStartAddr; public SmartX.SmartLabel labelTitlePort; public SmartX.SmartLabel labelHelp; - public SmartX.SmartLabel labelTitleReceiveCount; public SmartX.SmartLabel labelOffset1; + public SmartX.SmartLabel labelTitleReceiveCount2; + public SmartX.SmartLabel labelTitleStartAddr2; + public SmartX.SmartLabel labelTitleReceiveCount1; + public SmartX.SmartLabel labelTitleStartAddr1; + public SmartX.SmartLabel labelStartAddress; + public SmartX.SmartLabel labelReceiveCount; } } diff --git a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayModbus.cs b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayModbus.cs index cb271b9..b9e2c41 100644 --- a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayModbus.cs +++ b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayModbus.cs @@ -23,6 +23,7 @@ namespace ITC81DB_0H.Controls private static int ModbusCount = 20; private Collection CollectionOffset; + private Collection CollectionContents; #endregion #region Constructor @@ -48,19 +49,22 @@ namespace ITC81DB_0H.Controls #region Method public void InitializeDesign() { - Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { #region 영문 this.labelTitlePort.Text = "Port"; - this.labelTitleStartAddr.Text = "Start Addr"; - this.labelTitleReceiveCount.Text = "Receive"; + this.labelTitleStartAddr1.Text = "Start"; + this.labelTitleStartAddr2.Text = "Address"; + this.labelTitleReceiveCount1.Text = "Receive"; + this.labelTitleReceiveCount2.Text = "Count"; this.labelTitleOffset1.Text = this.labelTitleOffset2.Text = this.labelTitleOffset3.Text = "Offset"; this.labelTitleContents1.Text = this.labelTitleContents2.Text = this.labelTitleContents3.Text = "Contents"; this.labelTitleValue1.Text = this.labelTitleValue2.Text = this.labelTitleValue3.Text = "Value"; + for (int i = 1; i <= ModbusCount; i++) + this.CollectionOffset[i - 1].Font = new Font("새굴림", 9, FontStyle.Regular); + this.labelContents1.Text = "Update Flag"; this.labelContents2.Text = "Equip-ID"; this.labelContents3.Text = "Current No."; @@ -88,154 +92,179 @@ namespace ITC81DB_0H.Controls else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { #region 중문 - this.labelTitlePort.Text = "Port"; - this.labelTitleStartAddr.Text = "Start Addr"; - this.labelTitleReceiveCount.Text = "Receive"; + this.labelTitlePort.Text = "端口"; + this.labelTitleStartAddr1.Text = "起始"; + this.labelTitleStartAddr2.Text = "地址"; + this.labelTitleReceiveCount1.Text = "接收"; + this.labelTitleReceiveCount2.Text = "计数"; - this.labelTitleOffset1.Text = this.labelTitleOffset2.Text = this.labelTitleOffset3.Text = "Offset"; - this.labelTitleContents1.Text = this.labelTitleContents2.Text = this.labelTitleContents3.Text = "Contents"; - this.labelTitleValue1.Text = this.labelTitleValue2.Text = this.labelTitleValue3.Text = "Value"; + this.labelTitleOffset1.Text = this.labelTitleOffset2.Text = this.labelTitleOffset3.Text = "抵消"; + this.labelTitleContents1.Text = this.labelTitleContents2.Text = this.labelTitleContents3.Text = "物品"; + this.labelTitleValue1.Text = this.labelTitleValue2.Text = this.labelTitleValue3.Text = "值"; - this.labelContents1.Text = "Update Flag"; - this.labelContents2.Text = "Equip-ID"; - this.labelContents3.Text = "Current No."; - this.labelContents4.Text = "Under Value"; - this.labelContents5.Text = "Pass Value"; - this.labelContents6.Text = "Over Value"; - this.labelContents7.Text = "Tare Value"; - this.labelContents8.Text = "Under Count"; - this.labelContents9.Text = "Pass Count"; - this.labelContents10.Text = "Over Count"; - this.labelContents11.Text = "Faulty Count"; - this.labelContents12.Text = "ExNG Count"; - this.labelContents13.Text = "Total Count"; - this.labelContents14.Text = "Grade"; - this.labelContents15.Text = "Weight"; - this.labelContents16.Text = "Operation"; - this.labelContents17.Text = "Alarm"; - this.labelContents18.Text = "Speed(ea/m)"; - this.labelContents19.Text = "Metal Count"; - this.labelContents20.Text = "Double Count"; + for (int i = 1; i <= ModbusCount; i++) + this.CollectionOffset[i - 1].Font = new Font("새굴림", 9, FontStyle.Regular); - this.labelHelp.Text = "※ Grade 0:Over, 1:Pass, 2:Under, 3:Metal, 4:Double, 5:ETC"; + this.labelContents1.Text = "更新旗帜"; + this.labelContents2.Text = "设备编号"; + this.labelContents3.Text = "当前号码"; + this.labelContents4.Text = "下限"; + this.labelContents5.Text = "标准"; + this.labelContents6.Text = "上限"; + this.labelContents7.Text = "皮重"; + this.labelContents8.Text = "下限计数"; + this.labelContents9.Text = "标准计数"; + this.labelContents10.Text = "上限计数"; + this.labelContents11.Text = "剔除计数"; + this.labelContents12.Text = "其他不良计数"; + this.labelContents13.Text = "总共计数"; + this.labelContents14.Text = "等级"; + this.labelContents15.Text = "目前的体重"; + this.labelContents16.Text = "运行状态"; + this.labelContents17.Text = "报警状态"; + this.labelContents18.Text = "速度(个/分钟)"; + this.labelContents19.Text = "金属计数"; + this.labelContents20.Text = "双重计数"; + + this.labelHelp.Text = "※ 等级 0:上限, 1:标准, 2:下限, 3:金属, 4:双重, 5:等等"; #endregion } else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { #region 체코어 this.labelTitlePort.Text = "Port"; - this.labelTitleStartAddr.Text = "Start Addr"; - this.labelTitleReceiveCount.Text = "Receive"; + this.labelTitleStartAddr1.Text = "Počáteční"; + this.labelTitleStartAddr2.Text = "adresa"; + this.labelTitleReceiveCount1.Text = "Příjem"; + this.labelTitleReceiveCount2.Text = "Count"; this.labelTitleOffset1.Text = this.labelTitleOffset2.Text = this.labelTitleOffset3.Text = "Offset"; - this.labelTitleContents1.Text = this.labelTitleContents2.Text = this.labelTitleContents3.Text = "Contents"; - this.labelTitleValue1.Text = this.labelTitleValue2.Text = this.labelTitleValue3.Text = "Value"; + this.labelTitleContents1.Text = this.labelTitleContents2.Text = this.labelTitleContents3.Text = "Položka"; + this.labelTitleValue1.Text = this.labelTitleValue2.Text = this.labelTitleValue3.Text = "Hodnota"; - this.labelContents1.Text = "Update Flag"; - this.labelContents2.Text = "Equip-ID"; - this.labelContents3.Text = "Current No."; - this.labelContents4.Text = "Under Value"; - this.labelContents5.Text = "Pass Value"; - this.labelContents6.Text = "Over Value"; - this.labelContents7.Text = "Tare Value"; - this.labelContents8.Text = "Under Count"; - this.labelContents9.Text = "Pass Count"; - this.labelContents10.Text = "Over Count"; - this.labelContents11.Text = "Faulty Count"; - this.labelContents12.Text = "ExNG Count"; - this.labelContents13.Text = "Total Count"; - this.labelContents14.Text = "Grade"; - this.labelContents15.Text = "Weight"; - this.labelContents16.Text = "Operation"; - this.labelContents17.Text = "Alarm"; - this.labelContents18.Text = "Speed(ea/m)"; - this.labelContents19.Text = "Metal Count"; - this.labelContents20.Text = "Double Count"; + for (int i = 1; i <= ModbusCount; i++) + this.CollectionOffset[i - 1].Font = new Font("새굴림", 8, FontStyle.Regular); - this.labelHelp.Text = "※ Grade 0:Over, 1:Pass, 2:Under, 3:Metal, 4:Double, 5:ETC"; + this.labelContents1.Text = "Aktualizovat příznak"; + this.labelContents2.Text = "ID zařízení"; + this.labelContents3.Text = "Aktuální číslo"; + this.labelContents4.Text = "Min."; + this.labelContents5.Text = "Váha"; + this.labelContents6.Text = "Max."; + this.labelContents7.Text = "Tára"; + this.labelContents8.Text = "Min. Počítat"; + this.labelContents9.Text = "Váha Počítat"; + this.labelContents10.Text = "Max. Počítat"; + this.labelContents11.Text = "Vadný Počítat"; + this.labelContents12.Text = "Jiné vadné Počítat"; + this.labelContents13.Text = "Celkový součet"; + this.labelContents14.Text = "Stupnice"; + this.labelContents15.Text = "Aktuální hmotnost"; + this.labelContents16.Text = "Provozní stav"; + this.labelContents17.Text = "Stav alarmu"; + this.labelContents18.Text = "Rychlost (ea/min)"; + this.labelContents19.Text = "Kovový hrabě"; + this.labelContents20.Text = "Dvojitý počet"; + + this.labelHelp.Text = "※ Stupnice 0:Max., 1:Váha, 2:Min., 3:Metal, 4:Dvojitý, 5:Ostatní"; #endregion } else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Russian) { #region 러시아어 - this.labelTitlePort.Text = "Port"; - this.labelTitleStartAddr.Text = "Start Addr"; - this.labelTitleReceiveCount.Text = "Receive"; + this.labelTitlePort.Text = "Порт"; + this.labelTitleStartAddr1.Text = "Начальный"; + this.labelTitleStartAddr2.Text = "адрес"; + this.labelTitleReceiveCount1.Text = "Счетчик"; + this.labelTitleReceiveCount2.Text = "приема"; - this.labelTitleOffset1.Text = this.labelTitleOffset2.Text = this.labelTitleOffset3.Text = "Offset"; - this.labelTitleContents1.Text = this.labelTitleContents2.Text = this.labelTitleContents3.Text = "Contents"; - this.labelTitleValue1.Text = this.labelTitleValue2.Text = this.labelTitleValue3.Text = "Value"; + this.labelTitleOffset1.Text = this.labelTitleOffset2.Text = this.labelTitleOffset3.Text = "Oфсетный"; + this.labelTitleContents1.Text = this.labelTitleContents2.Text = this.labelTitleContents3.Text = "Элемент"; + this.labelTitleValue1.Text = this.labelTitleValue2.Text = this.labelTitleValue3.Text = "Ценить"; - this.labelContents1.Text = "Update Flag"; - this.labelContents2.Text = "Equip-ID"; - this.labelContents3.Text = "Current No."; - this.labelContents4.Text = "Under Value"; - this.labelContents5.Text = "Pass Value"; - this.labelContents6.Text = "Over Value"; - this.labelContents7.Text = "Tare Value"; - this.labelContents8.Text = "Under Count"; - this.labelContents9.Text = "Pass Count"; - this.labelContents10.Text = "Over Count"; - this.labelContents11.Text = "Faulty Count"; - this.labelContents12.Text = "ExNG Count"; - this.labelContents13.Text = "Total Count"; - this.labelContents14.Text = "Grade"; - this.labelContents15.Text = "Weight"; - this.labelContents16.Text = "Operation"; - this.labelContents17.Text = "Alarm"; - this.labelContents18.Text = "Speed(ea/m)"; - this.labelContents19.Text = "Metal Count"; - this.labelContents20.Text = "Double Count"; + for (int i = 1; i <= ModbusCount; i++) + this.CollectionOffset[i - 1].Font = new Font("새굴림", 8, FontStyle.Regular); - this.labelHelp.Text = "※ Grade 0:Over, 1:Pass, 2:Under, 3:Metal, 4:Double, 5:ETC"; + this.labelContents1.Text = "Обновить флаг"; + this.labelContents2.Text = "ID оборудования"; + this.labelContents3.Text = "Текущий номер"; + this.labelContents4.Text = "Мало"; + this.labelContents5.Text = "Норма"; + this.labelContents6.Text = "Много"; + this.labelContents7.Text = "Тара"; + this.labelContents8.Text = "Мало счет"; + this.labelContents9.Text = "Норма счет"; + this.labelContents10.Text = "Много счет"; + this.labelContents11.Text = "Дефект счет"; + this.labelContents12.Text = "Другие дефект счет"; + this.labelContents13.Text = "Итого"; + this.labelContents14.Text = "Сортировка"; + this.labelContents15.Text = "Нынешний вес"; + this.labelContents16.Text = "Статус работы"; + this.labelContents17.Text = "Состояние тревоги"; + this.labelContents18.Text = "Скорость(ea/m)"; + this.labelContents19.Text = "Металлов счет"; + this.labelContents20.Text = "Двойной счет"; + + this.labelHelp.Text = "※ Сортировка 0:Много, 1:Норма, 2:Мало, 3:Металл, 4:Двойной, 5:и т.д."; #endregion } else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.German) { #region 독일어 this.labelTitlePort.Text = "Port"; - this.labelTitleStartAddr.Text = "Start Addr"; - this.labelTitleReceiveCount.Text = "Receive"; + this.labelTitleStartAddr1.Text = "Start-"; + this.labelTitleStartAddr2.Text = "adresse"; + this.labelTitleReceiveCount1.Text = "Anzahl"; + this.labelTitleReceiveCount2.Text = "empfangen"; - this.labelTitleOffset1.Text = this.labelTitleOffset2.Text = this.labelTitleOffset3.Text = "Offset"; - this.labelTitleContents1.Text = this.labelTitleContents2.Text = this.labelTitleContents3.Text = "Contents"; - this.labelTitleValue1.Text = this.labelTitleValue2.Text = this.labelTitleValue3.Text = "Value"; + this.labelTitleOffset1.Text = this.labelTitleOffset2.Text = this.labelTitleOffset3.Text = "Ausgleichen"; + this.labelTitleContents1.Text = this.labelTitleContents2.Text = this.labelTitleContents3.Text = "Artikel"; + this.labelTitleValue1.Text = this.labelTitleValue2.Text = this.labelTitleValue3.Text = "Wert"; - this.labelContents1.Text = "Update Flag"; - this.labelContents2.Text = "Equip-ID"; - this.labelContents3.Text = "Current No."; - this.labelContents4.Text = "Under Value"; - this.labelContents5.Text = "Pass Value"; - this.labelContents6.Text = "Over Value"; - this.labelContents7.Text = "Tare Value"; - this.labelContents8.Text = "Under Count"; - this.labelContents9.Text = "Pass Count"; - this.labelContents10.Text = "Over Count"; - this.labelContents11.Text = "Faulty Count"; - this.labelContents12.Text = "ExNG Count"; - this.labelContents13.Text = "Total Count"; - this.labelContents14.Text = "Grade"; - this.labelContents15.Text = "Weight"; - this.labelContents16.Text = "Operation"; - this.labelContents17.Text = "Alarm"; - this.labelContents18.Text = "Speed(ea/m)"; - this.labelContents19.Text = "Metal Count"; - this.labelContents20.Text = "Double Count"; + for (int i = 1; i <= ModbusCount; i++) + this.CollectionOffset[i - 1].Font = new Font("새굴림", 8, FontStyle.Regular); - this.labelHelp.Text = "※ Grade 0:Over, 1:Pass, 2:Under, 3:Metal, 4:Double, 5:ETC"; + this.labelContents1.Text = "Flag aktualisieren"; + this.labelContents2.Text = "ID-Vorrichtung"; + this.labelContents3.Text = "Aktuelle Nummer"; + this.labelContents4.Text = "Min. "; + this.labelContents5.Text = "Bestehen"; + this.labelContents6.Text = "Max."; + this.labelContents7.Text = "Tara"; + this.labelContents8.Text = "Min. Zahl"; + this.labelContents9.Text = "Bestehen Zahl"; + this.labelContents10.Text = "Max. Zahl"; + this.labelContents11.Text = "Schlecht Zahl"; + this.labelContents12.Text = "Andere Schlecht Zahl"; + this.labelContents13.Text = "Komplette Anzahl"; + this.labelContents14.Text = "Grad"; + this.labelContents15.Text = "Aktuelles Gewicht"; + this.labelContents16.Text = "Betriebsstatus"; + this.labelContents17.Text = "Alarmstatus"; + this.labelContents18.Text = "Geschwindigkeit"; + this.labelContents19.Text = "Metallanzahl"; + this.labelContents20.Text = "Doppelte Zählung"; + + this.labelHelp.Text = "※ Grad 0:Max., 1:Bestehen, 2:Min., 3:Metall, 4:Doppelte Eingabe, 5:Usw."; #endregion } else { #region 한글 this.labelTitlePort.Text = "Port"; - this.labelTitleStartAddr.Text = "Start Addr"; - this.labelTitleReceiveCount.Text = "Receive"; + this.labelTitleStartAddr1.Text = "Start"; + this.labelTitleStartAddr2.Text = "Address"; + this.labelTitleReceiveCount1.Text = "Receive"; + this.labelTitleReceiveCount2.Text = "Count"; this.labelTitleOffset1.Text = this.labelTitleOffset2.Text = this.labelTitleOffset3.Text = "Offset"; this.labelTitleContents1.Text = this.labelTitleContents2.Text = this.labelTitleContents3.Text = "항목"; this.labelTitleValue1.Text = this.labelTitleValue2.Text = this.labelTitleValue3.Text = "Value"; + for (int i = 1; i <= ModbusCount; i++) + this.CollectionOffset[i - 1].Font = new Font("새굴림", 9, FontStyle.Regular); + this.labelContents1.Text = "갱신 Flag"; this.labelContents2.Text = "장비 ID"; this.labelContents3.Text = "현재 품번"; @@ -286,6 +315,29 @@ namespace ITC81DB_0H.Controls this.CollectionOffset.Add(this.labelOffset19); this.CollectionOffset.Add(this.labelOffset20); + this.CollectionContents = new Collection(); + this.CollectionContents.Clear(); + this.CollectionContents.Add(this.labelContents1); + this.CollectionContents.Add(this.labelContents2); + this.CollectionContents.Add(this.labelContents3); + this.CollectionContents.Add(this.labelContents4); + this.CollectionContents.Add(this.labelContents5); + this.CollectionContents.Add(this.labelContents6); + this.CollectionContents.Add(this.labelContents7); + this.CollectionContents.Add(this.labelContents8); + this.CollectionContents.Add(this.labelContents9); + this.CollectionContents.Add(this.labelContents10); + this.CollectionContents.Add(this.labelContents11); + this.CollectionContents.Add(this.labelContents12); + this.CollectionContents.Add(this.labelContents13); + this.CollectionContents.Add(this.labelContents14); + this.CollectionContents.Add(this.labelContents15); + this.CollectionContents.Add(this.labelContents16); + this.CollectionContents.Add(this.labelContents17); + this.CollectionContents.Add(this.labelContents18); + this.CollectionContents.Add(this.labelContents19); + this.CollectionContents.Add(this.labelContents20); + this.buttonBypassDirection.ButtonUp(); this.ReceiveCount = 0; @@ -316,6 +368,10 @@ namespace ITC81DB_0H.Controls this.labelDouble.Text = ""; } + public void Clear() + { + this.UpdateData(this.ParentForm.ParentForm.Current30000ModbusData); + } public void UpdateEquipmentStatusDisplay(Define.E_EquipmentStatus status) { diff --git a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStart.cs b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStart.cs index 4ecab09..5041269 100644 --- a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStart.cs +++ b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStart.cs @@ -441,7 +441,7 @@ namespace ITC81DB_0H.Controls this.ParentForm.RescaleControl(this.ParentForm.ParentForm.CurrentProductItem); this.ParentForm.ParentForm.SaveProductFile(this.ParentForm.ParentForm.CurrentProductItem, this.ParentForm.ParentForm.SystemConfig1.ProductNumber - 1); - if (this.ParentForm.MainDisplayFeedback.IsUsingFeedback() == true) + if (this.ParentForm.MainFeedback.IsUsingFeedback() == true) { string feedbackValue = ""; @@ -554,7 +554,7 @@ namespace ITC81DB_0H.Controls break; } - if (this.ParentForm.ParentForm.ChildFormMainDisplay.MainDisplayFeedback.IsUsingFeedback() == true) + if (this.ParentForm.ParentForm.ChildFormMainDisplay.MainFeedback.IsUsingFeedback() == true) this.ParentForm.ParentForm.UpdateFeedbackData(this.ParentForm.ParentForm.CurrentProductItem, this.ParentForm.ParentForm.CurrentSystemParameter2); after = this.buttonPassRange.Text = myKeyPad.StringValue; @@ -636,7 +636,7 @@ namespace ITC81DB_0H.Controls this.ParentForm.ParentForm.SaveProductFile(this.ParentForm.ParentForm.CurrentProductItem, this.ParentForm.ParentForm.SystemConfig1.ProductNumber - 1); - if (this.ParentForm.MainDisplayFeedback.IsUsingFeedback() == true) + if (this.ParentForm.MainFeedback.IsUsingFeedback() == true) { string feedbackValue = ""; @@ -689,8 +689,8 @@ namespace ITC81DB_0H.Controls this.ParentForm.ParentForm.SaveProductFile(this.ParentForm.ParentForm.CurrentProductItem, this.ParentForm.ParentForm.SystemConfig1.ProductNumber - 1); // NET Icon 표시 - this.ParentForm.MainDisplayWeightBigScreen.SetIconNET(this.ParentForm.ParentForm.CurrentProductItem); - this.ParentForm.MainDisplayWeightSmall.SetIconNET(this.ParentForm.ParentForm.CurrentProductItem); + this.ParentForm.MainWeightBigScreen.SetIconNET(this.ParentForm.ParentForm.CurrentProductItem); + this.ParentForm.MainWeightSmall.SetIconNET(this.ParentForm.ParentForm.CurrentProductItem); this.ParentForm.ParentForm.Update30000ModbusItem(); value = Helper.StringZeroFillDigits7(this.ParentForm.ParentForm.CurrentProductItem.TareRange); diff --git a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStartGrapht.cs b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStartGrapht.cs index eedf03b..e6fe7ed 100644 --- a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStartGrapht.cs +++ b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStartGrapht.cs @@ -365,7 +365,7 @@ namespace ITC81DB_0H.Controls this.ParentForm.RescaleControl(this.ParentForm.ParentForm.CurrentProductItem); - if (this.ParentForm.MainDisplayFeedback.IsUsingFeedback() == true) + if (this.ParentForm.MainFeedback.IsUsingFeedback() == true) { string feedbackValue = ""; @@ -488,7 +488,7 @@ namespace ITC81DB_0H.Controls break; } - if (this.ParentForm.ParentForm.ChildFormMainDisplay.MainDisplayFeedback.IsUsingFeedback() == true) + if (this.ParentForm.ParentForm.ChildFormMainDisplay.MainFeedback.IsUsingFeedback() == true) this.ParentForm.ParentForm.UpdateFeedbackData(this.ParentForm.ParentForm.CurrentProductItem, this.ParentForm.ParentForm.CurrentSystemParameter2); after = this.buttonPassRange.Text = myKeyPad.StringValue; @@ -578,7 +578,7 @@ namespace ITC81DB_0H.Controls this.ParentForm.ParentForm.SaveProductFile(this.ParentForm.ParentForm.CurrentProductItem, this.ParentForm.ParentForm.SystemConfig1.ProductNumber - 1); - if (this.ParentForm.MainDisplayFeedback.IsUsingFeedback() == true) + if (this.ParentForm.MainFeedback.IsUsingFeedback() == true) { string feedbackValue = ""; diff --git a/ITC81DB_0H/Forms/FormMain.Designer.cs b/ITC81DB_0H/Forms/FormMain.Designer.cs index 258d138..c646ccd 100644 --- a/ITC81DB_0H/Forms/FormMain.Designer.cs +++ b/ITC81DB_0H/Forms/FormMain.Designer.cs @@ -48,6 +48,7 @@ this.timerUserList = new System.Windows.Forms.Timer(); this.smartThreadSerialPort2OverRun = new SmartX.SmartThread(this.components); this.smartThreadSerialPort2Read = new SmartX.SmartThread(this.components); + this.timerClientTryConnect = new System.Windows.Forms.Timer(); ((System.ComponentModel.ISupportInitialize)(this.smartForm)).BeginInit(); this.SuspendLayout(); // @@ -165,6 +166,7 @@ // smartThread // this.smartThread.Priority = System.Threading.ThreadPriority.Normal; + this.smartThread.WorkerReportsProgress = false; this.smartThread.UIThreadFunction += new SmartX.SmartThread.UIThreadHandler(this.smartThread_UIThreadFunction); // // smartTCPMultiServer @@ -215,13 +217,20 @@ // smartThreadSerialPort2OverRun // this.smartThreadSerialPort2OverRun.Priority = System.Threading.ThreadPriority.Normal; + this.smartThreadSerialPort2OverRun.WorkerReportsProgress = false; this.smartThreadSerialPort2OverRun.UIThreadFunction += new SmartX.SmartThread.UIThreadHandler(this.smartThreadSerialPort2Read_UIThreadFunction); // // smartThreadSerialPort2Read // this.smartThreadSerialPort2Read.Priority = System.Threading.ThreadPriority.Normal; + this.smartThreadSerialPort2Read.WorkerReportsProgress = false; this.smartThreadSerialPort2Read.UIThreadFunction += new SmartX.SmartThread.UIThreadHandler(this.smartThreadSerialPort2Read_UIThreadFunction); // + // timerClientTryConnect + // + this.timerClientTryConnect.Interval = 2000; + this.timerClientTryConnect.Tick += new System.EventHandler(this.timerClientTryConnect_Tick); + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -257,6 +266,7 @@ private System.Windows.Forms.Timer timerUserList; private SmartX.SmartThread smartThreadSerialPort2OverRun; private SmartX.SmartThread smartThreadSerialPort2Read; + private System.Windows.Forms.Timer timerClientTryConnect; } } diff --git a/ITC81DB_0H/Forms/FormMain.cs b/ITC81DB_0H/Forms/FormMain.cs index ea438fc..39987f0 100644 --- a/ITC81DB_0H/Forms/FormMain.cs +++ b/ITC81DB_0H/Forms/FormMain.cs @@ -25,8 +25,8 @@ namespace ITC81DB_0H.Forms public partial class FormMain : Form { #region Field - public static string DisplayVersion = "3.3.1"; - public static string ReleaseDate = "2024.02.07"; + public static string DisplayVersion = "3.3.2"; + public static string ReleaseDate = "2024.02.22"; private SmartSplash SmartSplashProgramLoad; public bool IsCommunicationLogOpen; @@ -221,6 +221,7 @@ namespace ITC81DB_0H.Forms private delegate void TextStatusCallback(string strtext); private delegate void UIControlCallback(bool bEnable); private delegate void UIServerStatusCallback(bool bEnable); + private delegate void TimerTryConnectCallback(bool bEnable); public event Define.EventHandlerAlarmStateChange EventAlarmStateChange; #endregion @@ -1494,7 +1495,7 @@ namespace ITC81DB_0H.Forms private void UpdateScreen() { - if (this.ChildFormMainDisplay.MainDisplayFeedback.IsUsingFeedback() == true) + if (this.ChildFormMainDisplay.MainFeedback.IsUsingFeedback() == true) { this.UpdateFeedbackData(this.CurrentProductItem, this.CurrentSystemParameter2); this.UpdateFeedbackDeviation(this.CurrentProductItem, this.CurrentSystemParameter2); @@ -1530,7 +1531,7 @@ namespace ITC81DB_0H.Forms // 피드백 데이터(피드백 편차 변경 X) public void UpdateFeedbackData(ProductItem item, SystemParameter2 parameter) { - if (this.ChildFormMainDisplay.MainDisplayFeedback.IsUsingFeedback() == true) + if (this.ChildFormMainDisplay.MainFeedback.IsUsingFeedback() == true) { int temp = 0; string feedbackValue = ""; @@ -1571,19 +1572,19 @@ namespace ITC81DB_0H.Forms this.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.OPT1UnderRange, feedbackValue); } - this.ChildFormMainDisplay.MainDisplayFeedback.DisplayRefresh(this.CurrentSystemStatus); + this.ChildFormMainDisplay.MainFeedback.DisplayRefresh(this.CurrentSystemStatus); } public void UpdateFeedbackDeviation(ProductItem item, SystemParameter2 parameter) { string sValue = ""; - sValue = this.ChildFormMainDisplay.MainDisplayFeedback.CaculateDeviation(parameter.OPT1OverRangeInt); + sValue = this.ChildFormMainDisplay.MainFeedback.CaculateDeviation(parameter.OPT1OverRangeInt); this.CurrentFeedbackItem.OverRangeDeviation = sValue; - sValue = this.ChildFormMainDisplay.MainDisplayFeedback.CaculateDeviation(parameter.OPT1UnderRangeInt); + sValue = this.ChildFormMainDisplay.MainFeedback.CaculateDeviation(parameter.OPT1UnderRangeInt); this.CurrentFeedbackItem.UnderRangeDeviation = sValue; - this.ChildFormMainDisplay.MainDisplayFeedback.DisplayRefresh(this.CurrentSystemStatus); + this.ChildFormMainDisplay.MainFeedback.DisplayRefresh(this.CurrentSystemStatus); } // PreVersionBackup\\ 폴더 체크 @@ -2193,8 +2194,8 @@ namespace ITC81DB_0H.Forms this.IsLampOnDataSend = false; this.IsBuzzerOnDataSend = false; - if (this.ChildFormMainDisplay.MainDisplayFeedback.IsUsingFeedback() == true) - this.ChildFormMainDisplay.MainDisplayFeedback.ItemChangeEnable(false); + if (this.ChildFormMainDisplay.MainFeedback.IsUsingFeedback() == true) + this.ChildFormMainDisplay.MainFeedback.ItemChangeEnable(false); #endregion break; case "CBT": @@ -2276,8 +2277,8 @@ namespace ITC81DB_0H.Forms this.CollectionBufferWeightData.Clear(); } - if (this.ChildFormMainDisplay.MainDisplayFeedback.IsUsingFeedback() == true) - this.ChildFormMainDisplay.MainDisplayFeedback.ItemChangeEnable(true); + if (this.ChildFormMainDisplay.MainFeedback.IsUsingFeedback() == true) + this.ChildFormMainDisplay.MainFeedback.ItemChangeEnable(true); #endregion break; case "CBE": @@ -2605,7 +2606,7 @@ namespace ITC81DB_0H.Forms if (this.SystemConfig2.EthernetOperationMode == 1 && this.smartTCPMultiServer.IsStart == true) this.ChildFormMainDisplay.TimerServer(true); - if (this.ChildFormMainDisplay.MainDisplayFeedback.IsUsingFeedback() == true) + if (this.ChildFormMainDisplay.MainFeedback.IsUsingFeedback() == true) { this.UpdateFeedbackData(this.CurrentProductItem, this.CurrentSystemParameter2); this.UpdateFeedbackDeviation(this.CurrentProductItem, this.CurrentSystemParameter2); @@ -4015,8 +4016,8 @@ namespace ITC81DB_0H.Forms } #endregion - this.ChildFormMainDisplay.MainDisplayWeightBigScreen.UpdateAlarmLabelDisplay(this.CountingOutput1Count, this.CountingOutput2Count); - this.ChildFormMainDisplay.MainDisplayWeightSmall.UpdateAlarmLabelDisplay(this.CountingOutput1Count, this.CountingOutput2Count); + this.ChildFormMainDisplay.MainWeightBigScreen.UpdateAlarmLabelDisplay(this.CountingOutput1Count, this.CountingOutput2Count); + this.ChildFormMainDisplay.MainWeightSmall.UpdateAlarmLabelDisplay(this.CountingOutput1Count, this.CountingOutput2Count); #endregion // CurrentDisplay @@ -4253,7 +4254,7 @@ namespace ITC81DB_0H.Forms this.CurrentFeedbackItem.Sign = receiveData.Substring(8, 1); this.CurrentFeedbackItem.FeedbackWeight = receiveData.Substring(9, 7); #endregion - this.ChildFormMainDisplay.MainDisplayFeedback.UpdateDisplayCurrentValue(this.CurrentFeedbackItem); + this.ChildFormMainDisplay.MainFeedback.UpdateDisplayCurrentValue(this.CurrentFeedbackItem); break; default: break; @@ -7180,7 +7181,7 @@ namespace ITC81DB_0H.Forms for (int i = 0; i < productName.Length; i++) this.Current30000ModbusData.ProductName[i] = productName[i]; - this.ChildFormMainDisplay.MainDisplayModbus.UpdateData(this.Current30000ModbusData); + this.ChildFormMainDisplay.MainModbus.UpdateData(this.Current30000ModbusData); } /// /// Modbus RTU - Write Multiple Register에 대한 Manage 메소드 @@ -7946,7 +7947,6 @@ namespace ITC81DB_0H.Forms { this.IsUsingTimerEthernetPing(false); - this.IsEthernetThreadStop = true; this.DelegateUISeverStatus(false); if (null != this.EthernetStmReader) this.EthernetStmReader.Close(); @@ -7959,6 +7959,13 @@ namespace ITC81DB_0H.Forms if (null != this.EthernetTcpClient) this.EthernetTcpClient.Close(); + + this.IsEthernetThreadStop = true; + this.DelegateTextStatusOut(">Disconnected"); + + if (this.CurrentSystemStatus.Equipment == Define.E_EquipmentStatus.Start + && this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.MainDisplay) + this.DelegateTimerTryConnect(true); } private void EthernetClientReceiveThread() @@ -7994,25 +8001,11 @@ namespace ITC81DB_0H.Forms while (this.IsEthernetThreadStop == false) { - string strRecvMsg = ""; - char[] datas = new char[12]; - int sum = 0; - - this.EthernetStmReader.Read(datas, 0, datas.Length); - for (int i = 0; i < datas.Length; i++) - sum += datas[i]; - if (sum == 0) - return; - - strRecvMsg = BitConverter.ToString(Encoding.UTF8.GetBytes(datas)); - - if (this.IsCommunicationLogOpen == true) - this.smartFileCommunicationLog.WriteString(string.Format("EthernetClientReceiveThread Receive ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, strRecvMsg)); + string strRecvMsg = this.EthernetStmReader.ReadLine(); if (null == strRecvMsg) { this.DelegateTextStatusOut(">Server Out"); - this.SetTrackingHistoryData(Define.E_TrackingOperation.EthernetDisconnect, "Client"); this.IsEthernetThreadStop = true; break; } @@ -8026,21 +8019,7 @@ namespace ITC81DB_0H.Forms } finally { - this.IsEthernetThreadStop = true; - this.DelegateUISeverStatus(false); - this.DelegateTextStatusOut(">Disconnected Server"); - this.SetTrackingHistoryData(Define.E_TrackingOperation.EthernetDisconnect, "Client"); - if (null != this.EthernetStmReader) - this.EthernetStmReader.Close(); - - if (null != this.EthernetStmWriter) - this.EthernetStmWriter.Close(); - - if (null != this.EthernetNetStream) - this.EthernetNetStream.Close(); - - if (null != this.EthernetTcpClient) - this.EthernetTcpClient.Close(); + this.EthernetClientDisconnect(); } return; @@ -8065,6 +8044,15 @@ namespace ITC81DB_0H.Forms this.Invoke(new TextStatusCallback(this.TextStatusOut), value); } + private void TimerTryConnect(bool status) + { + this.timerClientTryConnect.Enabled = status; + } + private void DelegateTimerTryConnect(bool status) + { + this.Invoke(new TimerTryConnectCallback(this.TimerTryConnect), status); + } + private void DelegateTransferData(string data) { this.Invoke(new TransferDataCollbaack(this.EthernetSendMessage), data); @@ -8221,8 +8209,8 @@ namespace ITC81DB_0H.Forms this.CountingOutput2Count = 0; } - this.ChildFormMainDisplay.MainDisplayWeightBigScreen.UpdateAlarmLabelDisplay(this.CountingOutput1Count, this.CountingOutput2Count); - this.ChildFormMainDisplay.MainDisplayWeightSmall.UpdateAlarmLabelDisplay(this.CountingOutput1Count, this.CountingOutput2Count); + this.ChildFormMainDisplay.MainWeightBigScreen.UpdateAlarmLabelDisplay(this.CountingOutput1Count, this.CountingOutput2Count); + this.ChildFormMainDisplay.MainWeightSmall.UpdateAlarmLabelDisplay(this.CountingOutput1Count, this.CountingOutput2Count); } #endregion @@ -13043,7 +13031,7 @@ namespace ITC81DB_0H.Forms break; case (int)Define.E_CommMode.f22_Modbus: #region Modbus RTU - this.ChildFormMainDisplay.MainDisplayModbus.UpdateReceiveCount(); + this.ChildFormMainDisplay.MainModbus.UpdateReceiveCount(); if (this.SystemConfig2.ModbusSlaveIDCOM1 != Convert.ToInt32(readByte[0])) return; @@ -13381,7 +13369,7 @@ namespace ITC81DB_0H.Forms break; case (int)Define.E_CommMode.f22_Modbus: #region Modbus RTU - this.ChildFormMainDisplay.MainDisplayModbus.UpdateReceiveCount(); + this.ChildFormMainDisplay.MainModbus.UpdateReceiveCount(); if (this.SystemConfig2.ModbusSlaveIDCOM3 != Convert.ToInt32(readByte[0])) return; @@ -13723,7 +13711,7 @@ namespace ITC81DB_0H.Forms break; case (int)Define.E_CommMode.f22_Modbus: #region Modbus RTU - this.ChildFormMainDisplay.MainDisplayModbus.UpdateReceiveCount(); + this.ChildFormMainDisplay.MainModbus.UpdateReceiveCount(); if (this.SystemConfig2.ModbusSlaveIDCOM4 != Convert.ToInt32(readByte[0])) return; @@ -14006,7 +13994,7 @@ namespace ITC81DB_0H.Forms #region Modbus TCP if (this.smartTCPMultiServer.ClientInfoList != null) { - this.ChildFormMainDisplay.MainDisplayModbus.UpdateReceiveCount(); + this.ChildFormMainDisplay.MainModbus.UpdateReceiveCount(); if (readByte[7] == 0x03) // Read Holding Register { @@ -14391,6 +14379,11 @@ namespace ITC81DB_0H.Forms else this.ChildFormMenu.CenterEquipUpdate.UpdateMainBoardFail(this.SystemConfig1.Language); } + private void timerClientTryConnect_Tick(object sender, EventArgs e) + { + this.DelegateTimerTryConnect(false); + this.EthernetClientConnect(); + } private void smartTCPMultiServer_OnClientAdd(SmartTCPMultiServer.CLIENTSINFOS addClientInfo) { @@ -14683,6 +14676,7 @@ namespace ITC81DB_0H.Forms this.ChildFormMenu.CenterInforSystem.UpdatePart11AesEncryptionVersionDisplay(data.ToString()); } #endregion + #endregion } } \ No newline at end of file diff --git a/ITC81DB_0H/Forms/FormMain.resx b/ITC81DB_0H/Forms/FormMain.resx index 8ba4fa4..b0f32c9 100644 --- a/ITC81DB_0H/Forms/FormMain.resx +++ b/ITC81DB_0H/Forms/FormMain.resx @@ -171,6 +171,9 @@ 264, 95 + + 474, 92 + WEBPAD diff --git a/ITC81DB_0H/Forms/FormMainDisplay.cs b/ITC81DB_0H/Forms/FormMainDisplay.cs index 27363ba..dd69973 100644 --- a/ITC81DB_0H/Forms/FormMainDisplay.cs +++ b/ITC81DB_0H/Forms/FormMainDisplay.cs @@ -29,15 +29,15 @@ namespace ITC81DB_0H.Forms private Define.E_MainDisplayStore CurrentDisplay; public ControlMainDisplayAlarm MainAlarm; - public ControlMainDisplayWeightBigScreen MainDisplayWeightBigScreen; - public ControlMainDisplayWeightSmall MainDisplayWeightSmall; + public ControlMainDisplayWeightBigScreen MainWeightBigScreen; + public ControlMainDisplayWeightSmall MainWeightSmall; public ControlMainDisplayStopDataStatistics MainDataStatistics; public ControlMainDisplayStart MainBarGraph; public ControlMainDisplayStartGraph MainLineGraph; public ControlMainDisplayStartList MainList; public ControlMainDisplayMenu MainSubMenu; - public ControlMainDisplayFeedback MainDisplayFeedback; - public ControlMainDisplayModbus MainDisplayModbus; + public ControlMainDisplayFeedback MainFeedback; + public ControlMainDisplayModbus MainModbus; #endregion #region Constructor @@ -164,38 +164,38 @@ namespace ITC81DB_0H.Forms { this.IsCurrentValueDouble = false; - this.MainDisplayWeightBigScreen = new ControlMainDisplayWeightBigScreen(this); - this.MainDisplayWeightSmall = new ControlMainDisplayWeightSmall(this); + this.MainWeightBigScreen = new ControlMainDisplayWeightBigScreen(this); + this.MainWeightSmall = new ControlMainDisplayWeightSmall(this); this.MainDataStatistics = new ControlMainDisplayStopDataStatistics(this); this.MainBarGraph = new ControlMainDisplayStart(this); this.MainLineGraph = new ControlMainDisplayStartGraph(this); this.MainList = new ControlMainDisplayStartList(this); this.MainSubMenu = new ControlMainDisplayMenu(this); this.MainAlarm = new ControlMainDisplayAlarm(); - this.MainDisplayFeedback = new ControlMainDisplayFeedback(this); - this.MainDisplayModbus = new ControlMainDisplayModbus(this); + this.MainFeedback = new ControlMainDisplayFeedback(this); + this.MainModbus = new ControlMainDisplayModbus(this); - this.MainDisplayWeightBigScreen.Location = new Point(0, 65); - this.MainDisplayWeightSmall.Location = new Point(0, 65); + this.MainWeightBigScreen.Location = new Point(0, 65); + this.MainWeightSmall.Location = new Point(0, 65); this.MainDataStatistics.Location = new Point(0, 313); this.MainBarGraph.Location = new Point(0, 313); this.MainLineGraph.Location = new Point(0, 313); this.MainList.Location = new Point(0, 213); this.MainSubMenu.Location = new Point(0, 213); this.MainAlarm.Location = new Point(390, 60); - this.MainDisplayFeedback.Location = new Point(0, 313); - this.MainDisplayModbus.Location = new Point(0, 213); + this.MainFeedback.Location = new Point(0, 313); + this.MainModbus.Location = new Point(0, 213); - this.Controls.Add(this.MainDisplayWeightBigScreen); - this.Controls.Add(this.MainDisplayWeightSmall); + this.Controls.Add(this.MainWeightBigScreen); + this.Controls.Add(this.MainWeightSmall); this.Controls.Add(this.MainDataStatistics); this.Controls.Add(this.MainBarGraph); this.Controls.Add(this.MainLineGraph); this.Controls.Add(this.MainList); this.Controls.Add(this.MainSubMenu); this.Controls.Add(this.MainAlarm); - this.Controls.Add(this.MainDisplayFeedback); - this.Controls.Add(this.MainDisplayModbus); + this.Controls.Add(this.MainFeedback); + this.Controls.Add(this.MainModbus); } private void DefaultSetting() { @@ -308,8 +308,8 @@ namespace ITC81DB_0H.Forms } public void UpdateDisplayAlarmView(WeightData data) { - this.MainDisplayWeightBigScreen.UpdateDisplayAlarmView(this.ParentForm.CurrentWeightData); - this.MainDisplayWeightSmall.UpdateDisplayAlarmView(this.ParentForm.CurrentWeightData); + this.MainWeightBigScreen.UpdateDisplayAlarmView(this.ParentForm.CurrentWeightData); + this.MainWeightSmall.UpdateDisplayAlarmView(this.ParentForm.CurrentWeightData); if (data.IsLoadCellError == true || data.IsInverterError == true || data.IsEmergencyStop == true || data.IsDoorInterlock == true || data.IsPressureSensingError == true || data.IsSorterError == true || data.IsStackUpSensorError == true @@ -382,6 +382,9 @@ namespace ITC81DB_0H.Forms if (this.MainDataStatistics != null) this.MainDataStatistics.Clear(); + if (this.MainModbus != null) + this.MainModbus.Clear(); + this.ParentForm.ClearAlarm(0); } public void ClearAllData() @@ -684,8 +687,8 @@ namespace ITC81DB_0H.Forms this.MainBarGraph.UpdateEquipmentStatusDisplay(status); this.MainLineGraph.UpdateEquipmentStatusDisplay(status); this.MainList.UpdateEquipmentStatusDisplay(status); - this.MainDisplayWeightBigScreen.UpdateEquipmentStatusDisplay(status); - this.MainDisplayWeightSmall.UpdateEquipmentStatusDisplay(status); + this.MainWeightBigScreen.UpdateEquipmentStatusDisplay(status); + this.MainWeightSmall.UpdateEquipmentStatusDisplay(status); //this.CurrentDisplay = Define.E_MainDisplayStore.DisplayStartBarGraph; //this.DisplayBottomMain(this.CurrentDisplay); @@ -713,8 +716,8 @@ namespace ITC81DB_0H.Forms this.MainBarGraph.UpdateEquipmentStatusDisplay(status); this.MainLineGraph.UpdateEquipmentStatusDisplay(status); this.MainList.UpdateEquipmentStatusDisplay(status); - this.MainDisplayWeightBigScreen.UpdateEquipmentStatusDisplay(status); - this.MainDisplayWeightSmall.UpdateEquipmentStatusDisplay(status); + this.MainWeightBigScreen.UpdateEquipmentStatusDisplay(status); + this.MainWeightSmall.UpdateEquipmentStatusDisplay(status); //this.CurrentDisplay = Define.E_MainDisplayStore.DisplayStartBarGraph; //this.DisplayBottomMain(this.CurrentDisplay); @@ -736,10 +739,10 @@ namespace ITC81DB_0H.Forms if (this.labelLotNo.Text != value) this.labelLotNo.Text = value; - if (this.MainDisplayWeightBigScreen != null) - this.MainDisplayWeightBigScreen.UpdateCurrentProductDisplay(status, pItem, wData); - if (this.MainDisplayWeightSmall != null) - this.MainDisplayWeightSmall.UpdateCurrentProductDisplay(status, pItem, wData); + if (this.MainWeightBigScreen != null) + this.MainWeightBigScreen.UpdateCurrentProductDisplay(status, pItem, wData); + if (this.MainWeightSmall != null) + this.MainWeightSmall.UpdateCurrentProductDisplay(status, pItem, wData); if (this.MainBarGraph != null) this.MainBarGraph.UpdateCurrentProductDisplay(status, pItem, wData); if (this.MainLineGraph != null) @@ -758,10 +761,10 @@ namespace ITC81DB_0H.Forms // 알람표시 this.UpdateDisplayAlarmView(data); - if (this.MainDisplayWeightBigScreen != null) - this.MainDisplayWeightBigScreen.UpdateStopWeightDisplay(status, data); - if (this.MainDisplayWeightSmall != null) - this.MainDisplayWeightSmall.UpdateStopWeightDisplay(status, data); + if (this.MainWeightBigScreen != null) + this.MainWeightBigScreen.UpdateStopWeightDisplay(status, data); + if (this.MainWeightSmall != null) + this.MainWeightSmall.UpdateStopWeightDisplay(status, data); } public void UpdateStartWeightDisplay(Define.E_EquipmentStatus status, ProductItem pItem, WeightData wData) { @@ -773,10 +776,10 @@ namespace ITC81DB_0H.Forms if (wData.JudgmentStatus == Define.E_JudgmentStatus.Empty) return; - if (this.MainDisplayWeightBigScreen != null) - this.MainDisplayWeightBigScreen.UpdateStartWeightDisplay(status, wData); - if (this.MainDisplayWeightSmall != null) - this.MainDisplayWeightSmall.UpdateStartWeightDisplay(status, wData); + if (this.MainWeightBigScreen != null) + this.MainWeightBigScreen.UpdateStartWeightDisplay(status, wData); + if (this.MainWeightSmall != null) + this.MainWeightSmall.UpdateStartWeightDisplay(status, wData); if (this.MainBarGraph != null) this.MainBarGraph.UpdateStartWeightDisplay(status, wData); if (this.MainLineGraph != null) @@ -801,17 +804,17 @@ namespace ITC81DB_0H.Forms } public void UpdateBarcodeDisplay(Barcode barcode) { - if (this.MainDisplayWeightBigScreen != null) - this.MainDisplayWeightBigScreen.UpdateBarcodeDisplay(barcode); - if (this.MainDisplayWeightSmall != null) - this.MainDisplayWeightSmall.UpdateBarcodeDisplay(barcode); + if (this.MainWeightBigScreen != null) + this.MainWeightBigScreen.UpdateBarcodeDisplay(barcode); + if (this.MainWeightSmall != null) + this.MainWeightSmall.UpdateBarcodeDisplay(barcode); } public void UpdateEthernetStatusDisplay(bool status) { - if (this.MainDisplayWeightBigScreen != null) - this.MainDisplayWeightBigScreen.UpdateEthernetStatusDisplay(status); - if (this.MainDisplayWeightSmall != null) - this.MainDisplayWeightSmall.UpdateEthernetStatusDisplay(status); + if (this.MainWeightBigScreen != null) + this.MainWeightBigScreen.UpdateEthernetStatusDisplay(status); + if (this.MainWeightSmall != null) + this.MainWeightSmall.UpdateEthernetStatusDisplay(status); } public void UpdateMainDisplay(SystemStatus status) @@ -1264,7 +1267,7 @@ namespace ITC81DB_0H.Forms if (this.CurrentDisplay == Define.E_MainDisplayStore.Modbus) { this.ParentForm.Update30000ModbusItem(); - this.MainDisplayModbus.DisplayRefresh(this.ParentForm.CurrentSystemStatus); + this.MainModbus.DisplayRefresh(this.ParentForm.CurrentSystemStatus); } } public void MainBottomModbusIconAdd(bool bValue) @@ -1276,7 +1279,7 @@ namespace ITC81DB_0H.Forms public void CurrentBottomMenuControlEnable() { Collection buttons = new Collection(); - bool feedback = this.MainDisplayFeedback.IsUsingFeedback(); + bool feedback = this.MainFeedback.IsUsingFeedback(); int sampleCount = int.Parse(this.ParentForm.CurrentSystemParameter2.OPT1SamplingCount); bool modbus = this.ParentForm.IsOPCModbusUsing; @@ -1366,53 +1369,53 @@ namespace ITC81DB_0H.Forms case Define.E_MainDisplayStore.SubMenu: this.UpdateDisplayMenuButton(Define.E_MainDisplayStore.SubMenu); this.MainSubMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus); - this.MainDisplayWeightSmall.DisplayRefresh(this.ParentForm.CurrentSystemStatus); + this.MainWeightSmall.DisplayRefresh(this.ParentForm.CurrentSystemStatus); //this.MainDisplayWeightBigScreen.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainSubMenu.BringToFront(); //this.MainDisplayWeightBigScreen.BringToFront(); - this.MainDisplayWeightSmall.BringToFront(); + this.MainWeightSmall.BringToFront(); break; case Define.E_MainDisplayStore.BarGraph: this.UpdateDisplayMenuButton(Define.E_MainDisplayStore.BarGraph); this.MainBarGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); - this.MainDisplayWeightBigScreen.DisplayRefresh(this.ParentForm.CurrentSystemStatus); + this.MainWeightBigScreen.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainBarGraph.BringToFront(); - this.MainDisplayWeightBigScreen.BringToFront(); + this.MainWeightBigScreen.BringToFront(); break; case Define.E_MainDisplayStore.LineGraph: this.UpdateDisplayMenuButton(Define.E_MainDisplayStore.LineGraph); this.MainLineGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); - this.MainDisplayWeightBigScreen.DisplayRefresh(this.ParentForm.CurrentSystemStatus); + this.MainWeightBigScreen.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainLineGraph.BringToFront(); - this.MainDisplayWeightBigScreen.BringToFront(); + this.MainWeightBigScreen.BringToFront(); break; case Define.E_MainDisplayStore.List: this.UpdateDisplayMenuButton(Define.E_MainDisplayStore.List); this.MainList.DisplayRefresh(this.ParentForm.CurrentSystemStatus); - this.MainDisplayWeightSmall.DisplayRefresh(this.ParentForm.CurrentSystemStatus); + this.MainWeightSmall.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainList.BringToFront(); - this.MainDisplayWeightSmall.BringToFront(); + this.MainWeightSmall.BringToFront(); break; case Define.E_MainDisplayStore.DataStat: this.UpdateDisplayMenuButton(Define.E_MainDisplayStore.DataStat); this.MainDataStatistics.DisplayRefresh(this.ParentForm.CurrentSystemStatus); - this.MainDisplayWeightBigScreen.DisplayRefresh(this.ParentForm.CurrentSystemStatus); + this.MainWeightBigScreen.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainDataStatistics.BringToFront(); - this.MainDisplayWeightBigScreen.BringToFront(); + this.MainWeightBigScreen.BringToFront(); break; case Define.E_MainDisplayStore.Feedback: this.UpdateDisplayMenuButton(Define.E_MainDisplayStore.Feedback); - this.MainDisplayFeedback.DisplayRefresh(this.ParentForm.CurrentSystemStatus); - this.MainDisplayWeightBigScreen.DisplayRefresh(this.ParentForm.CurrentSystemStatus); - this.MainDisplayFeedback.BringToFront(); - this.MainDisplayWeightBigScreen.BringToFront(); + this.MainFeedback.DisplayRefresh(this.ParentForm.CurrentSystemStatus); + this.MainWeightBigScreen.DisplayRefresh(this.ParentForm.CurrentSystemStatus); + this.MainFeedback.BringToFront(); + this.MainWeightBigScreen.BringToFront(); break; case Define.E_MainDisplayStore.Modbus: this.ParentForm.Update30000ModbusItem(); this.UpdateDisplayMenuButton(Define.E_MainDisplayStore.Modbus); - this.MainDisplayModbus.DisplayRefresh(this.ParentForm.CurrentSystemStatus); - this.MainDisplayModbus.BringToFront(); - this.MainDisplayWeightSmall.BringToFront(); + this.MainModbus.DisplayRefresh(this.ParentForm.CurrentSystemStatus); + this.MainModbus.BringToFront(); + this.MainWeightSmall.BringToFront(); break; default: break; @@ -1486,8 +1489,8 @@ namespace ITC81DB_0H.Forms //this.CurrentDisplay = Define.E_MainDisplayStore.DisplayStartBarGraph; //this.DisplayBottomMain(this.CurrentDisplay); - this.MainDisplayWeightBigScreen.DisplayRefresh(status); - this.MainDisplayWeightSmall.DisplayRefresh(status); + this.MainWeightBigScreen.DisplayRefresh(status); + this.MainWeightSmall.DisplayRefresh(status); //this.MainDisplayMenu.DisplayRefresh(status); //this.MainDisplayStart.DisplayRefresh(status); //this.MainDisplayFeedback.DisplayRefresh(status); diff --git a/ITC81DB_0H/Forms/FormMenu.cs b/ITC81DB_0H/Forms/FormMenu.cs index 860c839..f01e22e 100644 --- a/ITC81DB_0H/Forms/FormMenu.cs +++ b/ITC81DB_0H/Forms/FormMenu.cs @@ -1745,7 +1745,7 @@ namespace ITC81DB_0H.Forms if (this.ParentForm.SystemConfig2.EthernetOperationMode == 2) this.ParentForm.EthernetClientDisconnect(); - if (this.ParentForm.ChildFormMainDisplay.MainDisplayFeedback.IsUsingFeedback() == true) + if (this.ParentForm.ChildFormMainDisplay.MainFeedback.IsUsingFeedback() == true) { string feedbackValue = ""; diff --git a/ITC81DB_0H/Version.txt b/ITC81DB_0H/Version.txt index 6622628..3dd2f28 100644 --- a/ITC81DB_0H/Version.txt +++ b/ITC81DB_0H/Version.txt @@ -13,6 +13,17 @@ ⺻ м 跮 */ +@ Ver 3.3.2 by CJY + - 2024.02.22 + - Ver 3.3.1 Modify + - Client + 1. Stream ȸ( Disconnect, / Connect õ) + 2. Disconnect Ǿ , Timer Connect õ + - Modbus + Modbus Ʈ ȭ (label ) + Ұ ȭ ȵǴ + - ø/̴ Addon ȭ Off · ϵ + @ Ver 3.3.1 by CJY - 2024.02.07 - Ver 3.3.0 Modify diff --git a/ITC81DB_0H/bin/Release/ITC81DB_2H.exe b/ITC81DB_0H/bin/Release/ITC81DB_2H.exe index 8f109ce..66afe06 100644 Binary files a/ITC81DB_0H/bin/Release/ITC81DB_2H.exe and b/ITC81DB_0H/bin/Release/ITC81DB_2H.exe differ diff --git a/ITC81DB_0H/obj/Release/ITC81DB_2H.exe b/ITC81DB_0H/obj/Release/ITC81DB_2H.exe index 8f109ce..66afe06 100644 Binary files a/ITC81DB_0H/obj/Release/ITC81DB_2H.exe and b/ITC81DB_0H/obj/Release/ITC81DB_2H.exe differ