diff --git a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.Designer.cs b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.Designer.cs index 241f926..4de0e4b 100644 --- a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.Designer.cs +++ b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.Designer.cs @@ -203,10 +203,10 @@ this.smartGroupBox2.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.Rectangle; this.smartGroupBox2.Image = null; this.smartGroupBox2.InitVisible = true; - this.smartGroupBox2.Location = new System.Drawing.Point(380, 44); + this.smartGroupBox2.Location = new System.Drawing.Point(405, 43); this.smartGroupBox2.Name = "smartGroupBox2"; this.smartGroupBox2.RoundRadius = 5; - this.smartGroupBox2.Size = new System.Drawing.Size(324, 184); + this.smartGroupBox2.Size = new System.Drawing.Size(296, 184); this.smartGroupBox2.TabIndex = 151; this.smartGroupBox2.TextColor = System.Drawing.Color.Black; this.smartGroupBox2.Visible = false; @@ -222,9 +222,9 @@ this.labelExternalInputMessage2.ForeColor = System.Drawing.Color.Gold; this.labelExternalInputMessage2.InitVisible = true; this.labelExternalInputMessage2.LineSpacing = 0F; - this.labelExternalInputMessage2.Location = new System.Drawing.Point(18, 52); + this.labelExternalInputMessage2.Location = new System.Drawing.Point(26, 63); this.labelExternalInputMessage2.Name = "labelExternalInputMessage2"; - this.labelExternalInputMessage2.Size = new System.Drawing.Size(290, 20); + this.labelExternalInputMessage2.Size = new System.Drawing.Size(253, 20); this.labelExternalInputMessage2.TabIndex = 194; this.labelExternalInputMessage2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; this.labelExternalInputMessage2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; @@ -241,9 +241,9 @@ this.labelExternalInputMessage1.ForeColor = System.Drawing.Color.Gold; this.labelExternalInputMessage1.InitVisible = true; this.labelExternalInputMessage1.LineSpacing = 0F; - this.labelExternalInputMessage1.Location = new System.Drawing.Point(18, 32); + this.labelExternalInputMessage1.Location = new System.Drawing.Point(26, 43); this.labelExternalInputMessage1.Name = "labelExternalInputMessage1"; - this.labelExternalInputMessage1.Size = new System.Drawing.Size(290, 20); + this.labelExternalInputMessage1.Size = new System.Drawing.Size(253, 20); this.labelExternalInputMessage1.TabIndex = 193; this.labelExternalInputMessage1.Text = "배출, 공압, 비상정지, 적체"; this.labelExternalInputMessage1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -262,7 +262,7 @@ this.buttonExternalInputBuzzer.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonExternalInputBuzzer.DownImage"))); this.buttonExternalInputBuzzer.GroupID = 0; this.buttonExternalInputBuzzer.InitVisible = true; - this.buttonExternalInputBuzzer.Location = new System.Drawing.Point(220, 77); + this.buttonExternalInputBuzzer.Location = new System.Drawing.Point(191, 88); this.buttonExternalInputBuzzer.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonExternalInputBuzzer.Name = "buttonExternalInputBuzzer"; this.buttonExternalInputBuzzer.NestedClickEventPrevent = false; @@ -293,7 +293,7 @@ this.buttonExternalInputLamp.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonExternalInputLamp.DownImage"))); this.buttonExternalInputLamp.GroupID = 0; this.buttonExternalInputLamp.InitVisible = true; - this.buttonExternalInputLamp.Location = new System.Drawing.Point(220, 111); + this.buttonExternalInputLamp.Location = new System.Drawing.Point(191, 122); this.buttonExternalInputLamp.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonExternalInputLamp.Name = "buttonExternalInputLamp"; this.buttonExternalInputLamp.NestedClickEventPrevent = false; @@ -323,9 +323,9 @@ this.labelTitleExternalInputLamp.ForeColor = System.Drawing.Color.White; this.labelTitleExternalInputLamp.InitVisible = true; this.labelTitleExternalInputLamp.LineSpacing = 0F; - this.labelTitleExternalInputLamp.Location = new System.Drawing.Point(26, 111); + this.labelTitleExternalInputLamp.Location = new System.Drawing.Point(26, 122); this.labelTitleExternalInputLamp.Name = "labelTitleExternalInputLamp"; - this.labelTitleExternalInputLamp.Size = new System.Drawing.Size(178, 28); + this.labelTitleExternalInputLamp.Size = new System.Drawing.Size(149, 28); this.labelTitleExternalInputLamp.TabIndex = 190; this.labelTitleExternalInputLamp.Text = "램프"; this.labelTitleExternalInputLamp.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -343,9 +343,9 @@ this.labelTitleExternalInputBuzzer.ForeColor = System.Drawing.Color.White; this.labelTitleExternalInputBuzzer.InitVisible = true; this.labelTitleExternalInputBuzzer.LineSpacing = 0F; - this.labelTitleExternalInputBuzzer.Location = new System.Drawing.Point(26, 77); + this.labelTitleExternalInputBuzzer.Location = new System.Drawing.Point(26, 88); this.labelTitleExternalInputBuzzer.Name = "labelTitleExternalInputBuzzer"; - this.labelTitleExternalInputBuzzer.Size = new System.Drawing.Size(178, 28); + this.labelTitleExternalInputBuzzer.Size = new System.Drawing.Size(149, 28); this.labelTitleExternalInputBuzzer.TabIndex = 189; this.labelTitleExternalInputBuzzer.Text = "부저"; this.labelTitleExternalInputBuzzer.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -357,7 +357,7 @@ this.comboBoxPIN2.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); this.comboBoxPIN2.Location = new System.Drawing.Point(131, 53); this.comboBoxPIN2.Name = "comboBoxPIN2"; - this.comboBoxPIN2.Size = new System.Drawing.Size(240, 28); + this.comboBoxPIN2.Size = new System.Drawing.Size(268, 28); this.comboBoxPIN2.TabIndex = 186; this.comboBoxPIN2.SelectedIndexChanged += new System.EventHandler(this.comboBoxPIN2_SelectedIndexChanged); // @@ -366,7 +366,7 @@ this.comboBoxPIN3.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); this.comboBoxPIN3.Location = new System.Drawing.Point(131, 87); this.comboBoxPIN3.Name = "comboBoxPIN3"; - this.comboBoxPIN3.Size = new System.Drawing.Size(240, 28); + this.comboBoxPIN3.Size = new System.Drawing.Size(268, 28); this.comboBoxPIN3.TabIndex = 185; this.comboBoxPIN3.SelectedIndexChanged += new System.EventHandler(this.comboBoxPIN3_SelectedIndexChanged); // @@ -375,7 +375,7 @@ this.comboBoxPIN4.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); this.comboBoxPIN4.Location = new System.Drawing.Point(131, 121); this.comboBoxPIN4.Name = "comboBoxPIN4"; - this.comboBoxPIN4.Size = new System.Drawing.Size(240, 28); + this.comboBoxPIN4.Size = new System.Drawing.Size(268, 28); this.comboBoxPIN4.TabIndex = 184; this.comboBoxPIN4.SelectedIndexChanged += new System.EventHandler(this.comboBoxPIN4_SelectedIndexChanged); // @@ -384,7 +384,7 @@ this.comboBoxPIN5.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); this.comboBoxPIN5.Location = new System.Drawing.Point(131, 155); this.comboBoxPIN5.Name = "comboBoxPIN5"; - this.comboBoxPIN5.Size = new System.Drawing.Size(240, 28); + this.comboBoxPIN5.Size = new System.Drawing.Size(268, 28); this.comboBoxPIN5.TabIndex = 183; this.comboBoxPIN5.SelectedIndexChanged += new System.EventHandler(this.comboBoxPIN5_SelectedIndexChanged); // @@ -393,7 +393,7 @@ this.comboBoxPIN6.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); this.comboBoxPIN6.Location = new System.Drawing.Point(131, 189); this.comboBoxPIN6.Name = "comboBoxPIN6"; - this.comboBoxPIN6.Size = new System.Drawing.Size(240, 28); + this.comboBoxPIN6.Size = new System.Drawing.Size(268, 28); this.comboBoxPIN6.TabIndex = 182; this.comboBoxPIN6.SelectedIndexChanged += new System.EventHandler(this.comboBoxPIN6_SelectedIndexChanged); // diff --git a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs index 35b3919..3ebf5ec 100644 --- a/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs +++ b/ITC81DB_0H/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs @@ -78,6 +78,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN6.Items.Add("NG"); this.comboBoxPIN6.Items.Add("START"); this.comboBoxPIN6.Items.Add("STOP"); + this.comboBoxPIN6.Items.Add("Air Check"); this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); @@ -86,6 +87,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN5.Items.Add("NG"); this.comboBoxPIN5.Items.Add("START"); this.comboBoxPIN5.Items.Add("STOP"); + this.comboBoxPIN5.Items.Add("Air Check"); this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); @@ -94,6 +96,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN4.Items.Add("NG"); this.comboBoxPIN4.Items.Add("START"); this.comboBoxPIN4.Items.Add("STOP"); + this.comboBoxPIN4.Items.Add("Air Check"); this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); @@ -102,6 +105,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN3.Items.Add("NG"); this.comboBoxPIN3.Items.Add("START"); this.comboBoxPIN3.Items.Add("STOP"); + this.comboBoxPIN3.Items.Add("Air Check"); this.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); @@ -110,6 +114,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN2.Items.Add("NG"); this.comboBoxPIN2.Items.Add("START"); this.comboBoxPIN2.Items.Add("STOP"); + this.comboBoxPIN2.Items.Add("Air Check"); this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.buttonLogin.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engON)); @@ -145,6 +150,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN6.Items.Add("NG"); this.comboBoxPIN6.Items.Add("开启"); this.comboBoxPIN6.Items.Add("停止"); + this.comboBoxPIN6.Items.Add("气压确认"); this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); @@ -153,6 +159,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN5.Items.Add("NG"); this.comboBoxPIN5.Items.Add("开启"); this.comboBoxPIN5.Items.Add("停止"); + this.comboBoxPIN5.Items.Add("气压确认"); this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); @@ -161,6 +168,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN4.Items.Add("NG"); this.comboBoxPIN4.Items.Add("开启"); this.comboBoxPIN4.Items.Add("停止"); + this.comboBoxPIN4.Items.Add("气压确认"); this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); @@ -169,6 +177,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN3.Items.Add("NG"); this.comboBoxPIN3.Items.Add("开启"); this.comboBoxPIN3.Items.Add("停止"); + this.comboBoxPIN3.Items.Add("气压确认"); this.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); @@ -177,6 +186,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN2.Items.Add("NG"); this.comboBoxPIN2.Items.Add("开启"); this.comboBoxPIN2.Items.Add("停止"); + this.comboBoxPIN2.Items.Add("气压确认"); this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.buttonLogin.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnON)); @@ -218,6 +228,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN6.Items.Add("Другие неисправности"); this.comboBoxPIN6.Items.Add("Старт"); this.comboBoxPIN6.Items.Add("Стоп"); + this.comboBoxPIN6.Items.Add("Проверка давления"); this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); @@ -226,6 +237,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN5.Items.Add("Другие неисправности"); this.comboBoxPIN5.Items.Add("Старт"); this.comboBoxPIN5.Items.Add("Стоп"); + this.comboBoxPIN5.Items.Add("Проверка давления"); this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); @@ -234,6 +246,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN4.Items.Add("Другие неисправности"); this.comboBoxPIN4.Items.Add("Старт"); this.comboBoxPIN4.Items.Add("Стоп"); + this.comboBoxPIN4.Items.Add("Проверка давления"); this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); @@ -242,6 +255,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN3.Items.Add("Другие неисправности"); this.comboBoxPIN3.Items.Add("Старт"); this.comboBoxPIN3.Items.Add("Стоп"); + this.comboBoxPIN3.Items.Add("Проверка давления"); this.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); @@ -250,6 +264,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN2.Items.Add("Другие неисправности"); this.comboBoxPIN2.Items.Add("Старт"); this.comboBoxPIN2.Items.Add("Стоп"); + this.comboBoxPIN2.Items.Add("Проверка давления"); this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.buttonLogin.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusON)); @@ -285,6 +300,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN6.Items.Add("NG"); this.comboBoxPIN6.Items.Add("START"); this.comboBoxPIN6.Items.Add("STOPP"); + this.comboBoxPIN6.Items.Add("Luft Prüfen"); this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); @@ -293,6 +309,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN5.Items.Add("NG"); this.comboBoxPIN5.Items.Add("START"); this.comboBoxPIN5.Items.Add("STOPP"); + this.comboBoxPIN5.Items.Add("Luft Prüfen"); this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); @@ -301,6 +318,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN4.Items.Add("NG"); this.comboBoxPIN4.Items.Add("START"); this.comboBoxPIN4.Items.Add("STOPP"); + this.comboBoxPIN4.Items.Add("Luft Prüfen"); this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); @@ -309,6 +327,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN3.Items.Add("NG"); this.comboBoxPIN3.Items.Add("START"); this.comboBoxPIN3.Items.Add("STOPP"); + this.comboBoxPIN3.Items.Add("Luft Prüfen"); this.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); @@ -317,6 +336,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN2.Items.Add("NG"); this.comboBoxPIN2.Items.Add("START"); this.comboBoxPIN2.Items.Add("STOPP"); + this.comboBoxPIN2.Items.Add("Luft Prüfen"); this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.buttonLogin.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerON)); @@ -352,6 +372,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN6.Items.Add("NG"); this.comboBoxPIN6.Items.Add("START"); this.comboBoxPIN6.Items.Add("STOP"); + this.comboBoxPIN6.Items.Add("공압확인"); this.comboBoxPIN6.SelectedIndexChanged += new EventHandler(this.comboBoxPIN6_SelectedIndexChanged); this.comboBoxPIN5.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); @@ -360,6 +381,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN5.Items.Add("NG"); this.comboBoxPIN5.Items.Add("START"); this.comboBoxPIN5.Items.Add("STOP"); + this.comboBoxPIN5.Items.Add("공압확인"); this.comboBoxPIN5.SelectedIndexChanged += new EventHandler(this.comboBoxPIN5_SelectedIndexChanged); this.comboBoxPIN4.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); @@ -368,6 +390,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN4.Items.Add("NG"); this.comboBoxPIN4.Items.Add("START"); this.comboBoxPIN4.Items.Add("STOP"); + this.comboBoxPIN4.Items.Add("공압확인"); this.comboBoxPIN4.SelectedIndexChanged += new EventHandler(this.comboBoxPIN4_SelectedIndexChanged); this.comboBoxPIN3.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); @@ -376,6 +399,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN3.Items.Add("NG"); this.comboBoxPIN3.Items.Add("START"); this.comboBoxPIN3.Items.Add("STOP"); + this.comboBoxPIN3.Items.Add("공압확인"); this.comboBoxPIN3.SelectedIndexChanged += new EventHandler(this.comboBoxPIN3_SelectedIndexChanged); this.comboBoxPIN2.SelectedIndexChanged -= new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); @@ -384,6 +408,7 @@ namespace ITC81DB_0H.Controls this.comboBoxPIN2.Items.Add("NG"); this.comboBoxPIN2.Items.Add("START"); this.comboBoxPIN2.Items.Add("STOP"); + this.comboBoxPIN2.Items.Add("공압확인"); this.comboBoxPIN2.SelectedIndexChanged += new EventHandler(this.comboBoxPIN2_SelectedIndexChanged); this.buttonLogin.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engON)); @@ -722,26 +747,8 @@ namespace ITC81DB_0H.Controls { string value = ""; - if (this.comboBoxPIN6.SelectedIndex == 1) - { - value = Helper.StringZeroFillDigits4("1"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 = 1; - } - else if (this.comboBoxPIN6.SelectedIndex == 2) - { - value = Helper.StringZeroFillDigits4("2"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 = 2; - } - else if (this.comboBoxPIN6.SelectedIndex == 3) - { - value = Helper.StringZeroFillDigits4("3"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 = 3; - } - else - { - value = Helper.StringZeroFillDigits4("0"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 = 0; - } + value = Helper.StringZeroFillDigits4(this.comboBoxPIN6.SelectedIndex.ToString()); + this.ParentForm.ParentForm.CurrentSystemParameter1.PI6 = this.comboBoxPIN6.SelectedIndex; this.ParentForm.ParentForm.SaveSystemParameter1File(this.ParentForm.ParentForm.CurrentSystemParameter1); this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.PI6, value); @@ -750,26 +757,8 @@ namespace ITC81DB_0H.Controls { string value = ""; - if (this.comboBoxPIN5.SelectedIndex == 1) - { - value = Helper.StringZeroFillDigits4("1"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 = 1; - } - else if (this.comboBoxPIN5.SelectedIndex == 2) - { - value = Helper.StringZeroFillDigits4("2"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 = 2; - } - else if (this.comboBoxPIN5.SelectedIndex == 3) - { - value = Helper.StringZeroFillDigits4("3"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 = 3; - } - else - { - value = Helper.StringZeroFillDigits4("0"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 = 0; - } + value = Helper.StringZeroFillDigits4(this.comboBoxPIN5.SelectedIndex.ToString()); + this.ParentForm.ParentForm.CurrentSystemParameter1.PI5 = this.comboBoxPIN5.SelectedIndex; this.ParentForm.ParentForm.SaveSystemParameter1File(this.ParentForm.ParentForm.CurrentSystemParameter1); this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.PI5, value); @@ -778,26 +767,8 @@ namespace ITC81DB_0H.Controls { string value = ""; - if (this.comboBoxPIN4.SelectedIndex == 1) - { - value = Helper.StringZeroFillDigits4("1"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 = 1; - } - else if (this.comboBoxPIN4.SelectedIndex == 2) - { - value = Helper.StringZeroFillDigits4("2"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 = 2; - } - else if (this.comboBoxPIN4.SelectedIndex == 3) - { - value = Helper.StringZeroFillDigits4("3"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 = 3; - } - else - { - value = Helper.StringZeroFillDigits4("0"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 = 0; - } + value = Helper.StringZeroFillDigits4(this.comboBoxPIN4.SelectedIndex.ToString()); + this.ParentForm.ParentForm.CurrentSystemParameter1.PI4 = this.comboBoxPIN4.SelectedIndex; this.ParentForm.ParentForm.SaveSystemParameter1File(this.ParentForm.ParentForm.CurrentSystemParameter1); this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.PI4, value); @@ -806,26 +777,8 @@ namespace ITC81DB_0H.Controls { string value = ""; - if (this.comboBoxPIN3.SelectedIndex == 1) - { - value = Helper.StringZeroFillDigits4("1"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 = 1; - } - else if(this.comboBoxPIN3.SelectedIndex == 2) - { - value = Helper.StringZeroFillDigits4("2"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 = 2; - } - else if (this.comboBoxPIN3.SelectedIndex == 3) - { - value = Helper.StringZeroFillDigits4("3"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 = 3; - } - else - { - value = Helper.StringZeroFillDigits4("0"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 = 0; - } + value = Helper.StringZeroFillDigits4(this.comboBoxPIN3.SelectedIndex.ToString()); + this.ParentForm.ParentForm.CurrentSystemParameter1.PI3 = this.comboBoxPIN3.SelectedIndex; this.ParentForm.ParentForm.SaveSystemParameter1File(this.ParentForm.ParentForm.CurrentSystemParameter1); this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.PI3, value); @@ -834,26 +787,8 @@ namespace ITC81DB_0H.Controls { string value = ""; - if (this.comboBoxPIN2.SelectedIndex == 1) - { - value = Helper.StringZeroFillDigits4("1"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 = 1; - } - else if (this.comboBoxPIN2.SelectedIndex == 2) - { - value = Helper.StringZeroFillDigits4("2"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 = 2; - } - else if (this.comboBoxPIN2.SelectedIndex == 3) - { - value = Helper.StringZeroFillDigits4("3"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 = 3; - } - else - { - value = Helper.StringZeroFillDigits4("0"); - this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 = 0; - } + value = Helper.StringZeroFillDigits4(this.comboBoxPIN2.SelectedIndex.ToString()); + this.ParentForm.ParentForm.CurrentSystemParameter1.PI2 = this.comboBoxPIN2.SelectedIndex; this.ParentForm.ParentForm.SaveSystemParameter1File(this.ParentForm.ParentForm.CurrentSystemParameter1); this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.PI2, value); diff --git a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs index 00634f4..12b3e5e 100644 --- a/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs +++ b/ITC81DB_0H/Controls/CenterInformation/ControlCenterInforSystem.cs @@ -66,7 +66,7 @@ namespace ITC81DB_0H.Controls private void DefaultSetting() { this.labelSerialNo.Text = this.ParentForm.ParentForm.SystemConfig1.SerialNumber; - this.labelDisplayVer.Text = "1.3.2"; + this.labelDisplayVer.Text = "1.4.0"; } public void UpdateMainBoardVersionDisplay(string version) diff --git a/ITC81DB_0H/Version.txt b/ITC81DB_0H/Version.txt index 2cd41cd..edacedc 100644 --- a/ITC81DB_0H/Version.txt +++ b/ITC81DB_0H/Version.txt @@ -12,6 +12,11 @@ ⺻ м 跮 */ +@ Ver 1.4.0 by CJY + - 2022.08.24 + - Ver 1.3.2 Modify + - - ܺԷ - Ȯ ߰ + @ Ver 1.3.2 by CJY - 2022.07.22 - Ver 1.3.1 Modify diff --git a/ITC81DB_0H/bin/Release/ITC81DB_2H.exe b/ITC81DB_0H/bin/Release/ITC81DB_2H.exe index b3e4035..11292d8 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 b3e4035..11292d8 100644 Binary files a/ITC81DB_0H/obj/Release/ITC81DB_2H.exe and b/ITC81DB_0H/obj/Release/ITC81DB_2H.exe differ