diff --git a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.Designer.cs b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.Designer.cs index 3b57dfe..1e11af8 100644 --- a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.Designer.cs +++ b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.Designer.cs @@ -30,6 +30,12 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlCenterEquipFunctionSetting)); this.smartGroupBox1 = new SmartX.SmartGroupBox(); + this.smartLabel7 = new SmartX.SmartLabel(); + this.smartLabel6 = new SmartX.SmartLabel(); + this.smartLabel5 = new SmartX.SmartLabel(); + this.smartLabel4 = new SmartX.SmartLabel(); + this.labelUnit = new SmartX.SmartLabel(); + this.smartLabel2 = new SmartX.SmartLabel(); this.labelJudgmentValue2 = new SmartX.SmartLabel(); this.smartLabel3 = new SmartX.SmartLabel(); this.labelJudgmentValue1 = new SmartX.SmartLabel(); @@ -52,12 +58,9 @@ this.labelTitleBuzzerONTime = new SmartX.SmartLabel(); this.comboBoxLanguage = new System.Windows.Forms.ComboBox(); this.labelTitleLanguage = new SmartX.SmartLabel(); - this.smartLabel2 = new SmartX.SmartLabel(); - this.labelUnit = new SmartX.SmartLabel(); - this.smartLabel4 = new SmartX.SmartLabel(); - this.smartLabel5 = new SmartX.SmartLabel(); - this.smartLabel6 = new SmartX.SmartLabel(); - this.smartLabel7 = new SmartX.SmartLabel(); + this.smartLabel8 = new SmartX.SmartLabel(); + this.labelEntryNotDetectedIgnoreTime = new SmartX.SmartLabel(); + this.smartLabel10 = new SmartX.SmartLabel(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -66,6 +69,9 @@ this.smartGroupBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(46)))), ((int)(((byte)(46)))), ((int)(((byte)(46))))); this.smartGroupBox1.BackPictureBox = null; this.smartGroupBox1.BackPictureBox1 = null; + this.smartGroupBox1.Controls.Add(this.smartLabel8); + this.smartGroupBox1.Controls.Add(this.labelEntryNotDetectedIgnoreTime); + this.smartGroupBox1.Controls.Add(this.smartLabel10); this.smartGroupBox1.Controls.Add(this.smartLabel7); this.smartGroupBox1.Controls.Add(this.smartLabel6); this.smartGroupBox1.Controls.Add(this.smartLabel5); @@ -107,6 +113,120 @@ this.smartGroupBox1.TabIndex = 2; this.smartGroupBox1.TextColor = System.Drawing.Color.Black; // + // smartLabel7 + // + this.smartLabel7.BackPictureBox1 = null; + this.smartLabel7.BackPictureBox2 = this.smartGroupBox1; + this.smartLabel7.BorderColor = System.Drawing.Color.Black; + this.smartLabel7.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel7.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.smartLabel7.ForeColor = System.Drawing.Color.White; + this.smartLabel7.InitVisible = true; + this.smartLabel7.LineSpacing = 0F; + this.smartLabel7.Location = new System.Drawing.Point(589, 306); + this.smartLabel7.Name = "smartLabel7"; + this.smartLabel7.Size = new System.Drawing.Size(30, 28); + this.smartLabel7.TabIndex = 235; + this.smartLabel7.Text = "ms"; + this.smartLabel7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel7.Wordwrap = false; + // + // smartLabel6 + // + this.smartLabel6.BackPictureBox1 = null; + this.smartLabel6.BackPictureBox2 = this.smartGroupBox1; + this.smartLabel6.BorderColor = System.Drawing.Color.Black; + this.smartLabel6.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel6.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.smartLabel6.ForeColor = System.Drawing.Color.White; + this.smartLabel6.InitVisible = true; + this.smartLabel6.LineSpacing = 0F; + this.smartLabel6.Location = new System.Drawing.Point(350, 306); + this.smartLabel6.Name = "smartLabel6"; + this.smartLabel6.Size = new System.Drawing.Size(30, 28); + this.smartLabel6.TabIndex = 234; + this.smartLabel6.Text = "ms"; + this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel6.Wordwrap = false; + // + // smartLabel5 + // + this.smartLabel5.BackPictureBox1 = null; + this.smartLabel5.BackPictureBox2 = this.smartGroupBox1; + this.smartLabel5.BorderColor = System.Drawing.Color.Black; + this.smartLabel5.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel5.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.smartLabel5.ForeColor = System.Drawing.Color.White; + this.smartLabel5.InitVisible = true; + this.smartLabel5.LineSpacing = 0F; + this.smartLabel5.Location = new System.Drawing.Point(524, 96); + this.smartLabel5.Name = "smartLabel5"; + this.smartLabel5.Size = new System.Drawing.Size(30, 28); + this.smartLabel5.TabIndex = 233; + this.smartLabel5.Text = "ms"; + this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel5.Wordwrap = false; + // + // smartLabel4 + // + this.smartLabel4.BackPictureBox1 = null; + this.smartLabel4.BackPictureBox2 = this.smartGroupBox1; + this.smartLabel4.BorderColor = System.Drawing.Color.Black; + this.smartLabel4.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel4.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.smartLabel4.ForeColor = System.Drawing.Color.White; + this.smartLabel4.InitVisible = true; + this.smartLabel4.LineSpacing = 0F; + this.smartLabel4.Location = new System.Drawing.Point(524, 170); + this.smartLabel4.Name = "smartLabel4"; + this.smartLabel4.Size = new System.Drawing.Size(30, 28); + this.smartLabel4.TabIndex = 232; + this.smartLabel4.Text = "ms"; + this.smartLabel4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel4.Wordwrap = false; + // + // labelUnit + // + this.labelUnit.BackPictureBox1 = null; + this.labelUnit.BackPictureBox2 = this.smartGroupBox1; + this.labelUnit.BorderColor = System.Drawing.Color.Black; + this.labelUnit.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelUnit.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.labelUnit.ForeColor = System.Drawing.Color.White; + this.labelUnit.InitVisible = true; + this.labelUnit.LineSpacing = 0F; + this.labelUnit.Location = new System.Drawing.Point(524, 204); + this.labelUnit.Name = "labelUnit"; + this.labelUnit.Size = new System.Drawing.Size(30, 28); + this.labelUnit.TabIndex = 231; + this.labelUnit.Text = "g"; + this.labelUnit.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelUnit.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelUnit.Wordwrap = false; + // + // smartLabel2 + // + this.smartLabel2.BackPictureBox1 = null; + this.smartLabel2.BackPictureBox2 = this.smartGroupBox1; + this.smartLabel2.BorderColor = System.Drawing.Color.Black; + this.smartLabel2.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel2.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.smartLabel2.ForeColor = System.Drawing.Color.White; + this.smartLabel2.InitVisible = true; + this.smartLabel2.LineSpacing = 0F; + this.smartLabel2.Location = new System.Drawing.Point(524, 272); + this.smartLabel2.Name = "smartLabel2"; + this.smartLabel2.Size = new System.Drawing.Size(30, 28); + this.smartLabel2.TabIndex = 230; + this.smartLabel2.Text = "ms"; + this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel2.Wordwrap = false; + // // labelJudgmentValue2 // this.labelJudgmentValue2.BackPictureBox1 = null; @@ -117,7 +237,7 @@ this.labelJudgmentValue2.ForeColor = System.Drawing.Color.White; this.labelJudgmentValue2.InitVisible = true; this.labelJudgmentValue2.LineSpacing = 0F; - this.labelJudgmentValue2.Location = new System.Drawing.Point(524, 272); + this.labelJudgmentValue2.Location = new System.Drawing.Point(524, 306); this.labelJudgmentValue2.Name = "labelJudgmentValue2"; this.labelJudgmentValue2.Size = new System.Drawing.Size(59, 28); this.labelJudgmentValue2.TabIndex = 229; @@ -135,7 +255,7 @@ this.smartLabel3.ForeColor = System.Drawing.Color.White; this.smartLabel3.InitVisible = true; this.smartLabel3.LineSpacing = 0F; - this.smartLabel3.Location = new System.Drawing.Point(386, 272); + this.smartLabel3.Location = new System.Drawing.Point(386, 306); this.smartLabel3.Name = "smartLabel3"; this.smartLabel3.Size = new System.Drawing.Size(132, 28); this.smartLabel3.TabIndex = 228; @@ -154,7 +274,7 @@ this.labelJudgmentValue1.ForeColor = System.Drawing.Color.White; this.labelJudgmentValue1.InitVisible = true; this.labelJudgmentValue1.LineSpacing = 0F; - this.labelJudgmentValue1.Location = new System.Drawing.Point(285, 272); + this.labelJudgmentValue1.Location = new System.Drawing.Point(285, 306); this.labelJudgmentValue1.Name = "labelJudgmentValue1"; this.labelJudgmentValue1.Size = new System.Drawing.Size(59, 28); this.labelJudgmentValue1.TabIndex = 227; @@ -172,7 +292,7 @@ this.smartLabel1.ForeColor = System.Drawing.Color.White; this.smartLabel1.InitVisible = true; this.smartLabel1.LineSpacing = 0F; - this.smartLabel1.Location = new System.Drawing.Point(147, 272); + this.smartLabel1.Location = new System.Drawing.Point(147, 306); this.smartLabel1.Name = "smartLabel1"; this.smartLabel1.Size = new System.Drawing.Size(132, 28); this.smartLabel1.TabIndex = 226; @@ -192,7 +312,7 @@ this.labelSensorErrorDetectingTime.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); this.labelSensorErrorDetectingTime.InitVisible = true; this.labelSensorErrorDetectingTime.LineSpacing = 0F; - this.labelSensorErrorDetectingTime.Location = new System.Drawing.Point(418, 238); + this.labelSensorErrorDetectingTime.Location = new System.Drawing.Point(418, 272); this.labelSensorErrorDetectingTime.Name = "labelSensorErrorDetectingTime"; this.labelSensorErrorDetectingTime.Size = new System.Drawing.Size(100, 28); this.labelSensorErrorDetectingTime.TabIndex = 225; @@ -212,7 +332,7 @@ this.labelTitleSensorErrorDetectingTime.ForeColor = System.Drawing.Color.White; this.labelTitleSensorErrorDetectingTime.InitVisible = true; this.labelTitleSensorErrorDetectingTime.LineSpacing = 0F; - this.labelTitleSensorErrorDetectingTime.Location = new System.Drawing.Point(147, 238); + this.labelTitleSensorErrorDetectingTime.Location = new System.Drawing.Point(147, 272); this.labelTitleSensorErrorDetectingTime.Name = "labelTitleSensorErrorDetectingTime"; this.labelTitleSensorErrorDetectingTime.Size = new System.Drawing.Size(265, 28); this.labelTitleSensorErrorDetectingTime.TabIndex = 224; @@ -323,7 +443,7 @@ this.labelTitleLogin.ForeColor = System.Drawing.Color.White; this.labelTitleLogin.InitVisible = true; this.labelTitleLogin.LineSpacing = 0F; - this.labelTitleLogin.Location = new System.Drawing.Point(147, 306); + this.labelTitleLogin.Location = new System.Drawing.Point(147, 340); this.labelTitleLogin.Name = "labelTitleLogin"; this.labelTitleLogin.Size = new System.Drawing.Size(265, 30); this.labelTitleLogin.TabIndex = 135; @@ -344,7 +464,7 @@ this.buttonLogin.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLogin.DownImage"))); this.buttonLogin.GroupID = 0; this.buttonLogin.InitVisible = true; - this.buttonLogin.Location = new System.Drawing.Point(418, 306); + this.buttonLogin.Location = new System.Drawing.Point(418, 340); this.buttonLogin.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonLogin.Name = "buttonLogin"; this.buttonLogin.NestedClickEventPrevent = false; @@ -526,7 +646,7 @@ // comboBoxLanguage // this.comboBoxLanguage.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); - this.comboBoxLanguage.Location = new System.Drawing.Point(418, 342); + this.comboBoxLanguage.Location = new System.Drawing.Point(418, 376); this.comboBoxLanguage.Name = "comboBoxLanguage"; this.comboBoxLanguage.Size = new System.Drawing.Size(100, 28); this.comboBoxLanguage.TabIndex = 120; @@ -542,7 +662,7 @@ this.labelTitleLanguage.ForeColor = System.Drawing.Color.White; this.labelTitleLanguage.InitVisible = true; this.labelTitleLanguage.LineSpacing = 0F; - this.labelTitleLanguage.Location = new System.Drawing.Point(147, 342); + this.labelTitleLanguage.Location = new System.Drawing.Point(147, 376); this.labelTitleLanguage.Name = "labelTitleLanguage"; this.labelTitleLanguage.Size = new System.Drawing.Size(265, 30); this.labelTitleLanguage.TabIndex = 117; @@ -551,119 +671,64 @@ this.labelTitleLanguage.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelTitleLanguage.Wordwrap = false; // - // smartLabel2 + // smartLabel8 // - this.smartLabel2.BackPictureBox1 = null; - this.smartLabel2.BackPictureBox2 = this.smartGroupBox1; - this.smartLabel2.BorderColor = System.Drawing.Color.Black; - this.smartLabel2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel2.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); - this.smartLabel2.ForeColor = System.Drawing.Color.White; - this.smartLabel2.InitVisible = true; - this.smartLabel2.LineSpacing = 0F; - this.smartLabel2.Location = new System.Drawing.Point(524, 238); - this.smartLabel2.Name = "smartLabel2"; - this.smartLabel2.Size = new System.Drawing.Size(30, 28); - this.smartLabel2.TabIndex = 230; - this.smartLabel2.Text = "ms"; - this.smartLabel2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel2.Wordwrap = false; + this.smartLabel8.BackPictureBox1 = null; + this.smartLabel8.BackPictureBox2 = this.smartGroupBox1; + this.smartLabel8.BorderColor = System.Drawing.Color.Black; + this.smartLabel8.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel8.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.smartLabel8.ForeColor = System.Drawing.Color.White; + this.smartLabel8.InitVisible = true; + this.smartLabel8.LineSpacing = 0F; + this.smartLabel8.Location = new System.Drawing.Point(524, 238); + this.smartLabel8.Name = "smartLabel8"; + this.smartLabel8.Size = new System.Drawing.Size(30, 28); + this.smartLabel8.TabIndex = 238; + this.smartLabel8.Text = "ms"; + this.smartLabel8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel8.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel8.Wordwrap = false; // - // labelUnit + // labelEntryNotDetectedIgnoreTime // - this.labelUnit.BackPictureBox1 = null; - this.labelUnit.BackPictureBox2 = this.smartGroupBox1; - this.labelUnit.BorderColor = System.Drawing.Color.Black; - this.labelUnit.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelUnit.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); - this.labelUnit.ForeColor = System.Drawing.Color.White; - this.labelUnit.InitVisible = true; - this.labelUnit.LineSpacing = 0F; - this.labelUnit.Location = new System.Drawing.Point(524, 204); - this.labelUnit.Name = "labelUnit"; - this.labelUnit.Size = new System.Drawing.Size(30, 28); - this.labelUnit.TabIndex = 231; - this.labelUnit.Text = "g"; - this.labelUnit.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelUnit.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelUnit.Wordwrap = false; + this.labelEntryNotDetectedIgnoreTime.BackColor = System.Drawing.SystemColors.Window; + this.labelEntryNotDetectedIgnoreTime.BackPictureBox = null; + this.labelEntryNotDetectedIgnoreTime.BackPictureBox1 = null; + this.labelEntryNotDetectedIgnoreTime.BackPictureBox2 = null; + this.labelEntryNotDetectedIgnoreTime.BorderColor = System.Drawing.Color.Black; + this.labelEntryNotDetectedIgnoreTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelEntryNotDetectedIgnoreTime.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); + this.labelEntryNotDetectedIgnoreTime.InitVisible = true; + this.labelEntryNotDetectedIgnoreTime.LineSpacing = 0F; + this.labelEntryNotDetectedIgnoreTime.Location = new System.Drawing.Point(418, 238); + this.labelEntryNotDetectedIgnoreTime.Name = "labelEntryNotDetectedIgnoreTime"; + this.labelEntryNotDetectedIgnoreTime.Size = new System.Drawing.Size(100, 28); + this.labelEntryNotDetectedIgnoreTime.TabIndex = 237; + this.labelEntryNotDetectedIgnoreTime.Text = "0"; + this.labelEntryNotDetectedIgnoreTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; + this.labelEntryNotDetectedIgnoreTime.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelEntryNotDetectedIgnoreTime.Wordwrap = false; + this.labelEntryNotDetectedIgnoreTime.Click += new System.EventHandler(this.labelEntryNotDetectedIgnoreTime_Click); // - // smartLabel4 + // smartLabel10 // - this.smartLabel4.BackPictureBox1 = null; - this.smartLabel4.BackPictureBox2 = this.smartGroupBox1; - this.smartLabel4.BorderColor = System.Drawing.Color.Black; - this.smartLabel4.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel4.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); - this.smartLabel4.ForeColor = System.Drawing.Color.White; - this.smartLabel4.InitVisible = true; - this.smartLabel4.LineSpacing = 0F; - this.smartLabel4.Location = new System.Drawing.Point(524, 170); - this.smartLabel4.Name = "smartLabel4"; - this.smartLabel4.Size = new System.Drawing.Size(30, 28); - this.smartLabel4.TabIndex = 232; - this.smartLabel4.Text = "ms"; - this.smartLabel4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel4.Wordwrap = false; - // - // smartLabel5 - // - this.smartLabel5.BackPictureBox1 = null; - this.smartLabel5.BackPictureBox2 = this.smartGroupBox1; - this.smartLabel5.BorderColor = System.Drawing.Color.Black; - this.smartLabel5.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel5.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); - this.smartLabel5.ForeColor = System.Drawing.Color.White; - this.smartLabel5.InitVisible = true; - this.smartLabel5.LineSpacing = 0F; - this.smartLabel5.Location = new System.Drawing.Point(524, 96); - this.smartLabel5.Name = "smartLabel5"; - this.smartLabel5.Size = new System.Drawing.Size(30, 28); - this.smartLabel5.TabIndex = 233; - this.smartLabel5.Text = "ms"; - this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel5.Wordwrap = false; - // - // smartLabel6 - // - this.smartLabel6.BackPictureBox1 = null; - this.smartLabel6.BackPictureBox2 = this.smartGroupBox1; - this.smartLabel6.BorderColor = System.Drawing.Color.Black; - this.smartLabel6.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel6.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); - this.smartLabel6.ForeColor = System.Drawing.Color.White; - this.smartLabel6.InitVisible = true; - this.smartLabel6.LineSpacing = 0F; - this.smartLabel6.Location = new System.Drawing.Point(350, 272); - this.smartLabel6.Name = "smartLabel6"; - this.smartLabel6.Size = new System.Drawing.Size(30, 28); - this.smartLabel6.TabIndex = 234; - this.smartLabel6.Text = "ms"; - this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel6.Wordwrap = false; - // - // smartLabel7 - // - this.smartLabel7.BackPictureBox1 = null; - this.smartLabel7.BackPictureBox2 = this.smartGroupBox1; - this.smartLabel7.BorderColor = System.Drawing.Color.Black; - this.smartLabel7.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel7.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); - this.smartLabel7.ForeColor = System.Drawing.Color.White; - this.smartLabel7.InitVisible = true; - this.smartLabel7.LineSpacing = 0F; - this.smartLabel7.Location = new System.Drawing.Point(589, 272); - this.smartLabel7.Name = "smartLabel7"; - this.smartLabel7.Size = new System.Drawing.Size(30, 28); - this.smartLabel7.TabIndex = 235; - this.smartLabel7.Text = "ms"; - this.smartLabel7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.smartLabel7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel7.Wordwrap = false; + this.smartLabel10.BackPictureBox1 = null; + this.smartLabel10.BackPictureBox2 = this.smartGroupBox1; + this.smartLabel10.BorderColor = System.Drawing.Color.Black; + this.smartLabel10.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel10.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.smartLabel10.ForeColor = System.Drawing.Color.White; + this.smartLabel10.InitVisible = true; + this.smartLabel10.LineSpacing = 0F; + this.smartLabel10.Location = new System.Drawing.Point(147, 238); + this.smartLabel10.Name = "smartLabel10"; + this.smartLabel10.Size = new System.Drawing.Size(265, 28); + this.smartLabel10.TabIndex = 236; + this.smartLabel10.Text = "제품진입 미감지 무시시간"; + this.smartLabel10.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel10.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel10.Wordwrap = false; // // ControlCenterEquipFunctionSetting // @@ -708,5 +773,8 @@ private SmartX.SmartLabel smartLabel6; private SmartX.SmartLabel smartLabel5; private SmartX.SmartLabel smartLabel4; + private SmartX.SmartLabel smartLabel8; + public SmartX.SmartLabel labelEntryNotDetectedIgnoreTime; + private SmartX.SmartLabel smartLabel10; } } diff --git a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs index 192661a..50e5896 100644 --- a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs +++ b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs @@ -159,6 +159,10 @@ namespace ITC81DB_2.Controls if (this.labelSensorErrorDetectingTime.Text != value) this.labelSensorErrorDetectingTime.Text = value; + value = item.EntryNotDetectedIgnoreTime.ToString(); + if (this.labelEntryNotDetectedIgnoreTime.Text != value) + this.labelEntryNotDetectedIgnoreTime.Text = value; + value = this.ParentForm.ParentForm.CurrentJudgmentSetItem1.JudgmentDelayTime.ToString(); if (this.labelJudgmentValue1.Text != value) this.labelJudgmentValue1.Text = value; @@ -317,6 +321,29 @@ namespace ITC81DB_2.Controls } } } + private void labelEntryNotDetectedIgnoreTime_Click(object sender, EventArgs e) + { + string value = ""; + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelEntryNotDetectedIgnoreTime.Text, 4, 0, false, this.ParentForm.ParentForm.SystemConfig.Language); + + if (myKeyPad.ShowDialog() == DialogResult.OK) + { + if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 9999) + { + // 입력범위를 확인하세요 + DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.ParentForm.SystemConfig.Language); + myMsg.ShowDialog(); + } + else + { + this.labelEntryNotDetectedIgnoreTime.Text = myKeyPad.StringValue; + this.ParentForm.ParentForm.SystemConfig.EntryNotDetectedIgnoreTime = myKeyPad.IntValue; + this.ParentForm.ParentForm.SaveSystemConfigurationFile(this.ParentForm.ParentForm.SystemConfig); + + this.ParentForm.ParentForm.TimerEntryNotDetectedIgnoreTimeInverval(); + } + } + } private void labelSensorErrorDetectingTime_Click(object sender, EventArgs e) { string value = ""; @@ -336,7 +363,7 @@ namespace ITC81DB_2.Controls this.ParentForm.ParentForm.SystemConfig.SensorErrorDetectingTime = myKeyPad.IntValue; this.ParentForm.ParentForm.SaveSystemConfigurationFile(this.ParentForm.ParentForm.SystemConfig); - this.ParentForm.ParentForm.TimerSensorErrorInterval(myKeyPad.IntValue); + this.ParentForm.ParentForm.TimerSensorErrorInterval(); value = Helper.StringZeroFillDigits4(myKeyPad.StringValue); this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6011_SensorErrorDetectingTime, value); diff --git a/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs b/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs index 44ecd2e..64531ce 100644 --- a/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs +++ b/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs @@ -63,7 +63,7 @@ namespace ITC81DB_2.Controls private void DefaultSetting() { this.labelSerialNo.Text = this.ParentForm.ParentForm.SystemConfig.SerialNumber; - this.labelDisplayVer.Text = "2.6.3"; + this.labelDisplayVer.Text = "2.6.4"; } public void UpdateMainBoardVersionDisplay(string version) diff --git a/ITC81DB_2/Controls/MainDisplay/ControlMainDisplayDataStatistics.cs b/ITC81DB_2/Controls/MainDisplay/ControlMainDisplayDataStatistics.cs index 10291f3..67562ff 100644 --- a/ITC81DB_2/Controls/MainDisplay/ControlMainDisplayDataStatistics.cs +++ b/ITC81DB_2/Controls/MainDisplay/ControlMainDisplayDataStatistics.cs @@ -351,11 +351,7 @@ namespace ITC81DB_2.Controls // 영점 아이콘표시 if (data.Status == DataStore.WeightStatus.WeightZero) - { - if (this.ParentForm.ParentForm.IsJudgmentNow1 == true) - this.ParentForm.ParentForm.IsJudgmentNow1 = false; this.pictureBoxIconZero1.Visible = true; - } else this.pictureBoxIconZero1.Visible = false; @@ -373,11 +369,7 @@ namespace ITC81DB_2.Controls // 영점 아이콘표시 if (data.Status == DataStore.WeightStatus.WeightZero) - { - if (this.ParentForm.ParentForm.IsJudgmentNow2 == true) - this.ParentForm.ParentForm.IsJudgmentNow2 = false; this.pictureBoxIconZero2.Visible = true; - } else this.pictureBoxIconZero2.Visible = false; diff --git a/ITC81DB_2/DataStore.cs b/ITC81DB_2/DataStore.cs index dfb64e0..df0e959 100644 --- a/ITC81DB_2/DataStore.cs +++ b/ITC81DB_2/DataStore.cs @@ -711,6 +711,7 @@ namespace ITC81DB_2 private int m_SerialCOM4Mode; private int m_EquipmentType; private int m_SensorErrorDetectingTime; + private int m_EntryNotDetectedIgnoreTime; private string m_SerialNumber; private string m_MainBoardVersion; @@ -813,6 +814,11 @@ namespace ITC81DB_2 get { return this.m_SensorErrorDetectingTime; } set { this.m_SensorErrorDetectingTime = value; } } + public int EntryNotDetectedIgnoreTime + { + get { return this.m_EntryNotDetectedIgnoreTime; } + set { this.m_EntryNotDetectedIgnoreTime = value; } + } public string SerialNumber { @@ -882,6 +888,7 @@ namespace ITC81DB_2 this.IsBypassOnce1 = true; this.IsBypassOnce2 = true; this.SensorErrorDetectingTime = 0; + this.EntryNotDetectedIgnoreTime = 0; this.SerialNumber = "23A000"; this.MainBoardVersion = "000"; @@ -925,7 +932,7 @@ namespace ITC81DB_2 public int DummyInt1; public int DummyInt2; - public int DummyInt3; + public int EntryNotDetectedIgnoreTime; public int SensorErrorDetectingTime; public int EquipmentType; diff --git a/ITC81DB_2/Forms/FormMain.Designer.cs b/ITC81DB_2/Forms/FormMain.Designer.cs index ba29f6f..0daff67 100644 --- a/ITC81DB_2/Forms/FormMain.Designer.cs +++ b/ITC81DB_2/Forms/FormMain.Designer.cs @@ -41,6 +41,8 @@ this.smartFileDataBackup2 = new SmartX.SmartFile(); this.timerSensorError1 = new System.Windows.Forms.Timer(); this.timerSensorError2 = new System.Windows.Forms.Timer(); + this.timerEntryNotDetectedIgnoreTime1 = new System.Windows.Forms.Timer(); + this.timerEntryNotDetectedIgnoreTime2 = new System.Windows.Forms.Timer(); ((System.ComponentModel.ISupportInitialize)(this.smartForm)).BeginInit(); this.SuspendLayout(); // @@ -112,6 +114,14 @@ this.timerSensorError2.Interval = 1; this.timerSensorError2.Tick += new System.EventHandler(this.timerSensorError2_Tick); // + // timerEntryNotDetectedIgnoreTime1 + // + this.timerEntryNotDetectedIgnoreTime1.Tick += new System.EventHandler(this.timerEntryNotDetectedIgnoreTime1_Tick); + // + // timerEntryNotDetectedIgnoreTime2 + // + this.timerEntryNotDetectedIgnoreTime2.Tick += new System.EventHandler(this.timerEntryNotDetectedIgnoreTime2_Tick); + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -140,6 +150,8 @@ private SmartX.SmartFile smartFileDataBackup2; private System.Windows.Forms.Timer timerSensorError1; private System.Windows.Forms.Timer timerSensorError2; + private System.Windows.Forms.Timer timerEntryNotDetectedIgnoreTime1; + private System.Windows.Forms.Timer timerEntryNotDetectedIgnoreTime2; } } diff --git a/ITC81DB_2/Forms/FormMain.cs b/ITC81DB_2/Forms/FormMain.cs index 0025f15..8b9dbe2 100644 --- a/ITC81DB_2/Forms/FormMain.cs +++ b/ITC81DB_2/Forms/FormMain.cs @@ -632,7 +632,7 @@ namespace ITC81DB_2.Forms } } - public void TimerSensorErrorInterval(int interval) + public void TimerSensorErrorInterval() { if (this.timerSensorError1.Enabled == true) this.timerSensorError1.Enabled = false; @@ -647,6 +647,11 @@ namespace ITC81DB_2.Forms this.smartFileCommunicationLog.WriteString(string.Format("timerSensorError Interval ({0:yyyy-MM-dd HH:mm:ss}): timer1:{1}, timer2:{2}", DateTime.Now, this.timerSensorError1.Interval, this.timerSensorError2.Interval)); } + public void TimerEntryNotDetectedIgnoreTimeInverval() + { + this.timerEntryNotDetectedIgnoreTime1.Interval = this.SystemConfig.EntryNotDetectedIgnoreTime; + this.timerEntryNotDetectedIgnoreTime2.Interval = this.SystemConfig.EntryNotDetectedIgnoreTime; + } #region Uart Communication public void OpenSmartUartLink() @@ -1076,7 +1081,7 @@ namespace ITC81DB_2.Forms // 로그 if (this.IsCommunicationLogOpen == true) - this.smartFileCommunicationLog.WriteString(string.Format("Receive ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, strTemp)); + this.smartFileCommunicationLog.WriteString(string.Format("Receive ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.UtcNow, strTemp)); cmd = strTemp.Substring(0, 3); transferCount = strTemp.Substring(3, 2); @@ -1568,6 +1573,10 @@ namespace ITC81DB_2.Forms this.TransferData(string.Format("{0}{1}{2}", CommunicationCommand.RunWeightData, (int)DataStore.ResponseData.ACK, transferCount), CommunicationID.MainBoard); this.IsJudgmentNow1 = true; + // 로그 + if (this.IsCommunicationLogOpen == true) + this.smartFileCommunicationLog.WriteString(string.Format("IsJudgmentNow1 ({0:yyyy-MM-dd HH:mm:ss}): true", DateTime.Now)); + this.timerEntryNotDetectedIgnoreTime1.Enabled = true; // 통신 COM1 if (this.SystemConfig.SerialCOM1Mode != 0) @@ -1647,6 +1656,10 @@ namespace ITC81DB_2.Forms this.TransferData(string.Format("{0}{1}{2}", CommunicationCommand.RunWeightData, (int)DataStore.ResponseData.ACK, transferCount), CommunicationID.MainBoard); this.IsJudgmentNow2 = true; + // 로그 + if (this.IsCommunicationLogOpen == true) + this.smartFileCommunicationLog.WriteString(string.Format("IsJudgmentNow2 ({0:yyyy-MM-dd HH:mm:ss}): true", DateTime.Now)); + this.timerEntryNotDetectedIgnoreTime2.Enabled = true; // 통신 COM1 if (this.SystemConfig.SerialCOM1Mode != 0) @@ -2344,7 +2357,7 @@ namespace ITC81DB_2.Forms structItem.DummyBool5 = false; structItem.DummyInt1 = 1; structItem.DummyInt2 = 1; - structItem.DummyInt3 = 1; + structItem.EntryNotDetectedIgnoreTime = this.SystemConfig.EntryNotDetectedIgnoreTime; structItem.SensorErrorDetectingTime = this.SystemConfig.SensorErrorDetectingTime; structItem.EquipmentType = this.SystemConfig.EquipmentType; structItem.DummyString1 = ""; @@ -2401,7 +2414,7 @@ namespace ITC81DB_2.Forms structItem.DummyBool5 = false; structItem.DummyInt1 = 1; structItem.DummyInt2 = 1; - structItem.DummyInt3 = 1; + structItem.EntryNotDetectedIgnoreTime = item.EntryNotDetectedIgnoreTime; structItem.SensorErrorDetectingTime = item.SensorErrorDetectingTime; structItem.EquipmentType = item.EquipmentType; structItem.DummyString1 = ""; @@ -2458,6 +2471,7 @@ namespace ITC81DB_2.Forms this.SystemConfig.EquipmentType = structItem.EquipmentType; this.SystemConfig.SensorErrorDetectingTime = structItem.SensorErrorDetectingTime; + this.SystemConfig.EntryNotDetectedIgnoreTime = structItem.EntryNotDetectedIgnoreTime; } catch { @@ -4424,7 +4438,8 @@ namespace ITC81DB_2.Forms this.smartForm.Show((int)DataStore.FormStore.FormMainDisplay); this.ChildFormMainDisplay.CurrentBottomMenuControlEnable(DataStore.EquipmentStatus.Stop); - this.TimerSensorErrorInterval(this.SystemConfig.SensorErrorDetectingTime); + this.TimerSensorErrorInterval(); + this.TimerEntryNotDetectedIgnoreTimeInverval(); // 메인 통신 OPEN this.OpenSmartUartLink(); @@ -4459,13 +4474,36 @@ namespace ITC81DB_2.Forms } } + private void timerEntryNotDetectedIgnoreTime1_Tick(object sender, EventArgs e) + { + this.timerEntryNotDetectedIgnoreTime1.Enabled = false; + + if (this.IsJudgmentNow1 == true) + this.IsJudgmentNow1 = false; + + // 로그 + if (this.IsCommunicationLogOpen == true) + this.smartFileCommunicationLog.WriteString(string.Format("IsJudgmentNow1 ({0:yyyy-MM-dd HH:mm:ss}): false", DateTime.Now)); + } + private void timerEntryNotDetectedIgnoreTime2_Tick(object sender, EventArgs e) + { + this.timerEntryNotDetectedIgnoreTime2.Enabled = false; + + if (this.IsJudgmentNow2 == true) + this.IsJudgmentNow2 = false; + + // 로그 + if (this.IsCommunicationLogOpen == true) + this.smartFileCommunicationLog.WriteString(string.Format("IsJudgmentNow2 ({0:yyyy-MM-dd HH:mm:ss}): false", DateTime.Now)); + } + private void timerSensorError1_Tick(object sender, EventArgs e) { this.timerSensorError1.Enabled = false; if (this.SystemConfig.Language == DataStore.LanguageID.Korean) - this.ChildFormMainDisplay.PopUpWarning("진입센서 이상"); + this.ChildFormMainDisplay.PopUpWarning("#1 진입센서 이상"); else - this.ChildFormMainDisplay.PopUpWarning("Entry Sensor stucked"); + this.ChildFormMainDisplay.PopUpWarning("#1 Entry Sensor stucked"); this.TransferData(CommunicationCommand.BuzzerOnContinuousEnable, CommunicationID.MainBoard); this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); @@ -4474,9 +4512,9 @@ namespace ITC81DB_2.Forms { this.timerSensorError2.Enabled = false; if (this.SystemConfig.Language == DataStore.LanguageID.Korean) - this.ChildFormMainDisplay.PopUpWarning("진입센서 이상"); + this.ChildFormMainDisplay.PopUpWarning("#2 진입센서 이상"); else - this.ChildFormMainDisplay.PopUpWarning("Entry Sensor stucked"); + this.ChildFormMainDisplay.PopUpWarning("#2 Entry Sensor stucked"); this.TransferData(CommunicationCommand.BuzzerOnContinuousEnable, CommunicationID.MainBoard); this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); diff --git a/ITC81DB_2/Forms/FormMain.resx b/ITC81DB_2/Forms/FormMain.resx index eca3d62..b96f13d 100644 --- a/ITC81DB_2/Forms/FormMain.resx +++ b/ITC81DB_2/Forms/FormMain.resx @@ -136,7 +136,7 @@ 961, 17 - 1181, 17 + 1073, 50 19, 17 @@ -150,6 +150,12 @@ 178, 50 + + 332, 51 + + + 604, 51 + WEBPAD diff --git a/ITC81DB_2/Forms/FormMainDisplay.cs b/ITC81DB_2/Forms/FormMainDisplay.cs index 2e4b2b0..a733cde 100644 --- a/ITC81DB_2/Forms/FormMainDisplay.cs +++ b/ITC81DB_2/Forms/FormMainDisplay.cs @@ -246,33 +246,33 @@ namespace ITC81DB_2.Forms { this.MainDisplayAlarm.listBoxMessage.Items.Add("#1 Entry Not Detected"); if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) - this.PopUpWarning("제품진입 미감지"); + this.PopUpWarning("#1 제품진입 미감지"); else - this.PopUpWarning("Entry not detected"); + this.PopUpWarning("#1 Entry not detected"); } if (data2.IsEntryNotDetected == true) { this.MainDisplayAlarm.listBoxMessage.Items.Add("#2 Entry Not Detected"); if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) - this.PopUpWarning("제품진입 미감지"); + this.PopUpWarning("#2 제품진입 미감지"); else - this.PopUpWarning("Entry not detected"); + this.PopUpWarning("#2 Entry not detected"); } if (data1.IsEntryStucked == true) { this.MainDisplayAlarm.listBoxMessage.Items.Add("#1 Entry Sensor Stucked"); if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) - this.PopUpWarning("진입센서 이상"); + this.PopUpWarning("#1 진입센서 이상"); else - this.PopUpWarning("Entry Sensor Stucked"); + this.PopUpWarning("#1 Entry Sensor Stucked"); } if (data2.IsEntryStucked == true) { this.MainDisplayAlarm.listBoxMessage.Items.Add("#2 Entry Sensor Stucked"); if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) - this.PopUpWarning("진입센서 이상"); + this.PopUpWarning("#2 진입센서 이상"); else - this.PopUpWarning("Entry Sensor Stucked"); + this.PopUpWarning("#2 Entry Sensor Stucked"); } if (flagChange == true && this.MainDisplayAlarm.listBoxMessage.Items.Count > 0) diff --git a/ITC81DB_2/Version.txt b/ITC81DB_2/Version.txt index 27a6c79..9520088 100644 --- a/ITC81DB_2/Version.txt +++ b/ITC81DB_2/Version.txt @@ -13,6 +13,12 @@ 2 ⺻ 跮 */ +@ Ver 2.6.4 by CJY + - 2023.1.16 + - Ver 2.6.3 Modify + - ɼ + 1. ǰ ̰ ð ð ߰ + @ Ver 2.6.3 by CJY - 2023.1.12 - Ver 2.6.2 Modify diff --git a/ITC81DB_2/bin/Release/ITC81DB_2.exe b/ITC81DB_2/bin/Release/ITC81DB_2.exe index 37c7590..da61cbc 100644 Binary files a/ITC81DB_2/bin/Release/ITC81DB_2.exe and b/ITC81DB_2/bin/Release/ITC81DB_2.exe differ diff --git a/ITC81DB_2/obj/Release/ITC81DB_2.exe b/ITC81DB_2/obj/Release/ITC81DB_2.exe index 37c7590..da61cbc 100644 Binary files a/ITC81DB_2/obj/Release/ITC81DB_2.exe and b/ITC81DB_2/obj/Release/ITC81DB_2.exe differ