diff --git a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipEngineer.cs b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipEngineer.cs index 7f308e1..c0d5a2b 100644 --- a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipEngineer.cs +++ b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipEngineer.cs @@ -183,12 +183,18 @@ namespace ITC81DB_2.Controls { case 0: // 컨베어 this.ParentForm.ParentForm.SystemConfig.EquipmentType = 0; + this.ParentForm.CenterSystemSorterSetting.UpdateControlEnable(true); + this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateControlVisible(false); break; case 1: // 업다운 this.ParentForm.ParentForm.SystemConfig.EquipmentType = 4; + this.ParentForm.CenterSystemSorterSetting.UpdateControlEnable(false); + this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateControlVisible(true); break; default: this.ParentForm.ParentForm.SystemConfig.EquipmentType = 0; + this.ParentForm.CenterSystemSorterSetting.UpdateControlEnable(true); + this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateControlVisible(false); break; } diff --git a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.cs b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.cs index 11103c6..a35dad5 100644 --- a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.cs +++ b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.cs @@ -156,7 +156,7 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.SystemConfig.EquipmentType) { case 0: - this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.engBackgroundJudgment)); + this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.engBackgroundJudgment)); break; case 4: this.buttonUp.Visible = true; diff --git a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemSorterSetting.cs b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemSorterSetting.cs index 1e8b038..f4fb07f 100644 --- a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemSorterSetting.cs +++ b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemSorterSetting.cs @@ -227,7 +227,10 @@ namespace ITC81DB_2.Controls } private void DefaultSetting() { - + if (this.ParentForm.ParentForm.SystemConfig.EquipmentType == 4) + this.UpdateControlEnable(false); + else + this.UpdateControlEnable(true); } private void UpdateControlsDisplay1(JudgmentSetItem item1,JudgmentSetItem item2, SystemParameter9507 parameter) @@ -386,6 +389,16 @@ namespace ITC81DB_2.Controls //this.pictureBoxStop.Visible = true; } } + public void UpdateControlEnable(bool enable) + { + this.comboBoxOut9Mode.Enabled = enable; + this.labelOut9DelayTime.Enabled = enable; + this.labelOut9RunTime.Enabled = enable; + + this.comboBoxOut10Mode.Enabled = enable; + this.labelOut10DelayTime.Enabled = enable; + this.labelOut10RunTime.Enabled = enable; + } public void DisplayRefresh(SystemStatus status) { diff --git a/ITC81DB_2/DataStore.cs b/ITC81DB_2/DataStore.cs index cffac04..8ae667d 100644 --- a/ITC81DB_2/DataStore.cs +++ b/ITC81DB_2/DataStore.cs @@ -1863,8 +1863,8 @@ namespace ITC81DB_2 this.AutoJudgment2 = 100; this.AutoJudgment3 = 100; - this.DescendDelayTime = 1000; - this.AscendDelayTime = 1000; + this.DescendDelayTime = 400; + this.AscendDelayTime = 200; } #endregion } diff --git a/ITC81DB_2/Forms/FormMain.cs b/ITC81DB_2/Forms/FormMain.cs index 56ca467..8ece7c5 100644 --- a/ITC81DB_2/Forms/FormMain.cs +++ b/ITC81DB_2/Forms/FormMain.cs @@ -152,7 +152,7 @@ namespace ITC81DB_2.Forms this.CollectionGraphData = new Collection(); this.CollectionGraphData.Clear(); - for (int i = 0; i < 200; i++) + for (int i = 0; i < 300; i++) this.CollectionGraphData.Add(0); this.SystemConfig = new SystemConfigurationItem(); @@ -231,8 +231,8 @@ namespace ITC81DB_2.Forms sb.Append(Helper.StringZeroFillDigits4(jItem.Sorter2DelayTime.ToString())); // 선별기2지연시간(4) sb.Append(Helper.StringZeroFillDigits4(jItem.Sorter2RunTime.ToString())); // 선별기2동작시간(4) sb.Append(Helper.StringZeroFillDigits4(this.SystemConfig.EquipmentID.ToString())); // 장비ID(4) - sb.Append("0000"); // Dummy2(4) - sb.Append("0000"); // Dummy3(4) + sb.Append(Helper.StringZeroFillDigits4(jItem.DescendDelayTime.ToString())); // 하강지연(4) + sb.Append(Helper.StringZeroFillDigits4(jItem.AscendDelayTime.ToString())); // 상승지연(4) sb.Append("0000"); // Dummy4(4) sb.Append("0000"); // Dummy5(4) sb.Append(Helper.StringZeroFillDigits4(pItem.Number.ToString())); // 품번 @@ -274,8 +274,8 @@ namespace ITC81DB_2.Forms sb.Append(Helper.StringZeroFillDigits4(jItem.Sorter2DelayTime.ToString())); // 선별기2지연시간(4) sb.Append(Helper.StringZeroFillDigits4(jItem.Sorter2RunTime.ToString())); // 선별기2동작시간(4) sb.Append(Helper.StringZeroFillDigits4(this.SystemConfig.EquipmentID.ToString())); // 장비ID(4) - sb.Append("0000"); // Dummy2(4) - sb.Append("0000"); // Dummy3(4) + sb.Append(Helper.StringZeroFillDigits4(jItem.DescendDelayTime.ToString())); // 하강지연(4) + sb.Append(Helper.StringZeroFillDigits4(jItem.AscendDelayTime.ToString())); // 상승지연(4) sb.Append("0000"); // Dummy4(4) sb.Append("0000"); // Dummy5(4) sb.Append(Helper.StringZeroFillDigits4(pItem.Number.ToString())); // 품번 @@ -1356,7 +1356,7 @@ namespace ITC81DB_2.Forms break; case "9006": if (response == DataStore.ResponseData.ACK) - this.TransferProductParameter1(this.SystemConfig.ProductNumber); + this.TransferProductParameter1(this.SystemConfig.ProductNumber); break; case "9007": if (response == DataStore.ResponseData.ACK) diff --git a/ITC81DB_2/Forms/FormMainDisplay.cs b/ITC81DB_2/Forms/FormMainDisplay.cs index 1219306..8562534 100644 --- a/ITC81DB_2/Forms/FormMainDisplay.cs +++ b/ITC81DB_2/Forms/FormMainDisplay.cs @@ -151,9 +151,9 @@ namespace ITC81DB_2.Forms this.MainDisplayAlarm.BringToFront(); if (this.ParentForm.SystemConfig.EquipmentType == 4) - this.buttonConveyorUpDown.Visible = true; + this.UpdateControlVisible(true); else - this.buttonConveyorUpDown.Visible = false; + this.UpdateControlVisible(false); if (this.ParentForm.SystemConfig.IsLogin == true) this.UpdateDisplayUser(this.ParentForm.CurrentSystemStatus); @@ -622,6 +622,10 @@ namespace ITC81DB_2.Forms break; } } + public void UpdateControlVisible(bool enable) + { + this.buttonConveyorUpDown.Visible = enable; + } public void UpdateTimeDisplay() { @@ -640,12 +644,7 @@ namespace ITC81DB_2.Forms this.MainDisplayDataStatistics.DisplayRefresh(status); if (this.ParentForm.SystemConfig.EquipmentType == 4) - { - this.buttonConveyorUpDown.Visible = true; this.buttonConveyorUpDown.ButtonUp(); - } - else - this.buttonConveyorUpDown.Visible = false; this.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.MainDisplay; this.ParentForm.SetDisplayMode(DataStore.DisplayMode.Normal); diff --git a/ITC81DB_2/Version.txt b/ITC81DB_2/Version.txt index 14942fb..61a218c 100644 --- a/ITC81DB_2/Version.txt +++ b/ITC81DB_2/Version.txt @@ -16,6 +16,7 @@ @ Ver 2.0.0 by CJY - 2020.07.15 - Ver 1.9.0 Modify + - α׷ INT81M-2 : V2.0.0 ̻󿡼 ȣȯ - ٿ ߰ 1. ȭ - Motor Up/Down ư ߰ @@ -30,7 +31,7 @@ - dummy(4), dummy(4) -> ϰ(4), (4) - ý 1 : 9014 - ý 2 : 9017 - - , ȭ鿡 Start/Stop ϵ + - ȭ鿡 Start/Stop ϵ @ Ver 1.9.0 by CJY - 2020.06.30 diff --git a/ITC81DB_2/bin/Release/ITC81DB_2.exe b/ITC81DB_2/bin/Release/ITC81DB_2.exe index b8759d9..55d83cd 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 b8759d9..55d83cd 100644 Binary files a/ITC81DB_2/obj/Release/ITC81DB_2.exe and b/ITC81DB_2/obj/Release/ITC81DB_2.exe differ diff --git a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/Refactor/ITC81DB_2_ImageDll.dll b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/Refactor/ITC81DB_2_ImageDll.dll index 97a7e97..dd9e613 100644 Binary files a/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/Refactor/ITC81DB_2_ImageDll.dll and b/ITC81DB_2_ImageDll/ITC81DB_2_ImageDll/obj/Release/Refactor/ITC81DB_2_ImageDll.dll differ