diff --git a/ITC81DB_2/Controls/Bottom/ControlBottomBasic.cs b/ITC81DB_2/Controls/Bottom/ControlBottomBasic.cs index 3e44d90..d4aa072 100644 --- a/ITC81DB_2/Controls/Bottom/ControlBottomBasic.cs +++ b/ITC81DB_2/Controls/Bottom/ControlBottomBasic.cs @@ -18,7 +18,7 @@ namespace ITC81DB_2.Controls #region Field private FormMenu m_ParentForm; - private DataStore.MenuBottomBasic CurrentMenu; + private Define.E_MenuBottomBasic CurrentMenu; private Collection CollectionButtonMenu; #endregion @@ -48,7 +48,7 @@ namespace ITC81DB_2.Controls } private void DefaultSetting() { - this.CurrentMenu = DataStore.MenuBottomBasic.Help; + this.CurrentMenu = Define.E_MenuBottomBasic.Help; this.CollectionButtonMenu = new Collection(); this.CollectionButtonMenu.Clear(); @@ -65,11 +65,11 @@ namespace ITC81DB_2.Controls button.Enabled = enable; } - public void UpdateDisplayMenuButton(DataStore.MenuBottomBasic menu) + public void UpdateDisplayMenuButton(Define.E_MenuBottomBasic menu) { switch (menu) { - case DataStore.MenuBottomBasic.DataBackup: + case Define.E_MenuBottomBasic.DataBackup: if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonHelp.ButtonUp(); if (this.buttonTime.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -81,7 +81,7 @@ namespace ITC81DB_2.Controls if (this.buttonDataStatistics.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonDataStatistics.ButtonUp(); break; - case DataStore.MenuBottomBasic.DataStatistics: + case Define.E_MenuBottomBasic.DataStatistics: if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonHelp.ButtonUp(); if (this.buttonTime.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -93,7 +93,7 @@ namespace ITC81DB_2.Controls if (this.buttonDataStatistics.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonDataStatistics.ButtonDown(); break; - case DataStore.MenuBottomBasic.Help: + case Define.E_MenuBottomBasic.Help: if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonHelp.ButtonDown(); if (this.buttonTime.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -105,7 +105,7 @@ namespace ITC81DB_2.Controls if (this.buttonDataStatistics.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonDataStatistics.ButtonUp(); break; - case DataStore.MenuBottomBasic.Product: + case Define.E_MenuBottomBasic.Product: if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonHelp.ButtonUp(); if (this.buttonTime.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -117,7 +117,7 @@ namespace ITC81DB_2.Controls if (this.buttonDataStatistics.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonDataStatistics.ButtonUp(); break; - case DataStore.MenuBottomBasic.Time: + case Define.E_MenuBottomBasic.Time: if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonHelp.ButtonUp(); if (this.buttonTime.ButtonStatus != SmartButton.BUTSTATUS.DOWN) @@ -142,7 +142,7 @@ namespace ITC81DB_2.Controls this.buttonProduct.ButtonUp(); this.buttonTime.ButtonUp(); - this.CurrentMenu = DataStore.MenuBottomBasic.Help; + this.CurrentMenu = Define.E_MenuBottomBasic.Help; this.ParentForm.DisplayBottomBasic(this.CurrentMenu); } #endregion @@ -156,17 +156,17 @@ namespace ITC81DB_2.Controls return; if (button == this.buttonHelp) - this.CurrentMenu = DataStore.MenuBottomBasic.Help; + this.CurrentMenu = Define.E_MenuBottomBasic.Help; else if (button == this.buttonTime) - this.CurrentMenu = DataStore.MenuBottomBasic.Time; + this.CurrentMenu = Define.E_MenuBottomBasic.Time; else if (button == this.buttonProduct) - this.CurrentMenu = DataStore.MenuBottomBasic.Product; + this.CurrentMenu = Define.E_MenuBottomBasic.Product; else if (button == this.buttonDataBackup) - this.CurrentMenu = DataStore.MenuBottomBasic.DataBackup; + this.CurrentMenu = Define.E_MenuBottomBasic.DataBackup; else if (button == this.buttonDataStatistics) - this.CurrentMenu = DataStore.MenuBottomBasic.DataStatistics; + this.CurrentMenu = Define.E_MenuBottomBasic.DataStatistics; else - this.CurrentMenu = DataStore.MenuBottomBasic.Help; + this.CurrentMenu = Define.E_MenuBottomBasic.Help; this.ParentForm.DisplayBottomBasic(this.CurrentMenu); } diff --git a/ITC81DB_2/Controls/Bottom/ControlBottomConfiguration.cs b/ITC81DB_2/Controls/Bottom/ControlBottomConfiguration.cs index 01d8b4d..8bd0820 100644 --- a/ITC81DB_2/Controls/Bottom/ControlBottomConfiguration.cs +++ b/ITC81DB_2/Controls/Bottom/ControlBottomConfiguration.cs @@ -18,7 +18,7 @@ namespace ITC81DB_2.Controls #region Field private FormMenu m_ParentForm; - private DataStore.MenuBottomConfiguration CurrentMenu; + private Define.E_MenuBottomConfiguration CurrentMenu; private Collection CollectionButtonMenu; #endregion @@ -48,7 +48,7 @@ namespace ITC81DB_2.Controls } private void DefaultSetting() { - this.CurrentMenu = DataStore.MenuBottomConfiguration.Help; + this.CurrentMenu = Define.E_MenuBottomConfiguration.Help; this.CollectionButtonMenu = new Collection(); this.CollectionButtonMenu.Clear(); @@ -73,11 +73,11 @@ namespace ITC81DB_2.Controls else this.buttonOptionBoard.Visible = true; } - public void UpdateDisplayMenuButton(DataStore.MenuBottomConfiguration menu) + public void UpdateDisplayMenuButton(Define.E_MenuBottomConfiguration menu) { switch (menu) { - case DataStore.MenuBottomConfiguration.Communication: + case Define.E_MenuBottomConfiguration.Communication: if (this.buttonCommunication.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonCommunication.ButtonDown(); if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -85,7 +85,7 @@ namespace ITC81DB_2.Controls if (this.buttonOptionBoard.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonOptionBoard.ButtonUp(); break; - case DataStore.MenuBottomConfiguration.Help: + case Define.E_MenuBottomConfiguration.Help: if (this.buttonCommunication.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonCommunication.ButtonUp(); if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.DOWN) @@ -95,7 +95,7 @@ namespace ITC81DB_2.Controls if (this.buttonOptionBoard.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonOptionBoard.ButtonUp(); break; - case DataStore.MenuBottomConfiguration.OptionBoard: + case Define.E_MenuBottomConfiguration.OptionBoard: if (this.buttonCommunication.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonCommunication.ButtonUp(); if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -114,7 +114,7 @@ namespace ITC81DB_2.Controls this.buttonCommunication.ButtonUp(); this.buttonOptionBoard.ButtonUp(); - this.CurrentMenu = DataStore.MenuBottomConfiguration.Help; + this.CurrentMenu = Define.E_MenuBottomConfiguration.Help; this.ParentForm.DisplayBottomConfiguration(this.CurrentMenu); } #endregion @@ -128,13 +128,13 @@ namespace ITC81DB_2.Controls return; if (button == this.buttonHelp) - this.CurrentMenu = DataStore.MenuBottomConfiguration.Help; + this.CurrentMenu = Define.E_MenuBottomConfiguration.Help; else if (button == this.buttonCommunication) - this.CurrentMenu = DataStore.MenuBottomConfiguration.Communication; + this.CurrentMenu = Define.E_MenuBottomConfiguration.Communication; else if (button == this.buttonOptionBoard) - this.CurrentMenu = DataStore.MenuBottomConfiguration.OptionBoard; + this.CurrentMenu = Define.E_MenuBottomConfiguration.OptionBoard; else - this.CurrentMenu = DataStore.MenuBottomConfiguration.Help; + this.CurrentMenu = Define.E_MenuBottomConfiguration.Help; this.ParentForm.DisplayBottomConfiguration(this.CurrentMenu); } diff --git a/ITC81DB_2/Controls/Bottom/ControlBottomEquipment.cs b/ITC81DB_2/Controls/Bottom/ControlBottomEquipment.cs index 6e8a0c5..ab530e6 100644 --- a/ITC81DB_2/Controls/Bottom/ControlBottomEquipment.cs +++ b/ITC81DB_2/Controls/Bottom/ControlBottomEquipment.cs @@ -19,7 +19,7 @@ namespace ITC81DB_2.Controls #region Field private FormMenu m_ParentForm; - private DataStore.MenuBottomEquipment CurrentMenu; + private Define.E_MenuBottomEquipment CurrentMenu; private Collection CollectionButtonMenu; #endregion @@ -49,7 +49,7 @@ namespace ITC81DB_2.Controls } private void DefaultSetting() { - this.CurrentMenu = DataStore.MenuBottomEquipment.Help; + this.CurrentMenu = Define.E_MenuBottomEquipment.Help; this.CollectionButtonMenu = new Collection(); this.CollectionButtonMenu.Clear(); @@ -80,11 +80,11 @@ namespace ITC81DB_2.Controls button.Enabled = enable; } - public void UpdateDisplayMenuButton(DataStore.MenuBottomEquipment menu) + public void UpdateDisplayMenuButton(Define.E_MenuBottomEquipment menu) { switch (menu) { - case DataStore.MenuBottomEquipment.FunctionSetting: + case Define.E_MenuBottomEquipment.FunctionSetting: if (this.buttonFuctionSetting.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonFuctionSetting.ButtonDown(); if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -98,7 +98,7 @@ namespace ITC81DB_2.Controls if (this.buttonEngineerSetting.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonEngineerSetting.ButtonUp(); break; - case DataStore.MenuBottomEquipment.Help: + case Define.E_MenuBottomEquipment.Help: if (this.buttonFuctionSetting.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonFuctionSetting.ButtonUp(); if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.DOWN) @@ -112,7 +112,7 @@ namespace ITC81DB_2.Controls if (this.buttonEngineerSetting.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonEngineerSetting.ButtonUp(); break; - case DataStore.MenuBottomEquipment.Initialize: + case Define.E_MenuBottomEquipment.Initialize: if (this.buttonFuctionSetting.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonFuctionSetting.ButtonUp(); if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -126,7 +126,7 @@ namespace ITC81DB_2.Controls if (this.buttonEngineerSetting.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonEngineerSetting.ButtonUp(); break; - case DataStore.MenuBottomEquipment.Update: + case Define.E_MenuBottomEquipment.Update: if (this.buttonFuctionSetting.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonFuctionSetting.ButtonUp(); if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -140,7 +140,7 @@ namespace ITC81DB_2.Controls if (this.buttonEngineerSetting.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonEngineerSetting.ButtonUp(); break; - case DataStore.MenuBottomEquipment.User: + case Define.E_MenuBottomEquipment.User: if (this.buttonFuctionSetting.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonFuctionSetting.ButtonUp(); if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -154,7 +154,7 @@ namespace ITC81DB_2.Controls if (this.buttonEngineerSetting.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonEngineerSetting.ButtonUp(); break; - case DataStore.MenuBottomEquipment.Engineer: + case Define.E_MenuBottomEquipment.Engineer: if (this.buttonFuctionSetting.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonFuctionSetting.ButtonUp(); if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -174,7 +174,7 @@ namespace ITC81DB_2.Controls } private void UpdateDisplayUser(UserItem user) { - if (user.Group == DataStore.UserGroup.Level4Developer && this.ParentForm.ParentForm.SystemConfig1.IsLogin == true) + if (user.Group == Define.E_UserGroup.Level4Developer && this.ParentForm.ParentForm.SystemConfig1.IsLogin == true) this.DisplayHiddenMenu(true); else this.DisplayHiddenMenu(false); @@ -188,7 +188,7 @@ namespace ITC81DB_2.Controls this.buttonFuctionSetting.ButtonUp(); this.buttonUser.ButtonUp(); - this.CurrentMenu = DataStore.MenuBottomEquipment.Help; + this.CurrentMenu = Define.E_MenuBottomEquipment.Help; this.ParentForm.DisplayBottomEquipment(this.CurrentMenu); this.UpdateDisplayUser(status.CurrentUser); @@ -204,19 +204,19 @@ namespace ITC81DB_2.Controls return; if (button == this.buttonHelp) - this.CurrentMenu = DataStore.MenuBottomEquipment.Help; + this.CurrentMenu = Define.E_MenuBottomEquipment.Help; else if (button == this.buttonUpdate) - this.CurrentMenu = DataStore.MenuBottomEquipment.Update; + this.CurrentMenu = Define.E_MenuBottomEquipment.Update; else if (button == this.buttonInitialize) - this.CurrentMenu = DataStore.MenuBottomEquipment.Initialize; + this.CurrentMenu = Define.E_MenuBottomEquipment.Initialize; else if (button == this.buttonFuctionSetting) - this.CurrentMenu = DataStore.MenuBottomEquipment.FunctionSetting; + this.CurrentMenu = Define.E_MenuBottomEquipment.FunctionSetting; else if (button == this.buttonUser) - this.CurrentMenu = DataStore.MenuBottomEquipment.User; + this.CurrentMenu = Define.E_MenuBottomEquipment.User; else if (button == this.buttonEngineerSetting) - this.CurrentMenu = DataStore.MenuBottomEquipment.Engineer; + this.CurrentMenu = Define.E_MenuBottomEquipment.Engineer; else - this.CurrentMenu = DataStore.MenuBottomEquipment.Help; + this.CurrentMenu = Define.E_MenuBottomEquipment.Help; this.ParentForm.DisplayBottomEquipment(this.CurrentMenu); } diff --git a/ITC81DB_2/Controls/Bottom/ControlBottomInformation.cs b/ITC81DB_2/Controls/Bottom/ControlBottomInformation.cs index f0510d0..1d28c48 100644 --- a/ITC81DB_2/Controls/Bottom/ControlBottomInformation.cs +++ b/ITC81DB_2/Controls/Bottom/ControlBottomInformation.cs @@ -18,7 +18,7 @@ namespace ITC81DB_2.Controls #region Field private FormMenu m_ParentForm; - private DataStore.MenuBottomInformation CurrentMenu; + private Define.E_MenuBottomInformation CurrentMenu; private Collection CollectionButtonMenu; #endregion @@ -48,7 +48,7 @@ namespace ITC81DB_2.Controls } private void DefaultSetting() { - this.CurrentMenu = DataStore.MenuBottomInformation.Help; + this.CurrentMenu = Define.E_MenuBottomInformation.Help; this.CollectionButtonMenu = new Collection(); this.CollectionButtonMenu.Clear(); @@ -63,11 +63,11 @@ namespace ITC81DB_2.Controls button.Enabled = enable; } - public void UpdateDisplayMenuButton(DataStore.MenuBottomInformation menu) + public void UpdateDisplayMenuButton(Define.E_MenuBottomInformation menu) { switch (menu) { - case DataStore.MenuBottomInformation.Help: + case Define.E_MenuBottomInformation.Help: if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonHelp.ButtonDown(); if (this.buttonSystemInformation.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -75,7 +75,7 @@ namespace ITC81DB_2.Controls if (this.buttonASInformation.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonASInformation.ButtonUp(); break; - case DataStore.MenuBottomInformation.SystemInformation: + case Define.E_MenuBottomInformation.SystemInformation: if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonHelp.ButtonUp(); if (this.buttonSystemInformation.ButtonStatus != SmartButton.BUTSTATUS.DOWN) @@ -83,7 +83,7 @@ namespace ITC81DB_2.Controls if (this.buttonASInformation.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonASInformation.ButtonUp(); break; - case DataStore.MenuBottomInformation.AS: + case Define.E_MenuBottomInformation.AS: if (this.buttonHelp.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonHelp.ButtonUp(); if (this.buttonSystemInformation.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -102,7 +102,7 @@ namespace ITC81DB_2.Controls this.buttonSystemInformation.ButtonUp(); this.buttonASInformation.ButtonUp(); - this.CurrentMenu = DataStore.MenuBottomInformation.Help; + this.CurrentMenu = Define.E_MenuBottomInformation.Help; this.ParentForm.DisplayBottomInformation(this.CurrentMenu); } #endregion @@ -116,13 +116,13 @@ namespace ITC81DB_2.Controls return; if (button == this.buttonHelp) - this.CurrentMenu = DataStore.MenuBottomInformation.Help; + this.CurrentMenu = Define.E_MenuBottomInformation.Help; else if (button == this.buttonSystemInformation) - this.CurrentMenu = DataStore.MenuBottomInformation.SystemInformation; + this.CurrentMenu = Define.E_MenuBottomInformation.SystemInformation; else if (button == this.buttonASInformation) - this.CurrentMenu = DataStore.MenuBottomInformation.AS; + this.CurrentMenu = Define.E_MenuBottomInformation.AS; else - this.CurrentMenu = DataStore.MenuBottomInformation.Help; + this.CurrentMenu = Define.E_MenuBottomInformation.Help; this.ParentForm.DisplayBottomInformation(this.CurrentMenu); } diff --git a/ITC81DB_2/Controls/Bottom/ControlBottomSystem.cs b/ITC81DB_2/Controls/Bottom/ControlBottomSystem.cs index 4ebe215..54acc15 100644 --- a/ITC81DB_2/Controls/Bottom/ControlBottomSystem.cs +++ b/ITC81DB_2/Controls/Bottom/ControlBottomSystem.cs @@ -18,7 +18,7 @@ namespace ITC81DB_2.Controls #region Field private FormMenu m_ParentForm; - private DataStore.MenuBottomSystem CurrentMenu; + private Define.E_MenuBottomSystem CurrentMenu; private Collection CollectionButtonMenu; #endregion @@ -48,7 +48,7 @@ namespace ITC81DB_2.Controls } private void DefaultSetting() { - this.CurrentMenu = DataStore.MenuBottomSystem.Help; + this.CurrentMenu = Define.E_MenuBottomSystem.Help; this.CollectionButtonMenu = new Collection(); this.CollectionButtonMenu.Clear(); @@ -66,11 +66,11 @@ namespace ITC81DB_2.Controls button.Enabled = enable; } - public void UpdateDisplayMenuButton(DataStore.MenuBottomSystem menu) + public void UpdateDisplayMenuButton(Define.E_MenuBottomSystem menu) { switch (menu) { - case DataStore.MenuBottomSystem.AutoZero: + case Define.E_MenuBottomSystem.AutoZero: if (this.buttonAutoZero.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonAutoZero.ButtonDown(); if (this.buttonCalibration.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -84,7 +84,7 @@ namespace ITC81DB_2.Controls if (this.buttonSorter.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonSorter.ButtonUp(); break; - case DataStore.MenuBottomSystem.Calibration: + case Define.E_MenuBottomSystem.Calibration: if (this.buttonAutoZero.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonAutoZero.ButtonUp(); if (this.buttonCalibration.ButtonStatus != SmartButton.BUTSTATUS.DOWN) @@ -98,7 +98,7 @@ namespace ITC81DB_2.Controls if (this.buttonSorter.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonSorter.ButtonUp(); break; - case DataStore.MenuBottomSystem.Help: + case Define.E_MenuBottomSystem.Help: if (this.buttonAutoZero.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonAutoZero.ButtonUp(); if (this.buttonCalibration.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -112,7 +112,7 @@ namespace ITC81DB_2.Controls if (this.buttonSorter.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonSorter.ButtonUp(); break; - case DataStore.MenuBottomSystem.IOTest: + case Define.E_MenuBottomSystem.IOTest: if (this.buttonAutoZero.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonAutoZero.ButtonUp(); if (this.buttonCalibration.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -126,7 +126,7 @@ namespace ITC81DB_2.Controls if (this.buttonSorter.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonSorter.ButtonUp(); break; - case DataStore.MenuBottomSystem.JudgmentSetting: + case Define.E_MenuBottomSystem.JudgmentSetting: if (this.buttonAutoZero.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonAutoZero.ButtonUp(); if (this.buttonCalibration.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -140,7 +140,7 @@ namespace ITC81DB_2.Controls if (this.buttonSorter.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonSorter.ButtonUp(); break; - case DataStore.MenuBottomSystem.SorterSetting: + case Define.E_MenuBottomSystem.SorterSetting: if (this.buttonAutoZero.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonAutoZero.ButtonUp(); if (this.buttonCalibration.ButtonStatus != SmartButton.BUTSTATUS.UP) @@ -167,7 +167,7 @@ namespace ITC81DB_2.Controls this.buttonAutoZero.ButtonUp(); this.buttonIOTest.ButtonUp(); - this.CurrentMenu = DataStore.MenuBottomSystem.Help; + this.CurrentMenu = Define.E_MenuBottomSystem.Help; this.ParentForm.DisplayBottomSystem(this.CurrentMenu); } #endregion @@ -181,19 +181,19 @@ namespace ITC81DB_2.Controls return; if (button == this.buttonHelp) - this.CurrentMenu = DataStore.MenuBottomSystem.Help; + this.CurrentMenu = Define.E_MenuBottomSystem.Help; else if (button == this.buttonCalibration) - this.CurrentMenu = DataStore.MenuBottomSystem.Calibration; + this.CurrentMenu = Define.E_MenuBottomSystem.Calibration; else if (button == this.buttonJudgmentSetting) - this.CurrentMenu = DataStore.MenuBottomSystem.JudgmentSetting; + this.CurrentMenu = Define.E_MenuBottomSystem.JudgmentSetting; else if (button == this.buttonSorter) - this.CurrentMenu = DataStore.MenuBottomSystem.SorterSetting; + this.CurrentMenu = Define.E_MenuBottomSystem.SorterSetting; else if (button == this.buttonAutoZero) - this.CurrentMenu = DataStore.MenuBottomSystem.AutoZero; + this.CurrentMenu = Define.E_MenuBottomSystem.AutoZero; else if (button == this.buttonIOTest) - this.CurrentMenu = DataStore.MenuBottomSystem.IOTest; + this.CurrentMenu = Define.E_MenuBottomSystem.IOTest; else - this.CurrentMenu = DataStore.MenuBottomSystem.Help; + this.CurrentMenu = Define.E_MenuBottomSystem.Help; this.ParentForm.DisplayBottomSystem(this.CurrentMenu); } diff --git a/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicDataBackup.cs b/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicDataBackup.cs index 7276ac6..e93fffb 100644 --- a/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicDataBackup.cs +++ b/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicDataBackup.cs @@ -48,7 +48,7 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.labelTitleUSBID.Text = "USB ID"; this.labelTitleBackup.Text = "Backup"; @@ -58,7 +58,7 @@ namespace ITC81DB_2.Controls this.buttonDataBackupEnable.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engON_Black)); this.buttonDataBackupEnable.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engOFF_Black)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.labelTitleUSBID.Text = "USB ID"; this.labelTitleBackup.Text = "备份"; @@ -68,10 +68,10 @@ namespace ITC81DB_2.Controls this.buttonDataBackupEnable.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnON_Black)); this.buttonDataBackupEnable.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnOFF_Black)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.labelTitleUSBID.Text = "USB ID"; this.labelTitleBackup.Text = "Respaldo"; @@ -123,9 +123,9 @@ namespace ITC81DB_2.Controls { bool directoryCheck = false; - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.BasicDataBackup; + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.BasicDataBackup; this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); DirectoryInfo dir = new DirectoryInfo(this.ParentForm.ParentForm.PathDataBackupFolder); diff --git a/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicDataStatistics.cs b/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicDataStatistics.cs index 8e713d6..cff4ba7 100644 --- a/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicDataStatistics.cs +++ b/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicDataStatistics.cs @@ -55,18 +55,18 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.engBackgroundDataStatistics)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.chnBackgroundDataStatistics)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.spnBackgroundDataStatistics)); } @@ -279,8 +279,8 @@ namespace ITC81DB_2.Controls } public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.BasicDataStatistics; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.BasicDataStatistics; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.SelectedProductNo = this.ParentForm.ParentForm.SystemConfig1.ProductNumber; diff --git a/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicHelp.cs b/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicHelp.cs index 99f546a..baa9d8c 100644 --- a/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicHelp.cs +++ b/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicHelp.cs @@ -18,7 +18,7 @@ namespace ITC81DB_2.Controls #region Field private FormMenu m_ParentForm; - private DataStore.MenuBottomBasic CurrentMenu; + private Define.E_MenuBottomBasic CurrentMenu; #endregion #region Constructor @@ -46,7 +46,7 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.buttonTime.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpTimeDisable)); this.buttonTime.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpTimeDown)); @@ -61,7 +61,7 @@ namespace ITC81DB_2.Controls this.buttonDataStatistics.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpDataStatisticsDown)); this.buttonDataStatistics.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpDataStatisticsUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.buttonTime.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpTimeDisable)); this.buttonTime.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpTimeDown)); @@ -76,10 +76,10 @@ namespace ITC81DB_2.Controls this.buttonDataStatistics.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpDataStatisticsDown)); this.buttonDataStatistics.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpDataStatisticsUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.buttonTime.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnHelpTimeDisable)); this.buttonTime.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnHelpTimeDown)); @@ -112,13 +112,13 @@ namespace ITC81DB_2.Controls } private void DefaultSetting() { - this.CurrentMenu = DataStore.MenuBottomBasic.Help; + this.CurrentMenu = Define.E_MenuBottomBasic.Help; } public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.BasicHelp; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.BasicHelp; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); } #endregion @@ -132,15 +132,15 @@ namespace ITC81DB_2.Controls return; if (button == this.buttonTime) - this.CurrentMenu = DataStore.MenuBottomBasic.Time; + this.CurrentMenu = Define.E_MenuBottomBasic.Time; else if (button == this.buttonProduct) - this.CurrentMenu = DataStore.MenuBottomBasic.Product; + this.CurrentMenu = Define.E_MenuBottomBasic.Product; else if (button == this.buttonDataBackup) - this.CurrentMenu = DataStore.MenuBottomBasic.DataBackup; + this.CurrentMenu = Define.E_MenuBottomBasic.DataBackup; else if (button == this.buttonDataStatistics) - this.CurrentMenu = DataStore.MenuBottomBasic.DataStatistics; + this.CurrentMenu = Define.E_MenuBottomBasic.DataStatistics; else - this.CurrentMenu = DataStore.MenuBottomBasic.Help; + this.CurrentMenu = Define.E_MenuBottomBasic.Help; this.ParentForm.DisplayBottomBasic(this.CurrentMenu); } diff --git a/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicProduct.cs b/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicProduct.cs index 18e63d6..bfd840a 100644 --- a/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicProduct.cs +++ b/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicProduct.cs @@ -49,18 +49,18 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.engBackgroundProduct)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.chnBackgroundProduct)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.smartGroupBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.spnBackgroundProduct)); } @@ -179,8 +179,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.BasicProduct; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.BasicProduct; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.buttonProductNo.Text = this.ParentForm.ParentForm.SystemConfig1.ProductNumber.ToString(); diff --git a/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicTime.cs b/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicTime.cs index f3e0517..121ed06 100644 --- a/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicTime.cs +++ b/ITC81DB_2/Controls/CenterBasic/ControlCenterBasicTime.cs @@ -45,20 +45,20 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.labelTitleCurrentTime.Text = "Current time"; this.labelTitleChangeTime.Text = "Change"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.labelTitleCurrentTime.Text = "当前时间"; this.labelTitleChangeTime.Text = "时间改变"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.labelTitleCurrentTime.Text = "Tiempo actual"; this.labelTitleChangeTime.Text = "Cambiar"; @@ -78,8 +78,8 @@ namespace ITC81DB_2.Controls { DateTime currentTime = DateTime.Now; - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.BasicTime; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.BasicTime; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.labelCurrentTime.Text = currentTime.ToString("yyyy-MM-dd HH:mm:ss"); diff --git a/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiCommunication.Designer.cs b/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiCommunication.Designer.cs index f87a24a..baaa9c0 100644 --- a/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiCommunication.Designer.cs +++ b/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiCommunication.Designer.cs @@ -30,6 +30,15 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlCenterConfiCommunication)); this.smartGroupBox1 = new SmartX.SmartGroupBox(); + this.smartLabel8 = new SmartX.SmartLabel(); + this.smartLabel9 = new SmartX.SmartLabel(); + this.smartLabel6 = new SmartX.SmartLabel(); + this.smartLabel7 = new SmartX.SmartLabel(); + this.labelTitleMode = new SmartX.SmartLabel(); + this.labelTitleBaudrate = new SmartX.SmartLabel(); + this.labelTitleChannel = new SmartX.SmartLabel(); + this.labelTitleSerialCom2 = new SmartX.SmartLabel(); + this.labelTitleSerialCom1 = new SmartX.SmartLabel(); this.labelDiscription3 = new SmartX.SmartLabel(); this.labelDiscription2 = new SmartX.SmartLabel(); this.labelDiscription1 = new SmartX.SmartLabel(); @@ -43,15 +52,6 @@ this.comboBoxCOM1BaudRate = new System.Windows.Forms.ComboBox(); this.comboBoxCOM3Mode = new System.Windows.Forms.ComboBox(); this.comboBoxCOM1Mode = new System.Windows.Forms.ComboBox(); - this.labelTitleSerialCom1 = new SmartX.SmartLabel(); - this.labelTitleSerialCom2 = new SmartX.SmartLabel(); - this.labelTitleChannel = new SmartX.SmartLabel(); - this.labelTitleBaudrate = new SmartX.SmartLabel(); - this.labelTitleMode = new SmartX.SmartLabel(); - this.smartLabel6 = new SmartX.SmartLabel(); - this.smartLabel7 = new SmartX.SmartLabel(); - this.smartLabel8 = new SmartX.SmartLabel(); - this.smartLabel9 = new SmartX.SmartLabel(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -95,6 +95,186 @@ this.smartGroupBox1.TabIndex = 1; this.smartGroupBox1.TextColor = System.Drawing.Color.Black; // + // smartLabel8 + // + this.smartLabel8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.smartLabel8.BackPictureBox1 = null; + this.smartLabel8.BackPictureBox2 = this.smartGroupBox1; + this.smartLabel8.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.smartLabel8.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel8.Font = new System.Drawing.Font("새굴림", 13F, 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(119, 185); + this.smartLabel8.Name = "smartLabel8"; + this.smartLabel8.Size = new System.Drawing.Size(69, 20); + this.smartLabel8.TabIndex = 199; + this.smartLabel8.Text = "(RS232)"; + this.smartLabel8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.smartLabel8.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel8.Wordwrap = false; + // + // smartLabel9 + // + this.smartLabel9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.smartLabel9.BackPictureBox1 = null; + this.smartLabel9.BackPictureBox2 = this.smartGroupBox1; + this.smartLabel9.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.smartLabel9.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel9.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.smartLabel9.ForeColor = System.Drawing.Color.White; + this.smartLabel9.InitVisible = true; + this.smartLabel9.LineSpacing = 0F; + this.smartLabel9.Location = new System.Drawing.Point(119, 159); + this.smartLabel9.Name = "smartLabel9"; + this.smartLabel9.Size = new System.Drawing.Size(69, 20); + this.smartLabel9.TabIndex = 198; + this.smartLabel9.Text = "COM3"; + this.smartLabel9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.smartLabel9.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel9.Wordwrap = false; + // + // smartLabel6 + // + this.smartLabel6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.smartLabel6.BackPictureBox1 = null; + this.smartLabel6.BackPictureBox2 = this.smartGroupBox1; + this.smartLabel6.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.smartLabel6.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel6.Font = new System.Drawing.Font("새굴림", 13F, 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(119, 88); + this.smartLabel6.Name = "smartLabel6"; + this.smartLabel6.Size = new System.Drawing.Size(69, 20); + this.smartLabel6.TabIndex = 197; + this.smartLabel6.Text = "(RS485)"; + this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel6.Wordwrap = false; + // + // smartLabel7 + // + this.smartLabel7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.smartLabel7.BackPictureBox1 = null; + this.smartLabel7.BackPictureBox2 = this.smartGroupBox1; + this.smartLabel7.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.smartLabel7.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel7.Font = new System.Drawing.Font("새굴림", 13F, 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(119, 62); + this.smartLabel7.Name = "smartLabel7"; + this.smartLabel7.Size = new System.Drawing.Size(69, 20); + this.smartLabel7.TabIndex = 196; + this.smartLabel7.Text = "COM1"; + this.smartLabel7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.smartLabel7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel7.Wordwrap = false; + // + // labelTitleMode + // + this.labelTitleMode.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.labelTitleMode.BackPictureBox1 = null; + this.labelTitleMode.BackPictureBox2 = this.smartGroupBox1; + this.labelTitleMode.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.labelTitleMode.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleMode.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.labelTitleMode.ForeColor = System.Drawing.Color.White; + this.labelTitleMode.InitVisible = true; + this.labelTitleMode.LineSpacing = 0F; + this.labelTitleMode.Location = new System.Drawing.Point(372, 24); + this.labelTitleMode.Name = "labelTitleMode"; + this.labelTitleMode.Size = new System.Drawing.Size(215, 31); + this.labelTitleMode.TabIndex = 195; + this.labelTitleMode.Text = "모드"; + this.labelTitleMode.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleMode.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleMode.Wordwrap = false; + // + // labelTitleBaudrate + // + this.labelTitleBaudrate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.labelTitleBaudrate.BackPictureBox1 = null; + this.labelTitleBaudrate.BackPictureBox2 = this.smartGroupBox1; + this.labelTitleBaudrate.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.labelTitleBaudrate.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleBaudrate.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.labelTitleBaudrate.ForeColor = System.Drawing.Color.White; + this.labelTitleBaudrate.InitVisible = true; + this.labelTitleBaudrate.LineSpacing = 0F; + this.labelTitleBaudrate.Location = new System.Drawing.Point(193, 24); + this.labelTitleBaudrate.Name = "labelTitleBaudrate"; + this.labelTitleBaudrate.Size = new System.Drawing.Size(173, 31); + this.labelTitleBaudrate.TabIndex = 194; + this.labelTitleBaudrate.Text = "Baudrate"; + this.labelTitleBaudrate.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleBaudrate.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleBaudrate.Wordwrap = false; + // + // labelTitleChannel + // + this.labelTitleChannel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.labelTitleChannel.BackPictureBox1 = null; + this.labelTitleChannel.BackPictureBox2 = this.smartGroupBox1; + this.labelTitleChannel.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.labelTitleChannel.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleChannel.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.labelTitleChannel.ForeColor = System.Drawing.Color.White; + this.labelTitleChannel.InitVisible = true; + this.labelTitleChannel.LineSpacing = 0F; + this.labelTitleChannel.Location = new System.Drawing.Point(118, 24); + this.labelTitleChannel.Name = "labelTitleChannel"; + this.labelTitleChannel.Size = new System.Drawing.Size(69, 31); + this.labelTitleChannel.TabIndex = 193; + this.labelTitleChannel.Text = "채널"; + this.labelTitleChannel.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleChannel.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleChannel.Wordwrap = false; + // + // labelTitleSerialCom2 + // + this.labelTitleSerialCom2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.labelTitleSerialCom2.BackPictureBox1 = null; + this.labelTitleSerialCom2.BackPictureBox2 = this.smartGroupBox1; + this.labelTitleSerialCom2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.labelTitleSerialCom2.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleSerialCom2.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.labelTitleSerialCom2.ForeColor = System.Drawing.Color.White; + this.labelTitleSerialCom2.InitVisible = true; + this.labelTitleSerialCom2.LineSpacing = 0F; + this.labelTitleSerialCom2.Location = new System.Drawing.Point(22, 246); + this.labelTitleSerialCom2.Name = "labelTitleSerialCom2"; + this.labelTitleSerialCom2.Size = new System.Drawing.Size(91, 20); + this.labelTitleSerialCom2.TabIndex = 191; + this.labelTitleSerialCom2.Text = "통신"; + this.labelTitleSerialCom2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleSerialCom2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleSerialCom2.Wordwrap = false; + // + // labelTitleSerialCom1 + // + this.labelTitleSerialCom1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.labelTitleSerialCom1.BackPictureBox1 = null; + this.labelTitleSerialCom1.BackPictureBox2 = this.smartGroupBox1; + this.labelTitleSerialCom1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); + this.labelTitleSerialCom1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleSerialCom1.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); + this.labelTitleSerialCom1.ForeColor = System.Drawing.Color.White; + this.labelTitleSerialCom1.InitVisible = true; + this.labelTitleSerialCom1.LineSpacing = 0F; + this.labelTitleSerialCom1.Location = new System.Drawing.Point(22, 220); + this.labelTitleSerialCom1.Name = "labelTitleSerialCom1"; + this.labelTitleSerialCom1.Size = new System.Drawing.Size(91, 20); + this.labelTitleSerialCom1.TabIndex = 190; + this.labelTitleSerialCom1.Text = "시리얼"; + this.labelTitleSerialCom1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleSerialCom1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleSerialCom1.Wordwrap = false; + // // labelDiscription3 // this.labelDiscription3.BackPictureBox1 = null; @@ -348,186 +528,6 @@ this.comboBoxCOM1Mode.TabIndex = 31; this.comboBoxCOM1Mode.SelectedIndexChanged += new System.EventHandler(this.comboBoxSerial1Mode_SelectedIndexChanged); // - // labelTitleSerialCom1 - // - this.labelTitleSerialCom1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.labelTitleSerialCom1.BackPictureBox1 = null; - this.labelTitleSerialCom1.BackPictureBox2 = this.smartGroupBox1; - this.labelTitleSerialCom1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.labelTitleSerialCom1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleSerialCom1.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); - this.labelTitleSerialCom1.ForeColor = System.Drawing.Color.White; - this.labelTitleSerialCom1.InitVisible = true; - this.labelTitleSerialCom1.LineSpacing = 0F; - this.labelTitleSerialCom1.Location = new System.Drawing.Point(22, 220); - this.labelTitleSerialCom1.Name = "labelTitleSerialCom1"; - this.labelTitleSerialCom1.Size = new System.Drawing.Size(91, 20); - this.labelTitleSerialCom1.TabIndex = 190; - this.labelTitleSerialCom1.Text = "시리얼"; - this.labelTitleSerialCom1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelTitleSerialCom1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleSerialCom1.Wordwrap = false; - // - // labelTitleSerialCom2 - // - this.labelTitleSerialCom2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.labelTitleSerialCom2.BackPictureBox1 = null; - this.labelTitleSerialCom2.BackPictureBox2 = this.smartGroupBox1; - this.labelTitleSerialCom2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.labelTitleSerialCom2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleSerialCom2.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); - this.labelTitleSerialCom2.ForeColor = System.Drawing.Color.White; - this.labelTitleSerialCom2.InitVisible = true; - this.labelTitleSerialCom2.LineSpacing = 0F; - this.labelTitleSerialCom2.Location = new System.Drawing.Point(22, 246); - this.labelTitleSerialCom2.Name = "labelTitleSerialCom2"; - this.labelTitleSerialCom2.Size = new System.Drawing.Size(91, 20); - this.labelTitleSerialCom2.TabIndex = 191; - this.labelTitleSerialCom2.Text = "통신"; - this.labelTitleSerialCom2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelTitleSerialCom2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleSerialCom2.Wordwrap = false; - // - // labelTitleChannel - // - this.labelTitleChannel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.labelTitleChannel.BackPictureBox1 = null; - this.labelTitleChannel.BackPictureBox2 = this.smartGroupBox1; - this.labelTitleChannel.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.labelTitleChannel.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleChannel.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); - this.labelTitleChannel.ForeColor = System.Drawing.Color.White; - this.labelTitleChannel.InitVisible = true; - this.labelTitleChannel.LineSpacing = 0F; - this.labelTitleChannel.Location = new System.Drawing.Point(118, 24); - this.labelTitleChannel.Name = "labelTitleChannel"; - this.labelTitleChannel.Size = new System.Drawing.Size(69, 31); - this.labelTitleChannel.TabIndex = 193; - this.labelTitleChannel.Text = "채널"; - this.labelTitleChannel.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelTitleChannel.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleChannel.Wordwrap = false; - // - // labelTitleBaudrate - // - this.labelTitleBaudrate.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.labelTitleBaudrate.BackPictureBox1 = null; - this.labelTitleBaudrate.BackPictureBox2 = this.smartGroupBox1; - this.labelTitleBaudrate.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.labelTitleBaudrate.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleBaudrate.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); - this.labelTitleBaudrate.ForeColor = System.Drawing.Color.White; - this.labelTitleBaudrate.InitVisible = true; - this.labelTitleBaudrate.LineSpacing = 0F; - this.labelTitleBaudrate.Location = new System.Drawing.Point(193, 24); - this.labelTitleBaudrate.Name = "labelTitleBaudrate"; - this.labelTitleBaudrate.Size = new System.Drawing.Size(173, 31); - this.labelTitleBaudrate.TabIndex = 194; - this.labelTitleBaudrate.Text = "Baudrate"; - this.labelTitleBaudrate.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelTitleBaudrate.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleBaudrate.Wordwrap = false; - // - // labelTitleMode - // - this.labelTitleMode.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.labelTitleMode.BackPictureBox1 = null; - this.labelTitleMode.BackPictureBox2 = this.smartGroupBox1; - this.labelTitleMode.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.labelTitleMode.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleMode.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); - this.labelTitleMode.ForeColor = System.Drawing.Color.White; - this.labelTitleMode.InitVisible = true; - this.labelTitleMode.LineSpacing = 0F; - this.labelTitleMode.Location = new System.Drawing.Point(372, 24); - this.labelTitleMode.Name = "labelTitleMode"; - this.labelTitleMode.Size = new System.Drawing.Size(215, 31); - this.labelTitleMode.TabIndex = 195; - this.labelTitleMode.Text = "모드"; - this.labelTitleMode.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelTitleMode.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleMode.Wordwrap = false; - // - // smartLabel6 - // - this.smartLabel6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.smartLabel6.BackPictureBox1 = null; - this.smartLabel6.BackPictureBox2 = this.smartGroupBox1; - this.smartLabel6.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.smartLabel6.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel6.Font = new System.Drawing.Font("새굴림", 13F, 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(118, 112); - this.smartLabel6.Name = "smartLabel6"; - this.smartLabel6.Size = new System.Drawing.Size(69, 20); - this.smartLabel6.TabIndex = 197; - this.smartLabel6.Text = "(RS485)"; - this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel6.Wordwrap = false; - // - // smartLabel7 - // - this.smartLabel7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.smartLabel7.BackPictureBox1 = null; - this.smartLabel7.BackPictureBox2 = this.smartGroupBox1; - this.smartLabel7.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.smartLabel7.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel7.Font = new System.Drawing.Font("새굴림", 13F, 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(118, 86); - this.smartLabel7.Name = "smartLabel7"; - this.smartLabel7.Size = new System.Drawing.Size(69, 20); - this.smartLabel7.TabIndex = 196; - this.smartLabel7.Text = "COM1"; - this.smartLabel7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel7.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel7.Wordwrap = false; - // - // smartLabel8 - // - this.smartLabel8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.smartLabel8.BackPictureBox1 = null; - this.smartLabel8.BackPictureBox2 = this.smartGroupBox1; - this.smartLabel8.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.smartLabel8.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel8.Font = new System.Drawing.Font("새굴림", 13F, 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(118, 209); - this.smartLabel8.Name = "smartLabel8"; - this.smartLabel8.Size = new System.Drawing.Size(69, 20); - this.smartLabel8.TabIndex = 199; - this.smartLabel8.Text = "(RS232)"; - this.smartLabel8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel8.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel8.Wordwrap = false; - // - // smartLabel9 - // - this.smartLabel9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.smartLabel9.BackPictureBox1 = null; - this.smartLabel9.BackPictureBox2 = this.smartGroupBox1; - this.smartLabel9.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(81)))), ((int)(((byte)(159)))), ((int)(((byte)(198))))); - this.smartLabel9.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel9.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); - this.smartLabel9.ForeColor = System.Drawing.Color.White; - this.smartLabel9.InitVisible = true; - this.smartLabel9.LineSpacing = 0F; - this.smartLabel9.Location = new System.Drawing.Point(118, 183); - this.smartLabel9.Name = "smartLabel9"; - this.smartLabel9.Size = new System.Drawing.Size(69, 20); - this.smartLabel9.TabIndex = 198; - this.smartLabel9.Text = "COM3"; - this.smartLabel9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel9.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel9.Wordwrap = false; - // // ControlCenterConfiCommunication // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); diff --git a/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiCommunication.cs b/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiCommunication.cs index b14447e..25e8ff8 100644 --- a/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiCommunication.cs +++ b/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiCommunication.cs @@ -43,7 +43,7 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.labelTitleSerialCom1.Text = "Serial"; this.labelTitleSerialCom2.Text = "Comm"; @@ -53,7 +53,7 @@ namespace ITC81DB_2.Controls this.labelDiscription2.Text = "- U : Under range, R : Reference, O : Over range"; this.labelDiscription3.Text = "- G, Grd : Grade, W : Weight, CNT : Count"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.labelTitleSerialCom1.Text = "串行"; this.labelTitleSerialCom2.Text = "端口"; @@ -63,10 +63,10 @@ namespace ITC81DB_2.Controls this.labelDiscription2.Text = "- U : 下限, R : 标准, O : 上限"; this.labelDiscription3.Text = "- G, Grd : 等级, W : 重量, CNT : 计数"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.labelTitleSerialCom1.Text = "Serial"; this.labelTitleSerialCom2.Text = ""; @@ -213,8 +213,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.ConfiCommunication; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.ConfiCommunication; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.UpdateSerialParameterDisplay(this.ParentForm.ParentForm.SystemConfig1); diff --git a/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiHelp.cs b/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiHelp.cs index d42f401..81907d0 100644 --- a/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiHelp.cs +++ b/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiHelp.cs @@ -18,7 +18,7 @@ namespace ITC81DB_2.Controls #region Field private FormMenu m_ParentForm; - private DataStore.MenuBottomConfiguration CurrentMenu; + private Define.E_MenuBottomConfiguration CurrentMenu; #endregion #region Constructor @@ -46,7 +46,7 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.buttonSerial.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpSerialDisable)); this.buttonSerial.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpSerialDown)); @@ -55,16 +55,16 @@ namespace ITC81DB_2.Controls this.buttonOptionBoard.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpOptionBoardDown)); this.buttonOptionBoard.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpOptionBoardUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.buttonSerial.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpSerialDisable)); this.buttonSerial.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpSerialDown)); this.buttonSerial.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpSerialUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.buttonSerial.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnHelpSerialDisable)); this.buttonSerial.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnHelpSerialDown)); @@ -85,7 +85,7 @@ namespace ITC81DB_2.Controls } private void DefaultSetting() { - this.CurrentMenu = DataStore.MenuBottomConfiguration.Help; + this.CurrentMenu = Define.E_MenuBottomConfiguration.Help; } public void OptionBoardVisible() @@ -101,8 +101,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.ConfiHelp; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.ConfiHelp; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); } #endregion @@ -116,11 +116,11 @@ namespace ITC81DB_2.Controls return; if (button == this.buttonSerial) - this.CurrentMenu = DataStore.MenuBottomConfiguration.Communication; + this.CurrentMenu = Define.E_MenuBottomConfiguration.Communication; else if (button == this.buttonOptionBoard) - this.CurrentMenu = DataStore.MenuBottomConfiguration.OptionBoard; + this.CurrentMenu = Define.E_MenuBottomConfiguration.OptionBoard; else - this.CurrentMenu = DataStore.MenuBottomConfiguration.Help; + this.CurrentMenu = Define.E_MenuBottomConfiguration.Help; this.ParentForm.DisplayBottomConfiguration(this.CurrentMenu); } diff --git a/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiOptionBoard.cs b/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiOptionBoard.cs index 081b8a1..458dcf8 100644 --- a/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiOptionBoard.cs +++ b/ITC81DB_2/Controls/CenterConfiguration/ControlCenterConfiOptionBoard.cs @@ -92,8 +92,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.ConfiOptionBoard; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.ConfiOptionBoard; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.UpdateDisplay(status); diff --git a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipEngineer.cs b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipEngineer.cs index 9087cbe..d8f6608 100644 --- a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipEngineer.cs +++ b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipEngineer.cs @@ -50,7 +50,7 @@ namespace ITC81DB_2.Controls this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.labelTitleCommunicationLog.Text = "Log"; @@ -74,7 +74,7 @@ namespace ITC81DB_2.Controls //this.buttonCommunicationLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engON)); //this.buttonCommunicationLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engOFF)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.labelTitleCommunicationLog.Text = "日志"; @@ -98,10 +98,10 @@ namespace ITC81DB_2.Controls //this.buttonCommunicationLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnON)); //this.buttonCommunicationLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnOFF)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.labelTitleCommunicationLog.Text = "Log"; @@ -125,7 +125,7 @@ namespace ITC81DB_2.Controls //this.buttonCommunicationLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnON)); //this.buttonCommunicationLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnOFF)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Russian) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Russian) { this.labelTitleCommunicationLog.Text = "Журнал обмена"; @@ -149,7 +149,7 @@ namespace ITC81DB_2.Controls //this.buttonCommunicationLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusON)); //this.buttonCommunicationLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusOFF)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.German) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.German) { this.labelTitleCommunicationLog.Text = "Protokoll"; @@ -245,8 +245,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.EquipEngineer; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.EquipEngineer; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.UpdateParameterDisplay(this.ParentForm.ParentForm.SystemConfig1, this.ParentForm.ParentForm.CurrentSystemParameter9507); @@ -258,29 +258,85 @@ namespace ITC81DB_2.Controls { string value = ""; - switch (this.comboBoxEquipmentType.SelectedIndex) + if (this.ParentForm.ParentForm.SystemConfig1.EquipmentType == 8 || this.comboBoxEquipmentType.SelectedIndex == 2) { - case 0: // 컨베어 - this.ParentForm.ParentForm.SystemConfig1.EquipmentType = 0; - this.ParentForm.CenterSystemSorterSetting.UpdateControlEnable(true); - this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateControlVisible(false); - break; - case 1: // 업다운 - this.ParentForm.ParentForm.SystemConfig1.EquipmentType = 4; - this.ParentForm.CenterSystemSorterSetting.UpdateControlEnable(false); - this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateControlVisible(true); - break; - default: - this.ParentForm.ParentForm.SystemConfig1.EquipmentType = 0; - this.ParentForm.CenterSystemSorterSetting.UpdateControlEnable(true); - this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateControlVisible(false); - break; - } + DialogFormYesNo myDlg = new DialogFormYesNo(this.ParentForm.ParentForm.SystemConfig1.Language, 30); + if (myDlg.ShowDialog() == DialogResult.Yes) + { + switch (this.comboBoxEquipmentType.SelectedIndex) + { + case 0: // 컨베어 + this.ParentForm.ParentForm.SystemConfig1.EquipmentType = 0; + this.ParentForm.CenterSystemSorterSetting.UpdateControlEnable(true); + this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateControlVisible(false); + break; + case 1: // 업다운 + this.ParentForm.ParentForm.SystemConfig1.EquipmentType = 4; + this.ParentForm.CenterSystemSorterSetting.UpdateControlEnable(false); + this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateControlVisible(true); + break; + case 2: // 알루스캔 + // 알루스캔 사용 시 재부팅 필요 + this.ParentForm.ParentForm.SystemConfig1.SerialCOM3BaudRate = 3; + this.ParentForm.ParentForm.SystemConfig1.SerialCOM3Mode = 0; - value = Helper.StringZeroFillDigits4(this.ParentForm.ParentForm.SystemConfig1.EquipmentType.ToString()); - this.ParentForm.CenterSystemJudgmentSetting.ChangeScreen(); - this.ParentForm.ParentForm.SaveSystemConfigurationFile(this.ParentForm.ParentForm.SystemConfig1); - this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._1002_EquipmentType, value); + this.ParentForm.ParentForm.SystemConfig1.EquipmentType = 8; + + this.ParentForm.CenterSystemSorterSetting.UpdateControlEnable(true); + this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateControlVisible(false); + break; + default: + this.ParentForm.ParentForm.SystemConfig1.EquipmentType = 0; + this.ParentForm.CenterSystemSorterSetting.UpdateControlEnable(true); + this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateControlVisible(false); + break; + } + } + + value = Helper.StringZeroFillDigits4(this.ParentForm.ParentForm.SystemConfig1.EquipmentType.ToString()); + this.ParentForm.CenterSystemJudgmentSetting.ChangeScreen(); + this.ParentForm.ParentForm.SaveSystemConfigurationFile(this.ParentForm.ParentForm.SystemConfig1); + this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._1002_EquipmentType, value); + + DialogFormMessage msg = new DialogFormMessage(18, this.ParentForm.ParentForm.SystemConfig1.Language); + msg.ShowDialog(); + } + else + { + switch (this.comboBoxEquipmentType.SelectedIndex) + { + case 0: // 컨베어 + this.ParentForm.ParentForm.SystemConfig1.EquipmentType = 0; + this.ParentForm.CenterSystemSorterSetting.UpdateControlEnable(true); + this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateControlVisible(false); + break; + case 1: // 업다운 + this.ParentForm.ParentForm.SystemConfig1.EquipmentType = 4; + this.ParentForm.CenterSystemSorterSetting.UpdateControlEnable(false); + this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateControlVisible(true); + break; + case 2: // 알루스캔 + // 알루스캔 사용 시 재부팅 필요 + this.ParentForm.ParentForm.SystemConfig1.SerialCOM3BaudRate = 4; + this.ParentForm.ParentForm.SystemConfig1.SerialCOM3Mode = 0; + + this.ParentForm.ParentForm.SystemConfig1.EquipmentType = 8; + + this.ParentForm.CenterSystemSorterSetting.UpdateControlEnable(true); + this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateControlVisible(false); + break; + default: + this.ParentForm.ParentForm.SystemConfig1.EquipmentType = 0; + this.ParentForm.CenterSystemSorterSetting.UpdateControlEnable(true); + this.ParentForm.ParentForm.ChildFormMainDisplay.UpdateControlVisible(false); + break; + } + + value = Helper.StringZeroFillDigits4(this.ParentForm.ParentForm.SystemConfig1.EquipmentType.ToString()); + this.ParentForm.CenterSystemJudgmentSetting.ChangeScreen(); + this.ParentForm.ParentForm.SaveSystemConfigurationFile(this.ParentForm.ParentForm.SystemConfig1); + this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._1002_EquipmentType, value); + } } private void comboBoxOptionBoard_SelectedIndexChanged(object sender, EventArgs e) { diff --git a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs index 301d9ee..4f7122f 100644 --- a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs +++ b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs @@ -49,7 +49,7 @@ namespace ITC81DB_2.Controls this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.labelTitleEquipmentID.Text = "Equipment ID"; this.labelTitleBuzzerONTime.Text = "Buzzer ON time"; @@ -77,7 +77,7 @@ namespace ITC81DB_2.Controls this.buttonCommunicationLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engON_Black)); this.buttonCommunicationLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engOFF_Black)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.labelTitleBuzzerONTime.Text = "蜂鸣器开启时间"; this.labelTitleRelayRunTime.Text = "继电器接通时间"; @@ -105,10 +105,10 @@ namespace ITC81DB_2.Controls this.buttonCommunicationLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnON_Black)); this.buttonCommunicationLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnOFF_Black)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.labelTitleEquipmentID.Text = "ID de equipo"; this.labelTitleBuzzerONTime.Text = "Zumbador a tiempo"; @@ -241,7 +241,7 @@ namespace ITC81DB_2.Controls this.labelTitleCommunicationLog.Visible = true; this.buttonCommunicationLog.Visible = true; - //if (user.Group == DataStore.UserGroup.Level4Developer && this.ParentForm.ParentForm.SystemConfig.IsLogin == true) + //if (user.Group == Define.UserGroup.Level4Developer && this.ParentForm.ParentForm.SystemConfig.IsLogin == true) //{ // this.labelTitleCommunicationLog.Visible = true; // this.buttonCommunicationLog.Visible = true; @@ -255,8 +255,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.EquipFuctionSetting; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.EquipFuctionSetting; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.UpdateParameterDisplay(this.ParentForm.ParentForm.SystemConfig1, this.ParentForm.ParentForm.CurrentSystemParameter9507); @@ -433,15 +433,15 @@ namespace ITC81DB_2.Controls private void comboBoxLanguage_SelectedIndexChanged(object sender, EventArgs e) { if (this.comboBoxLanguage.SelectedIndex == 0) - this.ParentForm.ParentForm.SystemConfig1.Language = DataStore.LanguageID.Korean; + this.ParentForm.ParentForm.SystemConfig1.Language = Define.E_LanguageID.Korean; else if (this.comboBoxLanguage.SelectedIndex == 1) - this.ParentForm.ParentForm.SystemConfig1.Language = DataStore.LanguageID.English; + this.ParentForm.ParentForm.SystemConfig1.Language = Define.E_LanguageID.English; else if (this.comboBoxLanguage.SelectedIndex == 2) - this.ParentForm.ParentForm.SystemConfig1.Language = DataStore.LanguageID.Chinese; + this.ParentForm.ParentForm.SystemConfig1.Language = Define.E_LanguageID.Chinese; else if (this.comboBoxLanguage.SelectedIndex == 3) - this.ParentForm.ParentForm.SystemConfig1.Language = DataStore.LanguageID.Spanish; + this.ParentForm.ParentForm.SystemConfig1.Language = Define.E_LanguageID.Spanish; else - this.ParentForm.ParentForm.SystemConfig1.Language = DataStore.LanguageID.Korean; + this.ParentForm.ParentForm.SystemConfig1.Language = Define.E_LanguageID.Korean; this.ParentForm.ParentForm.SaveSystemConfigurationFile(this.ParentForm.ParentForm.SystemConfig1); diff --git a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipHelp.cs b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipHelp.cs index ad4deea..a90569b 100644 --- a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipHelp.cs +++ b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipHelp.cs @@ -18,7 +18,7 @@ namespace ITC81DB_2.Controls #region Field private FormMenu m_ParentForm; - private DataStore.MenuBottomEquipment CurrentMenu; + private Define.E_MenuBottomEquipment CurrentMenu; #endregion #region Constructor @@ -46,7 +46,7 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.buttonUpdate.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpUpdateDisable)); this.buttonUpdate.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpUpdateDown)); @@ -64,7 +64,7 @@ namespace ITC81DB_2.Controls this.buttonEngineerSetting.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpEngineerDown)); this.buttonEngineerSetting.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpEngineerUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.buttonUpdate.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpUpdateDisable)); this.buttonUpdate.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpUpdateDown)); @@ -82,10 +82,10 @@ namespace ITC81DB_2.Controls this.buttonEngineerSetting.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpEngineerDown)); this.buttonEngineerSetting.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpEngineerUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.buttonUpdate.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnHelpUpdateDisable)); this.buttonUpdate.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnHelpUpdateDown)); @@ -124,7 +124,7 @@ namespace ITC81DB_2.Controls } private void DefaultSetting() { - this.CurrentMenu = DataStore.MenuBottomEquipment.Help; + this.CurrentMenu = Define.E_MenuBottomEquipment.Help; if (this.ParentForm.ParentForm.SystemConfig1.IsLogin == true) this.buttonUser.Visible = true; @@ -143,7 +143,7 @@ namespace ITC81DB_2.Controls } private void UpdateDisplayUser(UserItem user) { - if (user.Group == DataStore.UserGroup.Level4Developer && this.ParentForm.ParentForm.SystemConfig1.IsLogin == true) + if (user.Group == Define.E_UserGroup.Level4Developer && this.ParentForm.ParentForm.SystemConfig1.IsLogin == true) this.DisplayHiddenMenu(true); else this.DisplayHiddenMenu(false); @@ -151,8 +151,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.EquipHelp; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.EquipHelp; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.UpdateDisplayUser(status.CurrentUser); @@ -168,17 +168,17 @@ namespace ITC81DB_2.Controls return; if (button == this.buttonUpdate) - this.CurrentMenu = DataStore.MenuBottomEquipment.Update; + this.CurrentMenu = Define.E_MenuBottomEquipment.Update; else if (button == this.buttonInitialize) - this.CurrentMenu = DataStore.MenuBottomEquipment.Initialize; + this.CurrentMenu = Define.E_MenuBottomEquipment.Initialize; else if (button == this.buttonFunction) - this.CurrentMenu = DataStore.MenuBottomEquipment.FunctionSetting; + this.CurrentMenu = Define.E_MenuBottomEquipment.FunctionSetting; else if (button == this.buttonUser) - this.CurrentMenu = DataStore.MenuBottomEquipment.User; + this.CurrentMenu = Define.E_MenuBottomEquipment.User; else if (button == this.buttonEngineerSetting) - this.CurrentMenu = DataStore.MenuBottomEquipment.Engineer; + this.CurrentMenu = Define.E_MenuBottomEquipment.Engineer; else - this.CurrentMenu = DataStore.MenuBottomEquipment.Help; + this.CurrentMenu = Define.E_MenuBottomEquipment.Help; this.ParentForm.DisplayBottomEquipment(this.CurrentMenu); } diff --git a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipInitialize.cs b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipInitialize.cs index 154694d..45057c6 100644 --- a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipInitialize.cs +++ b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipInitialize.cs @@ -19,7 +19,7 @@ namespace ITC81DB_2.Controls { #region Field private FormMenu m_ParentForm; - private DataStore.Step3 InitializeStep; + private Define.E_Step3 InitializeStep; private SmartSplash splash; private string PathRemoveFolder = ""; @@ -50,16 +50,16 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { } else @@ -73,7 +73,7 @@ namespace ITC81DB_2.Controls this.progressBarInitialize.Value = 0; this.PathRemoveFolder = this.ParentForm.ParentForm.PathLaunchFolder + "RemoveSystemFile2\\"; - this.InitializeStep = DataStore.Step3.Step1; + this.InitializeStep = Define.E_Step3.Step1; this.UpdateLabelStatus(this.InitializeStep, this.ParentForm.ParentForm.SystemConfig1.Language); } @@ -418,7 +418,7 @@ namespace ITC81DB_2.Controls this.timer.Enabled = true; this.progressBarInitialize.Value = 0; - this.InitializeStep = DataStore.Step3.Step2; + this.InitializeStep = Define.E_Step3.Step2; this.UpdateLabelStatus(this.InitializeStep, this.ParentForm.ParentForm.SystemConfig1.Language); this.ParentForm.ParentForm.TransferData(CommunicationCommand.Initialization, CommunicationID.MainBoard); @@ -436,7 +436,7 @@ namespace ITC81DB_2.Controls this.splash.Top = 230; this.splash.Start(); - this.InitializeStep = DataStore.Step3.Step2; + this.InitializeStep = Define.E_Step3.Step2; this.UpdateLabelStatus(this.InitializeStep, this.ParentForm.ParentForm.SystemConfig1.Language); this.ParentForm.ParentForm.CloseSmartUartLink(); @@ -459,7 +459,7 @@ namespace ITC81DB_2.Controls this.splash.Finish(); - this.InitializeStep = DataStore.Step3.Step3; + this.InitializeStep = Define.E_Step3.Step3; this.UpdateLabelStatus(this.InitializeStep, this.ParentForm.ParentForm.SystemConfig1.Language); this.ParentForm.Enabled = false; @@ -477,7 +477,7 @@ namespace ITC81DB_2.Controls this.splash.Top = 230; this.splash.Start(); - this.InitializeStep = DataStore.Step3.Step2; + this.InitializeStep = Define.E_Step3.Step2; this.UpdateLabelStatus(this.InitializeStep, this.ParentForm.ParentForm.SystemConfig1.Language); this.ParentForm.ParentForm.CloseSmartUartLink(); @@ -499,85 +499,85 @@ namespace ITC81DB_2.Controls } } - private void UpdateLabelStatus(DataStore.Step3 step, DataStore.LanguageID language) + private void UpdateLabelStatus(Define.E_Step3 step, Define.E_LanguageID language) { switch (step) { - case DataStore.Step3.Step1: + case Define.E_Step3.Step1: #region Step1 switch (language) { - case DataStore.LanguageID.Korean: + case Define.E_LanguageID.Korean: this.labelMessage1.Text = "초기화를 원하는 항목을 선택해주십시오"; this.labelMessage2.Text = ""; break; - case DataStore.LanguageID.English: + case Define.E_LanguageID.English: this.labelMessage1.Text = "Please select the item you want to initialize"; this.labelMessage2.Text = ""; break; - case DataStore.LanguageID.Chinese: + case Define.E_LanguageID.Chinese: this.labelMessage1.Text = "请选择要初始化的项目"; this.labelMessage2.Text = ""; break; - case DataStore.LanguageID.Spanish: + case Define.E_LanguageID.Spanish: this.labelMessage1.Text = "Por favor, seleccione el elemento que desea inicializar"; this.labelMessage2.Text = ""; break; - case DataStore.LanguageID.Czech: + case Define.E_LanguageID.Czech: break; default: break; } #endregion break; - case DataStore.Step3.Step2: + case Define.E_Step3.Step2: #region Step2 switch (language) { - case DataStore.LanguageID.Korean: + case Define.E_LanguageID.Korean: this.labelMessage1.Text = "초기화 중..."; this.labelMessage2.Text = ""; break; - case DataStore.LanguageID.English: + case Define.E_LanguageID.English: this.labelMessage1.Text = "Initializing..."; this.labelMessage2.Text = ""; break; - case DataStore.LanguageID.Chinese: + case Define.E_LanguageID.Chinese: this.labelMessage1.Text = "初期化进行中..."; this.labelMessage2.Text = ""; break; - case DataStore.LanguageID.Spanish: + case Define.E_LanguageID.Spanish: this.labelMessage1.Text = "Inicializando..."; this.labelMessage2.Text = ""; break; - case DataStore.LanguageID.Czech: + case Define.E_LanguageID.Czech: break; default: break; } #endregion break; - case DataStore.Step3.Step3: + case Define.E_Step3.Step3: #region Step3 switch (language) { - case DataStore.LanguageID.Korean: + case Define.E_LanguageID.Korean: this.labelMessage1.Text = "초기화 완료"; this.labelMessage2.Text = "전원을 끄고 다시 켜주세요."; break; - case DataStore.LanguageID.English: + case Define.E_LanguageID.English: this.labelMessage1.Text = "Initialization complete"; this.labelMessage2.Text = "Reset the power."; break; - case DataStore.LanguageID.Chinese: + case Define.E_LanguageID.Chinese: this.labelMessage1.Text = "初始化完成"; this.labelMessage2.Text = "关掉电源,然后在打开电源"; break; - case DataStore.LanguageID.Spanish: + case Define.E_LanguageID.Spanish: this.labelMessage1.Text = "Inicialización completa. Apague la alimentación"; this.labelMessage2.Text = "y luego encienda la alimentación."; break; - case DataStore.LanguageID.Czech: + case Define.E_LanguageID.Czech: break; default: break; @@ -597,7 +597,7 @@ namespace ITC81DB_2.Controls this.progressBarInitialize.Value = 100; - this.InitializeStep = DataStore.Step3.Step3; + this.InitializeStep = Define.E_Step3.Step3; this.UpdateLabelStatus(this.InitializeStep, this.ParentForm.ParentForm.SystemConfig1.Language); this.ParentForm.Enabled = false; @@ -605,13 +605,13 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.EquipInitialize; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.EquipInitialize; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.DefaultSetting(); - if (status.CurrentUser.Group == DataStore.UserGroup.Level4Developer && this.ParentForm.ParentForm.SystemConfig1.IsLogin == true) + if (status.CurrentUser.Group == Define.E_UserGroup.Level4Developer && this.ParentForm.ParentForm.SystemConfig1.IsLogin == true) { this.buttonBackup.Visible = true; } diff --git a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipUpdate.cs b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipUpdate.cs index caacdcc..33dc83f 100644 --- a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipUpdate.cs +++ b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipUpdate.cs @@ -19,7 +19,7 @@ namespace ITC81DB_2.Controls { #region Field private FormMenu m_ParentForm; - private DataStore.Step3 UpdateStep; + private Define.E_Step3 UpdateStep; private int Check; @@ -58,16 +58,16 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { } else @@ -76,13 +76,13 @@ namespace ITC81DB_2.Controls } private void DefaultSetting() { - this.UpdateStep = DataStore.Step3.Step1; + this.UpdateStep = Define.E_Step3.Step1; this.UpdateLabelStatus(this.UpdateStep, this.ParentForm.ParentForm.SystemConfig1.Language); } - private DataStore.UpdateCheck CheckError() + private Define.E_UpdateCheck CheckError() { - DataStore.UpdateCheck ret = DataStore.UpdateCheck.Fail; + Define.E_UpdateCheck ret = Define.E_UpdateCheck.Fail; FileInfo[] newFiles; if (Directory.Exists("Hard Disk\\") == true) @@ -107,21 +107,21 @@ namespace ITC81DB_2.Controls if (newFiles.Length == 0) { - ret = DataStore.UpdateCheck.NotFile; + ret = Define.E_UpdateCheck.NotFile; } else { - ret = DataStore.UpdateCheck.Success; + ret = Define.E_UpdateCheck.Success; } } else { - ret = DataStore.UpdateCheck.NotUpdateFolder; + ret = Define.E_UpdateCheck.NotUpdateFolder; } } else { - ret = DataStore.UpdateCheck.NotUsbMomery; + ret = Define.E_UpdateCheck.NotUsbMomery; } return ret; @@ -151,7 +151,7 @@ namespace ITC81DB_2.Controls this.progressBarUpdate.Value += 100; this.ParentForm.Enabled = false; - this.UpdateStep = DataStore.Step3.Step3; + this.UpdateStep = Define.E_Step3.Step3; this.UpdateLabelStatus(this.UpdateStep, this.ParentForm.ParentForm.SystemConfig1.Language); } private void TreatmentRemoveOldFile() @@ -180,86 +180,86 @@ namespace ITC81DB_2.Controls this.progressBarUpdate.Value += 20; } - private void UpdateLabelStatus(DataStore.Step3 step, DataStore.LanguageID language) + private void UpdateLabelStatus(Define.E_Step3 step, Define.E_LanguageID language) { switch (step) { - case DataStore.Step3.Step1: + case Define.E_Step3.Step1: #region Step1 switch (language) { - case DataStore.LanguageID.Korean: + case Define.E_LanguageID.Korean: this.labelMessage1.Text = "USB를 본체에 삽입 하십시오"; this.labelMessage2.Text = "삽입 후 하단 'Update'버튼을 눌러주십시오"; break; - case DataStore.LanguageID.English: + case Define.E_LanguageID.English: this.labelMessage1.Text = "Please insert usb into the device"; this.labelMessage2.Text = "Press the bottom button after inserting"; break; - case DataStore.LanguageID.Chinese: + case Define.E_LanguageID.Chinese: this.labelMessage1.Text = "请将 USB 插入设备"; this.labelMessage2.Text = "请点击下端的按钮更新按钮"; break; - case DataStore.LanguageID.Spanish: + case Define.E_LanguageID.Spanish: this.labelMessage1.Text = "Por favor, inserte USB en el dispositivo"; this.labelMessage2.Text = "Presione el botón inferior después de insertar"; break; - case DataStore.LanguageID.Czech: + case Define.E_LanguageID.Czech: break; default: break; } #endregion break; - case DataStore.Step3.Step2: + case Define.E_Step3.Step2: #region Step2 switch (language) { - case DataStore.LanguageID.Korean: + case Define.E_LanguageID.Korean: this.labelMessage1.Text = "업데이트 중..."; this.labelMessage2.Text = "USB를 본체에서 분리하지 마십시오"; break; - case DataStore.LanguageID.English: + case Define.E_LanguageID.English: this.labelMessage1.Text = "Updating..."; this.labelMessage2.Text = "Do not remove the USB from the device"; break; - case DataStore.LanguageID.Chinese: + case Define.E_LanguageID.Chinese: this.labelMessage1.Text = "更新中……"; this.labelMessage2.Text = "请勿断开USB"; break; - case DataStore.LanguageID.Spanish: + case Define.E_LanguageID.Spanish: this.labelMessage1.Text = "Actualizando...."; this.labelMessage2.Text = "No desconecte el USB del cuerpo."; break; - case DataStore.LanguageID.Czech: + case Define.E_LanguageID.Czech: break; default: break; } #endregion break; - case DataStore.Step3.Step3: + case Define.E_Step3.Step3: #region Step3 this.labelMessage2.ForeColor = Color.Red; switch (language) { - case DataStore.LanguageID.Korean: + case Define.E_LanguageID.Korean: this.labelMessage1.Text = "프로그램 업데이트 완료"; this.labelMessage2.Text = "전원을 끄고 다시 켜주세요"; break; - case DataStore.LanguageID.English: + case Define.E_LanguageID.English: this.labelMessage1.Text = "Program update complete"; this.labelMessage2.Text = "Reset the system"; break; - case DataStore.LanguageID.Chinese: + case Define.E_LanguageID.Chinese: this.labelMessage1.Text = "系统更新完成"; this.labelMessage2.Text = "关掉电源,然后在打开电源"; break; - case DataStore.LanguageID.Spanish: + case Define.E_LanguageID.Spanish: this.labelMessage1.Text = "Actualización del programa completa. Apague la "; this.labelMessage2.Text = "alimentación y luego encienda la alimentación."; break; - case DataStore.LanguageID.Czech: + case Define.E_LanguageID.Czech: break; default: break; @@ -274,31 +274,31 @@ namespace ITC81DB_2.Controls } private void ProgramUpdateCheck(DialogResult result) { - DataStore.UpdateCheck check = DataStore.UpdateCheck.Fail; + Define.E_UpdateCheck check = Define.E_UpdateCheck.Fail; if (result == DialogResult.Yes) { check = this.CheckError(); - if (check == DataStore.UpdateCheck.Success) + if (check == Define.E_UpdateCheck.Success) { this.buttonUpdate.Enabled = false; - this.UpdateStep = DataStore.Step3.Step2; + this.UpdateStep = Define.E_Step3.Step2; this.UpdateLabelStatus(this.UpdateStep, this.ParentForm.ParentForm.SystemConfig1.Language); this.ProgramUpdate(); } - else if (check == DataStore.UpdateCheck.NotUsbMomery) + else if (check == Define.E_UpdateCheck.NotUsbMomery) { DialogFormMessage message = new DialogFormMessage(5, this.ParentForm.ParentForm.SystemConfig1.Language); message.ShowDialog(); } - else if (check == DataStore.UpdateCheck.NotUpdateFolder) + else if (check == Define.E_UpdateCheck.NotUpdateFolder) { DialogFormMessage message = new DialogFormMessage(9, this.ParentForm.ParentForm.SystemConfig1.Language); message.ShowDialog(); } - else if (check == DataStore.UpdateCheck.NotFile) + else if (check == Define.E_UpdateCheck.NotFile) { DialogFormMessage message = new DialogFormMessage(7, this.ParentForm.ParentForm.SystemConfig1.Language); message.ShowDialog(); @@ -308,8 +308,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.EquipUpdate; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.EquipUpdate; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.DefaultSetting(); diff --git a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipUser.cs b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipUser.cs index 18e3ab3..1cf6d78 100644 --- a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipUser.cs +++ b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipUser.cs @@ -57,22 +57,22 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.labelTitleLevel1.Text = "Level 1"; this.labelTitleLevel2.Text = "Level 2"; this.labelTitleLevel3.Text = "Level 3"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.labelTitleLevel1.Text = "级别 1"; this.labelTitleLevel2.Text = "级别 2"; this.labelTitleLevel3.Text = "级别 3"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.labelTitleLevel1.Text = "Nivel 1"; this.labelTitleLevel2.Text = "Nivel 2"; @@ -149,8 +149,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.EquipUser; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.EquipUser; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.UpdateUserListDisplay(this.ParentForm.ParentForm.CurrentUser); @@ -307,7 +307,7 @@ namespace ITC81DB_2.Controls { this.ParentForm.ParentForm.CurrentUser.Level1Users[this.listBoxLevel1.SelectItemIndex].ID = this.textBoxID.Text; this.ParentForm.ParentForm.CurrentUser.Level1Users[this.listBoxLevel1.SelectItemIndex].Password = this.textBoxPassword.Text; - this.ParentForm.ParentForm.CurrentUser.Level1Users[this.listBoxLevel1.SelectItemIndex].Group = DataStore.UserGroup.Level1Operator; + this.ParentForm.ParentForm.CurrentUser.Level1Users[this.listBoxLevel1.SelectItemIndex].Group = Define.E_UserGroup.Level1Operator; this.ParentForm.ParentForm.SaveUserLevel1File(this.ParentForm.ParentForm.CurrentUser.Level1Users); this.listBoxLevel1.Items[this.listBoxLevel1.SelectItemIndex] = this.textBoxID.Text; @@ -316,7 +316,7 @@ namespace ITC81DB_2.Controls { this.ParentForm.ParentForm.CurrentUser.Level2Users[this.listBoxLevel2.SelectItemIndex].ID = this.textBoxID.Text; this.ParentForm.ParentForm.CurrentUser.Level2Users[this.listBoxLevel2.SelectItemIndex].Password = this.textBoxPassword.Text; - this.ParentForm.ParentForm.CurrentUser.Level2Users[this.listBoxLevel2.SelectItemIndex].Group = DataStore.UserGroup.Level2Engineer; + this.ParentForm.ParentForm.CurrentUser.Level2Users[this.listBoxLevel2.SelectItemIndex].Group = Define.E_UserGroup.Level2Engineer; this.ParentForm.ParentForm.SaveUserLevel2File(this.ParentForm.ParentForm.CurrentUser.Level2Users); this.listBoxLevel2.Items[this.listBoxLevel2.SelectItemIndex] = this.textBoxID.Text; @@ -325,7 +325,7 @@ namespace ITC81DB_2.Controls { this.ParentForm.ParentForm.CurrentUser.Level3Users[this.listBoxLevel3.SelectItemIndex].ID = this.textBoxID.Text; this.ParentForm.ParentForm.CurrentUser.Level3Users[this.listBoxLevel3.SelectItemIndex].Password = this.textBoxPassword.Text; - this.ParentForm.ParentForm.CurrentUser.Level3Users[this.listBoxLevel3.SelectItemIndex].Group = DataStore.UserGroup.Level3Manager; + this.ParentForm.ParentForm.CurrentUser.Level3Users[this.listBoxLevel3.SelectItemIndex].Group = Define.E_UserGroup.Level3Manager; this.ParentForm.ParentForm.SaveUserLevel3File(this.ParentForm.ParentForm.CurrentUser.Level3Users); this.listBoxLevel3.Items[this.listBoxLevel3.SelectItemIndex] = this.textBoxID.Text; diff --git a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipUserGroupEditor.cs b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipUserGroupEditor.cs index 120a11b..ceb4ca3 100644 --- a/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipUserGroupEditor.cs +++ b/ITC81DB_2/Controls/CenterEquipment/ControlCenterEquipUserGroupEditor.cs @@ -44,16 +44,16 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { } else @@ -66,7 +66,7 @@ namespace ITC81DB_2.Controls - public void DisplayRefresh(DataStore.UserGroup group) + public void DisplayRefresh(Define.E_UserGroup group) { } diff --git a/ITC81DB_2/Controls/CenterInformation/ControlCenterInforAS.cs b/ITC81DB_2/Controls/CenterInformation/ControlCenterInforAS.cs index f859d7d..a00cc33 100644 --- a/ITC81DB_2/Controls/CenterInformation/ControlCenterInforAS.cs +++ b/ITC81DB_2/Controls/CenterInformation/ControlCenterInforAS.cs @@ -44,16 +44,16 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { } else @@ -202,8 +202,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.InforAS; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.InforAS; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); } #endregion diff --git a/ITC81DB_2/Controls/CenterInformation/ControlCenterInforHelp.cs b/ITC81DB_2/Controls/CenterInformation/ControlCenterInforHelp.cs index 2b2757c..abecc1d 100644 --- a/ITC81DB_2/Controls/CenterInformation/ControlCenterInforHelp.cs +++ b/ITC81DB_2/Controls/CenterInformation/ControlCenterInforHelp.cs @@ -18,7 +18,7 @@ namespace ITC81DB_2.Controls #region Field private FormMenu m_ParentForm; - private DataStore.MenuBottomInformation CurrentMenu; + private Define.E_MenuBottomInformation CurrentMenu; #endregion #region Constructor @@ -46,7 +46,7 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.buttonInformation.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpInformationDisable)); this.buttonInformation.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpInformationDown)); @@ -55,7 +55,7 @@ namespace ITC81DB_2.Controls this.buttonAS.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpASDown)); this.buttonAS.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpASUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.buttonInformation.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpInformationDisable)); this.buttonInformation.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpInformationDown)); @@ -64,10 +64,10 @@ namespace ITC81DB_2.Controls this.buttonAS.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpASDown)); this.buttonAS.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpASUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.buttonInformation.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnHelpInformationDisable)); this.buttonInformation.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnHelpInformationDown)); @@ -88,13 +88,13 @@ namespace ITC81DB_2.Controls } private void DefaultSetting() { - this.CurrentMenu = DataStore.MenuBottomInformation.Help; + this.CurrentMenu = Define.E_MenuBottomInformation.Help; } public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.InforHelp; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.InforHelp; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); } #endregion @@ -108,11 +108,11 @@ namespace ITC81DB_2.Controls return; if (button == this.buttonInformation) - this.CurrentMenu = DataStore.MenuBottomInformation.SystemInformation; + this.CurrentMenu = Define.E_MenuBottomInformation.SystemInformation; else if (button == this.buttonAS) - this.CurrentMenu = DataStore.MenuBottomInformation.AS; + this.CurrentMenu = Define.E_MenuBottomInformation.AS; else - this.CurrentMenu = DataStore.MenuBottomInformation.Help; + this.CurrentMenu = Define.E_MenuBottomInformation.Help; this.ParentForm.DisplayBottomInformation(this.CurrentMenu); } diff --git a/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs b/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs index 0830cee..82c1637 100644 --- a/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs +++ b/ITC81DB_2/Controls/CenterInformation/ControlCenterInforSystem.cs @@ -44,16 +44,16 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { } else @@ -82,8 +82,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.InforSystem; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.InforSystem; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._1501_ProgramVersion, ""); diff --git a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemAutoZero.cs b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemAutoZero.cs index 9f33243..cdbe1dd 100644 --- a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemAutoZero.cs +++ b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemAutoZero.cs @@ -45,7 +45,7 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.labelTitleMode1.Text = "Mode 1"; this.labelTitleMode2.Text = "Mode 2"; @@ -59,7 +59,7 @@ namespace ITC81DB_2.Controls this.rbMode1Low1.Text = this.rbMode1Low2.Text = this.rbMode2Low1.Text = this.rbMode2Low2.Text = "Low"; this.rbMode1UserSetting1.Text = this.rbMode1UserSetting2.Text = this.rbMode2UserSetting1.Text = this.rbMode2UserSetting2.Text = "User Setting"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.labelTitleMode1.Text = "模式 1"; this.labelTitleMode2.Text = "模式 2"; @@ -73,10 +73,10 @@ namespace ITC81DB_2.Controls this.rbMode1Low1.Text = this.rbMode1Low2.Text = this.rbMode2Low1.Text = this.rbMode2Low2.Text = "低"; this.rbMode1UserSetting1.Text = this.rbMode1UserSetting2.Text = this.rbMode2UserSetting1.Text = this.rbMode2UserSetting2.Text = "用户设置"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.labelTitleMode1.Text = "Modo 1"; this.labelTitleMode2.Text = "Modo 2"; @@ -514,8 +514,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.SystemAutoZero; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.SystemAutoZero; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.UpdateZeroParameterDisplay(this.ParentForm.ParentForm.CurrentSystemParameter9510, this.ParentForm.ParentForm.CurrentSystemParameter9511); diff --git a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemCalibration.cs b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemCalibration.cs index 9bef9b8..7d1a514 100644 --- a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemCalibration.cs +++ b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemCalibration.cs @@ -52,7 +52,7 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.labelTitleWeight1.Text = this.labelTitleWeight2.Text = "Weight"; this.labelTitleMaxWeight.Font = new Font("새굴림", 9, FontStyle.Bold); @@ -78,7 +78,7 @@ namespace ITC81DB_2.Controls this.buttonZero.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engCalibrationZeroDown)); this.buttonZero.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engCalibrationZeroUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.labelTitleWeight1.Text = this.labelTitleWeight2.Text = "重量"; this.labelTitleMaxWeight.Font = new Font("새굴림", 13, FontStyle.Bold); @@ -104,10 +104,10 @@ namespace ITC81DB_2.Controls this.buttonZero.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnCalibrationZeroDown)); this.buttonZero.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnCalibrationZeroUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.labelTitleWeight1.Text = this.labelTitleWeight2.Text = "Peso"; this.labelTitleMaxWeight.Font = new Font("새굴림", 9, FontStyle.Bold); @@ -195,12 +195,12 @@ namespace ITC81DB_2.Controls { switch (data.Status) { - case DataStore.WeightStatus.CalNomal: + case Define.E_WeightStatus.CalNomal: this.labelWeight1.Text = Helper.DoubleToString(data.Weight, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); this.labelWeight1.ForeColor = this.NormalColor; this.labelADC1.Text = data.ADCValue; break; - case DataStore.WeightStatus.CalStandby: + case Define.E_WeightStatus.CalStandby: if (this.buttonLane1.ButtonStatus == SmartButton.BUTSTATUS.DOWN) { // 분동중량 표시 @@ -208,15 +208,15 @@ namespace ITC81DB_2.Controls this.labelWeight1.ForeColor = this.NormalColor; this.labelADC1.Text = data.ADCValue; this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.listBoxHelp.Items.Add("Put the balance weight."); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.listBoxHelp.Items.Add("请放上砝码"); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.listBoxHelp.Items.Add("Ponga el peso de la balanza."); } @@ -227,7 +227,7 @@ namespace ITC81DB_2.Controls this.CalibrationButtonEnable(false, true, true); } break; - case DataStore.WeightStatus.CalBalans: + case Define.E_WeightStatus.CalBalans: if (this.buttonLane1.ButtonStatus == SmartButton.BUTSTATUS.DOWN) { // 분동중량표시 @@ -237,22 +237,22 @@ namespace ITC81DB_2.Controls this.CalibrationButtonEnable(false, false, true); } break; - case DataStore.WeightStatus.CalFinish: + case Define.E_WeightStatus.CalFinish: if (this.buttonLane1.ButtonStatus == SmartButton.BUTSTATUS.DOWN) { this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.listBoxHelp.Items.Add("Finish the calibration"); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.listBoxHelp.Items.Add("重量调节已完成"); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.listBoxHelp.Items.Add("Calibración terminada."); } @@ -275,21 +275,21 @@ namespace ITC81DB_2.Controls this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._3601_ConstantRead, ""); } break; - case DataStore.WeightStatus.CalError: + case Define.E_WeightStatus.CalError: this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.listBoxHelp.Items.Add("Calibration error"); this.listBoxHelp.Items.Add("Please try again."); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.listBoxHelp.Items.Add("错误发生,重试"); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.listBoxHelp.Items.Add("Error de calibración."); this.listBoxHelp.Items.Add("Inténtalo de nuevo."); @@ -312,12 +312,12 @@ namespace ITC81DB_2.Controls { switch (data.Status) { - case DataStore.WeightStatus.CalNomal: + case Define.E_WeightStatus.CalNomal: this.labelWeight2.Text = Helper.DoubleToString(data.Weight, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); this.labelWeight2.ForeColor = this.NormalColor; this.labelADC2.Text = data.ADCValue; break; - case DataStore.WeightStatus.CalStandby: + case Define.E_WeightStatus.CalStandby: if (this.buttonLane2.ButtonStatus == SmartButton.BUTSTATUS.DOWN) { // 분동중량 표시 @@ -325,18 +325,18 @@ namespace ITC81DB_2.Controls this.labelWeight2.ForeColor = this.NormalColor; this.labelADC2.Text = data.ADCValue; this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.listBoxHelp.Items.Add("Put the balance weight."); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.listBoxHelp.Items.Add("请放上砝码"); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.listBoxHelp.Items.Add("Ponga el peso de la balanza."); } @@ -347,7 +347,7 @@ namespace ITC81DB_2.Controls this.CalibrationButtonEnable(false, true, true); } break; - case DataStore.WeightStatus.CalBalans: + case Define.E_WeightStatus.CalBalans: if (this.buttonLane2.ButtonStatus == SmartButton.BUTSTATUS.DOWN) { // 분동중량표시 @@ -357,22 +357,22 @@ namespace ITC81DB_2.Controls this.CalibrationButtonEnable(false, false, true); } break; - case DataStore.WeightStatus.CalFinish: + case Define.E_WeightStatus.CalFinish: if (this.buttonLane2.ButtonStatus == SmartButton.BUTSTATUS.DOWN) { this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.listBoxHelp.Items.Add("Finish the calibration"); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.listBoxHelp.Items.Add("重量调节已完成"); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.listBoxHelp.Items.Add("Calibración terminada."); } @@ -395,21 +395,21 @@ namespace ITC81DB_2.Controls this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._3601_ConstantRead, ""); } break; - case DataStore.WeightStatus.CalError: + case Define.E_WeightStatus.CalError: this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.listBoxHelp.Items.Add("Calibration error"); this.listBoxHelp.Items.Add("Please try again."); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.listBoxHelp.Items.Add("错误发生,重试"); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.listBoxHelp.Items.Add("Error de calibración."); this.listBoxHelp.Items.Add("Inténtalo de nuevo."); @@ -431,18 +431,18 @@ namespace ITC81DB_2.Controls private void UpdateControlsDisplay() { this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.listBoxHelp.Items.Add("Push the start button."); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.listBoxHelp.Items.Add("按[开始]键"); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.listBoxHelp.Items.Add("Presione el botón [Inicio]"); this.listBoxHelp.Items.Add("para iniciar la calibración"); @@ -499,7 +499,7 @@ namespace ITC81DB_2.Controls if (this.labelWeightUnit1.Text != this.ParentForm.ParentForm.SystemConfig1.Unit) this.labelWeightUnit1.Text = this.labelWeightUnit2.Text = this.ParentForm.ParentForm.SystemConfig1.Unit; } - public void UpdateCalibrationItemDisplay(DataStore.EquipmentStatus status, CalibrationItem item) + public void UpdateCalibrationItemDisplay(Define.E_EquipmentStatus status, CalibrationItem item) { string value = ""; @@ -553,7 +553,7 @@ namespace ITC81DB_2.Controls if (this.labelConstant2.Text != value) this.labelConstant2.Text = value; } - public void UpdateWeightDisplay(DataStore.EquipmentStatus status, WeightData data1, WeightData data2) + public void UpdateWeightDisplay(Define.E_EquipmentStatus status, WeightData data1, WeightData data2) { this.UpdateLabelWeight1(data1); this.UpdateLabelWeight2(data2); @@ -561,8 +561,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.SystemCalibration; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Calibration); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.SystemCalibration; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Calibration); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.FlagCalibrationFinish1 = false; @@ -700,20 +700,20 @@ namespace ITC81DB_2.Controls private void buttonStart_Click(object sender, EventArgs e) { this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.listBoxHelp.Items.Add("Calibration start"); this.listBoxHelp.Items.Add("Wait a minute."); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.listBoxHelp.Items.Add("校准开始按钮"); this.listBoxHelp.Items.Add("请等待"); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.listBoxHelp.Items.Add("Inicio de la calibración"); this.listBoxHelp.Items.Add("Comprobando cero."); @@ -740,20 +740,20 @@ namespace ITC81DB_2.Controls private void buttonBalance_Click(object sender, EventArgs e) { this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.listBoxHelp.Items.Add("Caculating..."); this.listBoxHelp.Items.Add("Wait a minute."); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.listBoxHelp.Items.Add("测量砝码中"); this.listBoxHelp.Items.Add("请等待"); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.listBoxHelp.Items.Add("Caculando..."); this.listBoxHelp.Items.Add("Esperar."); @@ -774,18 +774,18 @@ namespace ITC81DB_2.Controls private void buttonCancel_Click(object sender, EventArgs e) { this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.listBoxHelp.Items.Add("Cancel the calibration"); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.listBoxHelp.Items.Add("取消重量调节"); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.listBoxHelp.Items.Add("Cancelar la calibración"); } diff --git a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemHelp.cs b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemHelp.cs index d60a88b..ca86388 100644 --- a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemHelp.cs +++ b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemHelp.cs @@ -18,7 +18,7 @@ namespace ITC81DB_2.Controls #region Field private FormMenu m_ParentForm; - private DataStore.MenuBottomSystem CurrentMenu; + private Define.E_MenuBottomSystem CurrentMenu; #endregion #region Constructor @@ -46,7 +46,7 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.buttonCalibration.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpCalibrationDisable)); this.buttonCalibration.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpCalibrationDown)); @@ -64,7 +64,7 @@ namespace ITC81DB_2.Controls this.buttonIOTest.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpIOTestDown)); this.buttonIOTest.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engHelpIOTestUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.buttonCalibration.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpCalibrationDisable)); this.buttonCalibration.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpCalibrationDown)); @@ -82,10 +82,10 @@ namespace ITC81DB_2.Controls this.buttonIOTest.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpIOTestDown)); this.buttonIOTest.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnHelpIOTestUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.buttonCalibration.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnHelpCalibrationDisable)); this.buttonCalibration.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnHelpCalibrationDown)); @@ -124,29 +124,29 @@ namespace ITC81DB_2.Controls } private void DefaultSetting() { - this.CurrentMenu = DataStore.MenuBottomSystem.Help; + this.CurrentMenu = Define.E_MenuBottomSystem.Help; } - public void UpdateDisplayMenuButton(DataStore.MenuBottomSystem menu) + public void UpdateDisplayMenuButton(Define.E_MenuBottomSystem menu) { switch (menu) { - case DataStore.MenuBottomSystem.AutoZero: + case Define.E_MenuBottomSystem.AutoZero: if (this.buttonAutoZero.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonAutoZero.ButtonDown(); if (this.buttonCalibration.ButtonStatus != SmartButton.BUTSTATUS.UP) this.buttonCalibration.ButtonUp(); break; - case DataStore.MenuBottomSystem.Calibration: + case Define.E_MenuBottomSystem.Calibration: break; - case DataStore.MenuBottomSystem.Help: + case Define.E_MenuBottomSystem.Help: break; - case DataStore.MenuBottomSystem.IOTest: + case Define.E_MenuBottomSystem.IOTest: break; - case DataStore.MenuBottomSystem.JudgmentSetting: + case Define.E_MenuBottomSystem.JudgmentSetting: break; - case DataStore.MenuBottomSystem.SorterSetting: + case Define.E_MenuBottomSystem.SorterSetting: break; default: break; @@ -155,8 +155,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.SystemHelp; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.SystemHelp; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); } #endregion @@ -170,17 +170,17 @@ namespace ITC81DB_2.Controls return; if (button == this.buttonCalibration) - this.CurrentMenu = DataStore.MenuBottomSystem.Calibration; + this.CurrentMenu = Define.E_MenuBottomSystem.Calibration; else if (button == this.buttonJudgmentSetting) - this.CurrentMenu = DataStore.MenuBottomSystem.JudgmentSetting; + this.CurrentMenu = Define.E_MenuBottomSystem.JudgmentSetting; else if (button == this.buttonSorter) - this.CurrentMenu = DataStore.MenuBottomSystem.SorterSetting; + this.CurrentMenu = Define.E_MenuBottomSystem.SorterSetting; else if (button == this.buttonAutoZero) - this.CurrentMenu = DataStore.MenuBottomSystem.AutoZero; + this.CurrentMenu = Define.E_MenuBottomSystem.AutoZero; else if (button == this.buttonIOTest) - this.CurrentMenu = DataStore.MenuBottomSystem.IOTest; + this.CurrentMenu = Define.E_MenuBottomSystem.IOTest; else - this.CurrentMenu = DataStore.MenuBottomSystem.Help; + this.CurrentMenu = Define.E_MenuBottomSystem.Help; this.ParentForm.DisplayBottomSystem(this.CurrentMenu); } diff --git a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemIOTest.cs b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemIOTest.cs index 8900c50..93317e5 100644 --- a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemIOTest.cs +++ b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemIOTest.cs @@ -52,20 +52,20 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.groupBoxInput.Text = "Input"; this.groupBoxOutput.Text = "Output"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.groupBoxInput.Text = "输入"; this.groupBoxOutput.Text = "输出"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.groupBoxInput.Text = "Aporte"; this.groupBoxOutput.Text = "Producción"; @@ -204,8 +204,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.SystemIOTest; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.IOTest); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.SystemIOTest; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.IOTest); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); foreach (SmartButton button in this.CollectionOutputButton) diff --git a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.cs b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.cs index 67de016..4a1942a 100644 --- a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.cs +++ b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemJudgmentSetting.cs @@ -50,22 +50,22 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.buttonWeightReference.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engJudgmentStandardDisable)); this.buttonWeightReference.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engJudgmentStandardDown)); this.buttonWeightReference.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engJudgmentStandardUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.buttonWeightReference.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnJudgmentStandardDisable)); this.buttonWeightReference.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnJudgmentStandardDown)); this.buttonWeightReference.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnJudgmentStandardUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.buttonWeightReference.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnJudgmentStandardDisable)); this.buttonWeightReference.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnJudgmentStandardDown)); @@ -153,7 +153,7 @@ namespace ITC81DB_2.Controls this.buttonDown.Visible = false; // 0 : 컨베어, 4 : 업다운, 6 : 정지계량 - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { switch (this.ParentForm.ParentForm.SystemConfig1.EquipmentType) { @@ -170,7 +170,7 @@ namespace ITC81DB_2.Controls break; } } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { switch (this.ParentForm.ParentForm.SystemConfig1.EquipmentType) { @@ -187,7 +187,7 @@ namespace ITC81DB_2.Controls break; } } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { switch (this.ParentForm.ParentForm.SystemConfig1.EquipmentType) { @@ -293,9 +293,9 @@ namespace ITC81DB_2.Controls this.GraphBackRedraw(); } - public void UpdateEquipmentStatusDisplay(DataStore.EquipmentStatus status) + public void UpdateEquipmentStatusDisplay(Define.E_EquipmentStatus status) { - if (status == DataStore.EquipmentStatus.Start) + if (status == Define.E_EquipmentStatus.Start) { this.smartDraw.PutDataAllClear(); this.labelProductNo.Enabled = false; @@ -323,7 +323,7 @@ namespace ITC81DB_2.Controls this.buttonLineCopy.Enabled = true; } } - public void UpdateCurrentProductDisplay(DataStore.EquipmentStatus status, ProductItem pItem1, ProductItem pItem2) + public void UpdateCurrentProductDisplay(Define.E_EquipmentStatus status, ProductItem pItem1, ProductItem pItem2) { string value = ""; @@ -336,7 +336,7 @@ namespace ITC81DB_2.Controls else this.UpdateSystemParameterDisplay(this.ParentForm.ParentForm.CurrentJudgmentSetItem2); } - public void UpdateGraphDataDisplay(DataStore.EquipmentStatus status, WeightData weightData, Collection values) + public void UpdateGraphDataDisplay(Define.E_EquipmentStatus status, WeightData weightData, Collection values) { int iValue = 0, temp = 0, inputValue = 0; string sValue = ""; @@ -369,7 +369,7 @@ namespace ITC81DB_2.Controls this.smartDraw.PutData(inputValue); } } - public void UpdateStopWeightDisplay(DataStore.EquipmentStatus status, WeightData data1, WeightData data2) + public void UpdateStopWeightDisplay(Define.E_EquipmentStatus status, WeightData data1, WeightData data2) { string value = ""; @@ -394,7 +394,7 @@ namespace ITC81DB_2.Controls this.labelADCValue.Text = value; } } - public void UpdateConstantDisplay(DataStore.EquipmentStatus status, CalibrationItem item) + public void UpdateConstantDisplay(Define.E_EquipmentStatus status, CalibrationItem item) { string value = ""; @@ -419,8 +419,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.SystemJudgmentSetting; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.SystemSetting); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.SystemJudgmentSetting; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.SystemSetting); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.labelProductNo.Text = this.ParentForm.ParentForm.SystemConfig1.ProductNumber.ToString(); diff --git a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemSorterSetting.cs b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemSorterSetting.cs index 28f7f35..22ff2dc 100644 --- a/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemSorterSetting.cs +++ b/ITC81DB_2/Controls/CenterSystem/ControlCenterSystemSorterSetting.cs @@ -44,7 +44,7 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { #region English this.labelTitleSorter1.Text = "Sorter 1"; @@ -147,7 +147,7 @@ namespace ITC81DB_2.Controls this.comboBoxOut10Mode.SelectedIndexChanged += new EventHandler(this.comboBoxOut10Mode_SelectedIndexChanged); #endregion } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { #region Chinese this.labelTitleSorter1.Text = "选别部 1"; @@ -250,10 +250,10 @@ namespace ITC81DB_2.Controls this.comboBoxOut10Mode.SelectedIndexChanged += new EventHandler(this.comboBoxOut10Mode_SelectedIndexChanged); #endregion } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { #region Spanish this.labelTitleSorter1.Text = "Clasificador1"; @@ -611,9 +611,9 @@ namespace ITC81DB_2.Controls this.labelOut10RunTime.Text = value; #endregion } - public void UpdateEquipmentStatusDisplay(DataStore.EquipmentStatus status) + public void UpdateEquipmentStatusDisplay(Define.E_EquipmentStatus status) { - if (status == DataStore.EquipmentStatus.Start) + if (status == Define.E_EquipmentStatus.Start) { //this.pictureBoxStart.Visible = true; //this.pictureBoxStop.Visible = false; @@ -637,8 +637,8 @@ namespace ITC81DB_2.Controls public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.SystemSorterSetting; - this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Menu); + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.SystemSorterSetting; + this.ParentForm.ParentForm.SetDisplayMode(Define.E_DisplayMode.Menu); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); this.ParentForm.ParentForm.LoadJudgmentSetFile1(ref this.ParentForm.ParentForm.CurrentJudgmentSetItem1, this.ParentForm.ParentForm.SystemConfig1.ProductNumber - 1); diff --git a/ITC81DB_2/Controls/Etc/ControlConfiOptionBoard1.cs b/ITC81DB_2/Controls/Etc/ControlConfiOptionBoard1.cs index 55bcd99..2e2494c 100644 --- a/ITC81DB_2/Controls/Etc/ControlConfiOptionBoard1.cs +++ b/ITC81DB_2/Controls/Etc/ControlConfiOptionBoard1.cs @@ -49,7 +49,7 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.labelTitleSampleCount.Font = new Font("새굴림", 8, FontStyle.Bold); this.labelTitleSampleCount.Text = "Sample Count"; @@ -84,7 +84,7 @@ namespace ITC81DB_2.Controls this.labelHelpPort1.Text = "Port5 : 1Lane - Feedback+, Port6 : 2Lane - Feedback+"; this.labelHelpPort2.Text = "Port7 : 1Lane - Feedback-, Port8 : 2Lane - Feedback-"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.labelTitleSampleCount.Font = new Font("새굴림", 10, FontStyle.Bold); this.labelTitleSampleCount.Text = "取样计数"; @@ -119,10 +119,10 @@ namespace ITC81DB_2.Controls this.labelHelpPort1.Text = "端口 5:1 通道 - 反馈+,端口 6:2 通道 - 反馈+"; this.labelHelpPort2.Text = "端口 7:1 通道 - 反馈-,端口 8:2 通道 - 反馈-"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.labelTitleSampleCount.Font = new Font("새굴림", 8, FontStyle.Bold); this.labelTitleSampleCount.Text = "Número de muestra"; @@ -157,7 +157,7 @@ namespace ITC81DB_2.Controls this.labelHelpPort1.Text = "Puerto5 : 1Carril - Retroalimentación+, Puerto6 : 2Carril - Retroalimentación+"; this.labelHelpPort2.Text = "Puerto7 : 1Carril - Retroalimentación-, Puerto8 : 2Carril - Retroalimentación-"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Russian) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Russian) { this.labelTitleSampleCount.Font = new Font("새굴림", 6, FontStyle.Bold); this.labelTitleSampleCount.Text = "Количество образцов"; @@ -192,7 +192,7 @@ namespace ITC81DB_2.Controls this.labelHelpPort1.Text = "Порт 5: 1 линия - обратная связь+, Порт 6: 2 линии - обратная связь+"; this.labelHelpPort2.Text = "Порт 7: 1 линия - обратная связь- Порт 8: 2 линии - обратная связь-"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.German) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.German) { this.checkBoxUse.Font = new Font("새굴림", 11, FontStyle.Bold); this.checkBoxUse.Text = "Aktivieren"; @@ -404,7 +404,7 @@ namespace ITC81DB_2.Controls } public void DisplayRefresh(SystemStatus status) { - this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.ConfiOptionBoard1; + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.ConfiOptionBoard1; int temp = this.ParentForm.ParentForm.SystemConfig1.ProductNumber; this.ParentForm.ParentForm.LoadProductFile1(ref this.CurrentProductItem1, temp - 1); diff --git a/ITC81DB_2/Controls/Etc/ControlUserGroupEditor.cs b/ITC81DB_2/Controls/Etc/ControlUserGroupEditor.cs index e3d882d..9b1d309 100644 --- a/ITC81DB_2/Controls/Etc/ControlUserGroupEditor.cs +++ b/ITC81DB_2/Controls/Etc/ControlUserGroupEditor.cs @@ -142,9 +142,9 @@ namespace ITC81DB_2.Controls this.ParentForm.ParentForm.SaveUserGroupFile_Level3(this.ParentForm.ParentForm.CurrentUserGroup.Level3); } - private void UpdateUserDisplay(DataStore.UserGroup group) + private void UpdateUserDisplay(Define.E_UserGroup group) { - if (group == DataStore.UserGroup.Level3Manager || group == DataStore.UserGroup.Level4Developer) + if (group == Define.E_UserGroup.Level3Manager || group == Define.E_UserGroup.Level4Developer) this.radioButtonLevel3.Visible = true; else this.radioButtonLevel3.Visible = false; diff --git a/ITC81DB_2/Controls/MainDisplay/ControlMainBarGraph.Designer.cs b/ITC81DB_2/Controls/MainDisplay/ControlMainBarGraph.Designer.cs index 9a703e2..66d7a0f 100644 --- a/ITC81DB_2/Controls/MainDisplay/ControlMainBarGraph.Designer.cs +++ b/ITC81DB_2/Controls/MainDisplay/ControlMainBarGraph.Designer.cs @@ -1047,7 +1047,7 @@ this.labelIconNET1.Visible = false; this.labelIconNET1.Wordwrap = false; // - // ControlMainDisplayNormal + // ControlMainBarGraph // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; @@ -1098,7 +1098,7 @@ this.Controls.Add(this.labelWeight1); this.Controls.Add(this.progressBar1); this.Controls.Add(this.pictureBox1); - this.Name = "ControlMainDisplayNormal"; + this.Name = "ControlMainBarGraph"; this.Size = new System.Drawing.Size(710, 442); this.ResumeLayout(false); diff --git a/ITC81DB_2/Controls/MainDisplay/ControlMainBarGraph.cs b/ITC81DB_2/Controls/MainDisplay/ControlMainBarGraph.cs index fec1bbb..a26037d 100644 --- a/ITC81DB_2/Controls/MainDisplay/ControlMainBarGraph.cs +++ b/ITC81DB_2/Controls/MainDisplay/ControlMainBarGraph.cs @@ -45,7 +45,7 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.buttonOverRange1.DisableImage = this.buttonOverRange2.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayBargraphOverDisable)); this.buttonOverRange1.DownImage = this.buttonOverRange2.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayBargraphOverUp)); @@ -60,7 +60,7 @@ namespace ITC81DB_2.Controls this.buttonTareRange1.DownImage = this.buttonTareRange2.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayBargraphTareUp)); this.buttonTareRange1.UpImage = this.buttonTareRange2.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayBargraphTareUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.buttonOverRange1.DisableImage = this.buttonOverRange2.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnFormMainDisplayBargraphOverDisable)); this.buttonOverRange1.DownImage = this.buttonOverRange2.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnFormMainDisplayBargraphOverUp)); @@ -75,10 +75,10 @@ namespace ITC81DB_2.Controls this.buttonTareRange1.DownImage = this.buttonTareRange2.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnFormMainDisplayBargraphTareUp)); this.buttonTareRange1.UpImage = this.buttonTareRange2.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnFormMainDisplayBargraphTareUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.buttonOverRange1.DisableImage = this.buttonOverRange2.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnFormMainDisplayBargraphOverDisable)); this.buttonOverRange1.DownImage = this.buttonOverRange2.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnFormMainDisplayBargraphOverUp)); @@ -152,13 +152,13 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: underValue = Helper.StringToDecimalPlaces(item.UnderRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); passValue = Helper.StringToDecimalPlaces(item.PassRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); overValue = Helper.StringToDecimalPlaces(item.OverRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); tareValue = Helper.StringToDecimalPlaces(item.TareRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: if (item.UnderRangDeviation == 0) underValue = string.Format("-{0}", Helper.DoubleToString(0, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces)); else @@ -193,13 +193,13 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: underValue = Helper.StringToDecimalPlaces(item.UnderRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); passValue = Helper.StringToDecimalPlaces(item.PassRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); overValue = Helper.StringToDecimalPlaces(item.OverRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); tareValue = Helper.StringToDecimalPlaces(item.TareRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: if (item.UnderRangDeviation == 0) underValue = string.Format("-{0}", Helper.DoubleToString(0, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces)); else @@ -276,7 +276,7 @@ namespace ITC81DB_2.Controls if (this.labelTotalCount2.Text != value) this.labelTotalCount2.Text = value; } - private void SetProgressBarValue(SmartProgressBar progressBar, double weight, DataStore.JudgmentStatus judStatus, int decimalPlaces) + private void SetProgressBarValue(SmartProgressBar progressBar, double weight, Define.E_JudgmentStatus judStatus, int decimalPlaces) { int value = 0; @@ -292,12 +292,12 @@ namespace ITC81DB_2.Controls if (progressBar.Value != value) progressBar.Value = value; - if (judStatus == DataStore.JudgmentStatus.Over) + if (judStatus == Define.E_JudgmentStatus.Over) { if (progressBar.BarColor1 != Color.Yellow) progressBar.BarColor1 = Color.Yellow; } - else if (judStatus == DataStore.JudgmentStatus.Under || judStatus == DataStore.JudgmentStatus.Double || judStatus == DataStore.JudgmentStatus.Metal) + else if (judStatus == Define.E_JudgmentStatus.Under || judStatus == Define.E_JudgmentStatus.Double || judStatus == Define.E_JudgmentStatus.Metal) { if (progressBar.BarColor1 != Color.Red) progressBar.BarColor1 = Color.Red; @@ -312,31 +312,31 @@ namespace ITC81DB_2.Controls { switch (user.Group) { - case DataStore.UserGroup.LogOff: + case Define.E_UserGroup.LogOff: this.buttonUnderRange1.Enabled = this.buttonUnderRange2.Enabled = false; this.buttonPassRange1.Enabled = this.buttonPassRange2.Enabled = false; this.buttonOverRange1.Enabled = this.buttonOverRange2.Enabled = false; this.buttonTareRange1.Enabled = this.buttonTareRange2.Enabled = false; break; - case DataStore.UserGroup.Level1Operator: + case Define.E_UserGroup.Level1Operator: this.buttonUnderRange1.Enabled = this.buttonUnderRange2.Enabled = true; this.buttonPassRange1.Enabled = this.buttonPassRange2.Enabled = true; this.buttonOverRange1.Enabled = this.buttonOverRange2.Enabled = true; this.buttonTareRange1.Enabled = this.buttonTareRange2.Enabled = true; break; - case DataStore.UserGroup.Level2Engineer: + case Define.E_UserGroup.Level2Engineer: this.buttonUnderRange1.Enabled = this.buttonUnderRange2.Enabled = true; this.buttonPassRange1.Enabled = this.buttonPassRange2.Enabled = true; this.buttonOverRange1.Enabled = this.buttonOverRange2.Enabled = true; this.buttonTareRange1.Enabled = this.buttonTareRange2.Enabled = true; break; - case DataStore.UserGroup.Level3Manager: + case Define.E_UserGroup.Level3Manager: this.buttonUnderRange1.Enabled = this.buttonUnderRange2.Enabled = true; this.buttonPassRange1.Enabled = this.buttonPassRange2.Enabled = true; this.buttonOverRange1.Enabled = this.buttonOverRange2.Enabled = true; this.buttonTareRange1.Enabled = this.buttonTareRange2.Enabled = true; break; - case DataStore.UserGroup.Level4Developer: + case Define.E_UserGroup.Level4Developer: this.buttonUnderRange1.Enabled = this.buttonUnderRange2.Enabled = true; this.buttonPassRange1.Enabled = this.buttonPassRange2.Enabled = true; this.buttonOverRange1.Enabled = this.buttonOverRange2.Enabled = true; @@ -350,17 +350,17 @@ namespace ITC81DB_2.Controls break; } } - private void UpdateDisplayStopWeight1(DataStore.EquipmentStatus status, WeightData data) + private void UpdateDisplayStopWeight1(Define.E_EquipmentStatus status, WeightData data) { string value = ""; // 영점 표시 - if (data.Status == DataStore.WeightStatus.WeightZero) + if (data.Status == Define.E_WeightStatus.WeightZero) this.pictureBoxIconZero1.Visible = true; else this.pictureBoxIconZero1.Visible = false; - if (status == DataStore.EquipmentStatus.Stop) + if (status == Define.E_EquipmentStatus.Stop) { // 중량 value = Helper.DoubleToString(data.Weight, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); @@ -368,17 +368,17 @@ namespace ITC81DB_2.Controls this.labelWeight1.Text = value; } } - private void UpdateDisplayStopWeight2(DataStore.EquipmentStatus status, WeightData data) + private void UpdateDisplayStopWeight2(Define.E_EquipmentStatus status, WeightData data) { string value = ""; // 영점 아이콘표시 - if (data.Status == DataStore.WeightStatus.WeightZero) + if (data.Status == Define.E_WeightStatus.WeightZero) this.pictureBoxIconZero2.Visible = true; else this.pictureBoxIconZero2.Visible = false; - if (status == DataStore.EquipmentStatus.Stop) + if (status == Define.E_EquipmentStatus.Stop) { // 중량 value = Helper.DoubleToString(data.Weight, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); @@ -407,13 +407,13 @@ namespace ITC81DB_2.Controls this.labelIconNET2.Visible = false; } - public void UpdateEquipmentStatusDisplay(DataStore.EquipmentStatus status) + public void UpdateEquipmentStatusDisplay(Define.E_EquipmentStatus status) { this.labelSpeed1.Text = this.labelSpeed2.Text = "0"; this.progressBar1.Value = this.progressBar1.Minimum; this.progressBar2.Value = this.progressBar2.Minimum; - if (status == DataStore.EquipmentStatus.Start) + if (status == Define.E_EquipmentStatus.Start) { this.labelWeight1.Text = Helper.StringToDecimalPlaces("0", this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); this.labelWeight2.Text = Helper.StringToDecimalPlaces("0", this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); @@ -426,7 +426,7 @@ namespace ITC81DB_2.Controls this.pictureBoxIconMetal2.Visible = false; } } - public void UpdateCurrentProductDisplay(DataStore.EquipmentStatus status, ProductItem pItem1,ProductItem pItem2, WeightData wData1, WeightData wData2) + public void UpdateCurrentProductDisplay(Define.E_EquipmentStatus status, ProductItem pItem1,ProductItem pItem2, WeightData wData1, WeightData wData2) { this.SetProduct1(pItem1); this.SetProduct2(pItem2); @@ -436,16 +436,16 @@ namespace ITC81DB_2.Controls this.RescaleProgressBar1(); this.RescaleProgressBar2(); } - public void UpdateStopWeightDisplay(DataStore.EquipmentStatus status, WeightData data1, WeightData data2) + public void UpdateStopWeightDisplay(Define.E_EquipmentStatus status, WeightData data1, WeightData data2) { this.UpdateDisplayStopWeight1(status, data1); this.UpdateDisplayStopWeight2(status, data2); } - public void UpdateStartWeightDisplay1(DataStore.EquipmentStatus status, WeightData data) + public void UpdateStartWeightDisplay1(Define.E_EquipmentStatus status, WeightData data) { string value = ""; - if (data.JudgmentStatus == DataStore.JudgmentStatus.Empty) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Empty) return; // 중량 @@ -454,7 +454,7 @@ namespace ITC81DB_2.Controls this.labelWeight1.Text = value; // GAP 아이콘 표시 - if (data.JudgmentStatus == DataStore.JudgmentStatus.Double) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Double) { if (this.pictureBoxIconGap1.Visible != true) this.pictureBoxIconGap1.Visible = true; @@ -463,7 +463,7 @@ namespace ITC81DB_2.Controls this.pictureBoxIconGap1.Visible = false; // Metal 아이콘 표시 - if (data.JudgmentStatus == DataStore.JudgmentStatus.Metal) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Metal) { if (this.pictureBoxIconMetal1.Visible != true) this.pictureBoxIconMetal1.Visible = true; @@ -479,11 +479,11 @@ namespace ITC81DB_2.Controls this.SetProgressBarValue(this.progressBar1, data.Weight, data.JudgmentStatus, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); this.SetCount1(data); } - public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData data) + public void UpdateStartWeightDisplay2(Define.E_EquipmentStatus status, WeightData data) { string value = ""; - if (data.JudgmentStatus == DataStore.JudgmentStatus.Empty) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Empty) return; // 중량 @@ -492,7 +492,7 @@ namespace ITC81DB_2.Controls this.labelWeight2.Text = value; // GAP 아이콘 표시 - if (data.JudgmentStatus == DataStore.JudgmentStatus.Double) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Double) { if (this.pictureBoxIconGap2.Visible != true) this.pictureBoxIconGap2.Visible = true; @@ -501,7 +501,7 @@ namespace ITC81DB_2.Controls this.pictureBoxIconGap2.Visible = false; // Metal 아이콘 표시 - if (data.JudgmentStatus == DataStore.JudgmentStatus.Metal) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Metal) { if (this.pictureBoxIconMetal2.Visible != true) this.pictureBoxIconMetal2.Visible = true; @@ -566,11 +566,11 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: dValue = myKeyPad.doubleValue; sValue = myKeyPad.StringValue; break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: dValue = Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem1.PassRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces) - Math.Abs(myKeyPad.doubleValue); sValue = Helper.DoubleToString(dValue, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); @@ -593,10 +593,10 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: value = myKeyPad.StringValue; break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: if (myKeyPad.doubleValue == 0) value = string.Format("-{0}", Helper.DoubleToString(0, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces)); else @@ -688,13 +688,13 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: #region WeightMode underRange = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem1.UnderRange.ToString(), this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); overRange = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem1.OverRange.ToString(), this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); #endregion break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: #region DeviationMode if (this.ParentForm.ParentForm.CurrentProductItem1.UnderRangDeviation == 0) underRange = string.Format("-{0}", Helper.DoubleToString(0, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces)); @@ -738,11 +738,11 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: dValue = myKeyPad.doubleValue; sValue = myKeyPad.StringValue; break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: dValue = Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem1.PassRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces) + myKeyPad.doubleValue; sValue = Helper.DoubleToString(dValue, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); @@ -766,10 +766,10 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: value = myKeyPad.StringValue; break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: value = string.Format("+{0}", myKeyPad.StringValue); break; default: @@ -862,11 +862,11 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: dValue = myKeyPad.doubleValue; sValue = myKeyPad.StringValue; break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: dValue = Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem2.PassRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces) - Math.Abs(myKeyPad.doubleValue); sValue = Helper.DoubleToString(dValue, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); @@ -889,10 +889,10 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: value = myKeyPad.StringValue; break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: if (myKeyPad.doubleValue == 0) value = string.Format("-{0}", Helper.DoubleToString(0, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces)); else @@ -985,13 +985,13 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: #region WeightMode underRange = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem2.UnderRange.ToString(), this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); overRange = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem2.OverRange.ToString(), this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); #endregion break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: #region DeviationMode if (this.ParentForm.ParentForm.CurrentProductItem2.UnderRangDeviation == 0) underRange = string.Format("-{0}", Helper.DoubleToString(0, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces)); @@ -1035,11 +1035,11 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: dValue = myKeyPad.doubleValue; sValue = myKeyPad.StringValue; break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: dValue = Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem2.PassRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces) + myKeyPad.doubleValue; sValue = Helper.DoubleToString(dValue, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); @@ -1063,10 +1063,10 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: value = myKeyPad.StringValue; break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: value = string.Format("+{0}", myKeyPad.StringValue); break; default: diff --git a/ITC81DB_2/Controls/MainDisplay/ControlMainDataStatistics.cs b/ITC81DB_2/Controls/MainDisplay/ControlMainDataStatistics.cs index 169a0d3..aad55af 100644 --- a/ITC81DB_2/Controls/MainDisplay/ControlMainDataStatistics.cs +++ b/ITC81DB_2/Controls/MainDisplay/ControlMainDataStatistics.cs @@ -43,18 +43,18 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.pictureBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayStatistics)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.pictureBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.chnFormMainDisplayStatistics)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.pictureBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.spnFormMainDisplayStatistics)); } @@ -74,12 +74,12 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: underValue = Helper.StringToDecimalPlaces(item.UnderRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); passValue = Helper.StringToDecimalPlaces(item.PassRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); overValue = Helper.StringToDecimalPlaces(item.OverRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: underValue = Helper.StringToDecimalPlaces(item.UnderRangDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); passValue = Helper.StringToDecimalPlaces(item.PassRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); overValue = Helper.StringToDecimalPlaces(item.OverRangeDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); @@ -104,12 +104,12 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: underValue = Helper.StringToDecimalPlaces(item.UnderRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); passValue = Helper.StringToDecimalPlaces(item.PassRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); overValue = Helper.StringToDecimalPlaces(item.OverRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: underValue = Helper.StringToDecimalPlaces(item.UnderRangDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); passValue = Helper.StringToDecimalPlaces(item.PassRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); overValue = Helper.StringToDecimalPlaces(item.OverRangeDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); @@ -249,42 +249,42 @@ namespace ITC81DB_2.Controls { switch (user.Group) { - case DataStore.UserGroup.LogOff: + case Define.E_UserGroup.LogOff: break; - case DataStore.UserGroup.Level1Operator: + case Define.E_UserGroup.Level1Operator: break; - case DataStore.UserGroup.Level2Engineer: + case Define.E_UserGroup.Level2Engineer: break; - case DataStore.UserGroup.Level3Manager: + case Define.E_UserGroup.Level3Manager: break; - case DataStore.UserGroup.Level4Developer: + case Define.E_UserGroup.Level4Developer: break; default: break; } } - public void UpdateCurrentProductDisplay(DataStore.EquipmentStatus status, ProductItem pItem1, ProductItem pItem2, WeightData wData1, WeightData wData2) + public void UpdateCurrentProductDisplay(Define.E_EquipmentStatus status, ProductItem pItem1, ProductItem pItem2, WeightData wData1, WeightData wData2) { this.SetProduct1(pItem1); this.SetProduct2(pItem2); this.SetCount1(wData1); this.SetCount2(wData2); } - public void UpdateStartWeightDisplay1(DataStore.EquipmentStatus status, WeightData data) + public void UpdateStartWeightDisplay1(Define.E_EquipmentStatus status, WeightData data) { string value = ""; - if (data.JudgmentStatus == DataStore.JudgmentStatus.Empty) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Empty) return; this.SetCount1(data); } - public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData data) + public void UpdateStartWeightDisplay2(Define.E_EquipmentStatus status, WeightData data) { string value = ""; - if (data.JudgmentStatus == DataStore.JudgmentStatus.Empty) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Empty) return; this.SetCount2(data); diff --git a/ITC81DB_2/Controls/MainDisplay/ControlMainFeedback.cs b/ITC81DB_2/Controls/MainDisplay/ControlMainFeedback.cs index 57446cf..86726c3 100644 --- a/ITC81DB_2/Controls/MainDisplay/ControlMainFeedback.cs +++ b/ITC81DB_2/Controls/MainDisplay/ControlMainFeedback.cs @@ -45,7 +45,7 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.labelTitleWeight1.Text = this.labelTitleWeight2.Text = "Weight"; this.labelTitleDeviation1.Text = this.labelTitleDeviation2.Text = "Dev."; @@ -63,7 +63,7 @@ namespace ITC81DB_2.Controls this.labelTitleFeedback2.Font = new Font("새굴림", 10, FontStyle.Bold); this.labelTitleFeedback1.Text = this.labelTitleFeedback2.Text = "Feedback"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.labelTitleWeight1.Text = this.labelTitleWeight2.Text = "重量"; this.labelTitleDeviation1.Text = this.labelTitleDeviation2.Text = "误差"; @@ -81,10 +81,10 @@ namespace ITC81DB_2.Controls this.labelTitleFeedback2.Font = new Font("새굴림", 10, FontStyle.Bold); this.labelTitleFeedback1.Text = this.labelTitleFeedback2.Text = "反馈"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.labelTitleWeight1.Text = this.labelTitleWeight2.Text = "Peso"; this.labelTitleDeviation1.Text = this.labelTitleDeviation2.Text = "Desv."; @@ -102,7 +102,7 @@ namespace ITC81DB_2.Controls this.labelTitleFeedback2.Font = new Font("새굴림", 8, FontStyle.Bold); this.labelTitleFeedback1.Text = this.labelTitleFeedback2.Text = "Retroalimentación"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.German) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.German) { } diff --git a/ITC81DB_2/Controls/MainDisplay/ControlMainLineGraph.cs b/ITC81DB_2/Controls/MainDisplay/ControlMainLineGraph.cs index b0eed10..96fb296 100644 --- a/ITC81DB_2/Controls/MainDisplay/ControlMainLineGraph.cs +++ b/ITC81DB_2/Controls/MainDisplay/ControlMainLineGraph.cs @@ -45,7 +45,7 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.buttonOverRange1.DisableImage = this.buttonOverRange2.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engMainRunLineOverDisable)); this.buttonOverRange1.DownImage = this.buttonOverRange2.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engMainRunLineOverDown)); @@ -57,7 +57,7 @@ namespace ITC81DB_2.Controls this.buttonUnderRange1.DownImage = this.buttonUnderRange2.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engMainRunLineUnderDown)); this.buttonUnderRange1.UpImage = this.buttonUnderRange2.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engMainRunLineUnderUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.buttonOverRange1.DisableImage = this.buttonOverRange2.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnMainRunLineOverDisable)); this.buttonOverRange1.DownImage = this.buttonOverRange2.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnMainRunLineOverDown)); @@ -69,10 +69,10 @@ namespace ITC81DB_2.Controls this.buttonUnderRange1.DownImage = this.buttonUnderRange2.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnMainRunLineUnderDown)); this.buttonUnderRange1.UpImage = this.buttonUnderRange2.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnMainRunLineUnderUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.buttonOverRange1.DisableImage = this.buttonOverRange2.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnMainRunLineOverDisable)); this.buttonOverRange1.DownImage = this.buttonOverRange2.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnMainRunLineOverDown)); @@ -148,12 +148,12 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: underValue = Helper.StringToDecimalPlaces(item.UnderRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); passValue = Helper.StringToDecimalPlaces(item.PassRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); overValue = Helper.StringToDecimalPlaces(item.OverRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: if (item.UnderRangDeviation == 0) underValue = string.Format("-{0}", Helper.DoubleToString(0, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces)); else @@ -181,12 +181,12 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: underValue = Helper.StringToDecimalPlaces(item.UnderRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); passValue = Helper.StringToDecimalPlaces(item.PassRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); overValue = Helper.StringToDecimalPlaces(item.OverRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: if (item.UnderRangDeviation == 0) underValue = string.Format("-{0}", Helper.DoubleToString(0, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces)); else @@ -276,27 +276,27 @@ namespace ITC81DB_2.Controls { switch (user.Group) { - case DataStore.UserGroup.LogOff: + case Define.E_UserGroup.LogOff: this.buttonUnderRange1.Enabled = this.buttonUnderRange2.Enabled = false; this.buttonPassRange1.Enabled = this.buttonPassRange2.Enabled = false; this.buttonOverRange1.Enabled = this.buttonOverRange2.Enabled = false; break; - case DataStore.UserGroup.Level1Operator: + case Define.E_UserGroup.Level1Operator: this.buttonUnderRange1.Enabled = this.buttonUnderRange2.Enabled = true; this.buttonPassRange1.Enabled = this.buttonPassRange2.Enabled = true; this.buttonOverRange1.Enabled = this.buttonOverRange2.Enabled = true; break; - case DataStore.UserGroup.Level2Engineer: + case Define.E_UserGroup.Level2Engineer: this.buttonUnderRange1.Enabled = this.buttonUnderRange2.Enabled = true; this.buttonPassRange1.Enabled = this.buttonPassRange2.Enabled = true; this.buttonOverRange1.Enabled = this.buttonOverRange2.Enabled = true; break; - case DataStore.UserGroup.Level3Manager: + case Define.E_UserGroup.Level3Manager: this.buttonUnderRange1.Enabled = this.buttonUnderRange2.Enabled = true; this.buttonPassRange1.Enabled = this.buttonPassRange2.Enabled = true; this.buttonOverRange1.Enabled = this.buttonOverRange2.Enabled = true; break; - case DataStore.UserGroup.Level4Developer: + case Define.E_UserGroup.Level4Developer: this.buttonUnderRange1.Enabled = this.buttonUnderRange2.Enabled = true; this.buttonPassRange1.Enabled = this.buttonPassRange2.Enabled = true; this.buttonOverRange1.Enabled = this.buttonOverRange2.Enabled = true; @@ -309,7 +309,7 @@ namespace ITC81DB_2.Controls } } - public void UpdateCurrentProductDisplay(DataStore.EquipmentStatus status, ProductItem pItem1, ProductItem pItem2, WeightData wData1, WeightData wData2) + public void UpdateCurrentProductDisplay(Define.E_EquipmentStatus status, ProductItem pItem1, ProductItem pItem2, WeightData wData1, WeightData wData2) { this.SetProduct1(pItem1); this.SetProduct2(pItem2); @@ -321,21 +321,21 @@ namespace ITC81DB_2.Controls this.draw2.PutDataAllClear(); } - public void UpdateStartWeightDisplay1(DataStore.EquipmentStatus status, WeightData data) + public void UpdateStartWeightDisplay1(Define.E_EquipmentStatus status, WeightData data) { string value = ""; - if (data.JudgmentStatus == DataStore.JudgmentStatus.Empty) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Empty) return; this.SetDrawData(this.draw1, data.WeightString, this.ParentForm.ParentForm.CurrentProductItem1); this.SetCount1(data); } - public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData data) + public void UpdateStartWeightDisplay2(Define.E_EquipmentStatus status, WeightData data) { string value = ""; - if (data.JudgmentStatus == DataStore.JudgmentStatus.Empty) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Empty) return; this.SetDrawData(this.draw2, data.WeightString, this.ParentForm.ParentForm.CurrentProductItem2); @@ -384,11 +384,11 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: dValue = myKeyPad.doubleValue; sValue = myKeyPad.StringValue; break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: dValue = Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem1.PassRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces) - Math.Abs(myKeyPad.doubleValue); sValue = Helper.DoubleToString(dValue, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); @@ -411,10 +411,10 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: value = myKeyPad.StringValue; break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: if (myKeyPad.doubleValue == 0) value = string.Format("-{0}", Helper.DoubleToString(0, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces)); else @@ -507,13 +507,13 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: #region WeightMode underRange = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem1.UnderRange.ToString(), this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); overRange = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem1.OverRange.ToString(), this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); #endregion break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: #region DeviationMode if (this.ParentForm.ParentForm.CurrentProductItem1.UnderRangDeviation == 0) underRange = string.Format("-{0}", Helper.DoubleToString(0, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces)); @@ -557,11 +557,11 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: dValue = myKeyPad.doubleValue; sValue = myKeyPad.StringValue; break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: dValue = Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem1.PassRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces) + myKeyPad.doubleValue; sValue = Helper.DoubleToString(dValue, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); @@ -585,10 +585,10 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: value = myKeyPad.StringValue; break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: value = string.Format("+{0}", myKeyPad.StringValue); break; default: @@ -641,11 +641,11 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: dValue = myKeyPad.doubleValue; sValue = myKeyPad.StringValue; break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: dValue = Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem2.PassRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces) - Math.Abs(myKeyPad.doubleValue); sValue = Helper.DoubleToString(dValue, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); @@ -668,10 +668,10 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: value = myKeyPad.StringValue; break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: if (myKeyPad.doubleValue == 0) value = string.Format("-{0}", Helper.DoubleToString(0, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces)); else @@ -764,13 +764,13 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: #region WeightMode underRange = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem2.UnderRange.ToString(), this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); overRange = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem2.OverRange.ToString(), this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); #endregion break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: #region DeviationMode if (this.ParentForm.ParentForm.CurrentProductItem2.UnderRangDeviation == 0) underRange = string.Format("-{0}", Helper.DoubleToString(0, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces)); @@ -814,11 +814,11 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: dValue = myKeyPad.doubleValue; sValue = myKeyPad.StringValue; break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: dValue = Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem2.PassRange, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces) + myKeyPad.doubleValue; sValue = Helper.DoubleToString(dValue, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); @@ -842,10 +842,10 @@ namespace ITC81DB_2.Controls switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { - case DataStore.WeightInputMode.Weight: + case Define.E_WeightInputMode.Weight: value = myKeyPad.StringValue; break; - case DataStore.WeightInputMode.Deviation: + case Define.E_WeightInputMode.Deviation: value = string.Format("+{0}", myKeyPad.StringValue); break; default: diff --git a/ITC81DB_2/Controls/MainDisplay/ControlMainList.cs b/ITC81DB_2/Controls/MainDisplay/ControlMainList.cs index 1b19bd0..2ff7067 100644 --- a/ITC81DB_2/Controls/MainDisplay/ControlMainList.cs +++ b/ITC81DB_2/Controls/MainDisplay/ControlMainList.cs @@ -43,22 +43,22 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.labelTitleTime1.Text = this.labelTitleTime2.Text = "Time"; this.labelTitleWeight1.Text = this.labelTitleWeight2.Text = "Weight"; this.labelTitleGrade1.Text = this.labelTitleGrade2.Text = "Grade"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.labelTitleTime1.Text = this.labelTitleTime2.Text = "时间"; this.labelTitleWeight1.Text = this.labelTitleWeight2.Text = "重量"; this.labelTitleGrade1.Text = this.labelTitleGrade2.Text = "等级"; } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.labelTitleTime1.Text = this.labelTitleTime2.Text = "Tiempo"; this.labelTitleWeight1.Text = this.labelTitleWeight2.Text = "Peso"; @@ -76,7 +76,7 @@ namespace ITC81DB_2.Controls } - private void UpdateDisplayListBox1(DataStore.EquipmentStatus status, WeightData data) + private void UpdateDisplayListBox1(Define.E_EquipmentStatus status, WeightData data) { string value = "", time = "", weight = ""; @@ -90,7 +90,7 @@ namespace ITC81DB_2.Controls this.listBox1.AddItem(value); this.listBox1.ScrollDown(); } - private void UpdateDisplayListBox2(DataStore.EquipmentStatus status, WeightData data) + private void UpdateDisplayListBox2(Define.E_EquipmentStatus status, WeightData data) { string value = "", time = "", weight = ""; @@ -105,20 +105,20 @@ namespace ITC81DB_2.Controls this.listBox2.ScrollDown(); } - public void UpdateStartWeightDisplay1(DataStore.EquipmentStatus status, WeightData data) + public void UpdateStartWeightDisplay1(Define.E_EquipmentStatus status, WeightData data) { string value = ""; - if (data.JudgmentStatus == DataStore.JudgmentStatus.Empty) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Empty) return; this.UpdateDisplayListBox1(status, data); } - public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData data) + public void UpdateStartWeightDisplay2(Define.E_EquipmentStatus status, WeightData data) { string value = ""; - if (data.JudgmentStatus == DataStore.JudgmentStatus.Empty) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Empty) return; this.UpdateDisplayListBox2(status, data); diff --git a/ITC81DB_2/Controls/MainDisplay/ControlMainSubMenu.cs b/ITC81DB_2/Controls/MainDisplay/ControlMainSubMenu.cs index 9502bfc..f767dac 100644 --- a/ITC81DB_2/Controls/MainDisplay/ControlMainSubMenu.cs +++ b/ITC81DB_2/Controls/MainDisplay/ControlMainSubMenu.cs @@ -45,7 +45,7 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { #region English this.labelTitleSorter1.Text = "Sorter A"; @@ -105,7 +105,7 @@ namespace ITC81DB_2.Controls this.buttonBypassDirection1.UpImage = this.buttonBypassDirection2.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engBypassOccasionUp)); #endregion } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { #region Chinese this.labelTitleSorter1.Text = "分类机 A"; @@ -165,10 +165,10 @@ namespace ITC81DB_2.Controls this.buttonBypassDirection1.UpImage = this.buttonBypassDirection2.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnBypassOccasionUp)); #endregion } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { #region English this.labelTitleSorter1.Text = "Clasificador A"; @@ -381,23 +381,23 @@ namespace ITC81DB_2.Controls { switch (user.Group) { - case DataStore.UserGroup.LogOff: + case Define.E_UserGroup.LogOff: this.groupBoxSorter.Enabled = false; this.groupBoxAutoZero.Enabled = false; break; - case DataStore.UserGroup.Level1Operator: + case Define.E_UserGroup.Level1Operator: this.groupBoxSorter.Enabled = false; this.groupBoxAutoZero.Enabled = false; break; - case DataStore.UserGroup.Level2Engineer: + case Define.E_UserGroup.Level2Engineer: this.groupBoxSorter.Enabled = true; this.groupBoxAutoZero.Enabled = true; break; - case DataStore.UserGroup.Level3Manager: + case Define.E_UserGroup.Level3Manager: this.groupBoxSorter.Enabled = true; this.groupBoxAutoZero.Enabled = true; break; - case DataStore.UserGroup.Level4Developer: + case Define.E_UserGroup.Level4Developer: this.groupBoxSorter.Enabled = true; this.groupBoxAutoZero.Enabled = true; break; diff --git a/ITC81DB_2/Controls/MainDisplay/ControlMainWeightScreen.Designer.cs b/ITC81DB_2/Controls/MainDisplay/ControlMainWeightScreen.Designer.cs index d3a8693..e82fe45 100644 --- a/ITC81DB_2/Controls/MainDisplay/ControlMainWeightScreen.Designer.cs +++ b/ITC81DB_2/Controls/MainDisplay/ControlMainWeightScreen.Designer.cs @@ -413,12 +413,12 @@ this.labelWeight1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelWeight1.Wordwrap = false; // - // ControlMainDisplayWeightScreen + // ControlMainWeightScreen // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.Controls.Add(this.smartGroupBox1); - this.Name = "ControlMainDisplayWeightScreen"; + this.Name = "ControlMainWeightScreen"; this.Size = new System.Drawing.Size(175, 442); this.smartGroupBox1.ResumeLayout(false); this.panel1.ResumeLayout(false); diff --git a/ITC81DB_2/Controls/MainDisplay/ControlMainWeightScreen.cs b/ITC81DB_2/Controls/MainDisplay/ControlMainWeightScreen.cs index c5fcd91..621bc22 100644 --- a/ITC81DB_2/Controls/MainDisplay/ControlMainWeightScreen.cs +++ b/ITC81DB_2/Controls/MainDisplay/ControlMainWeightScreen.cs @@ -42,7 +42,7 @@ namespace ITC81DB_2.Controls { Class1 images = new Class1(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.buttonOver1.DownImage = this.buttonOver2.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engLightOverDown)); this.buttonOver1.UpImage = this.buttonOver2.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engLightOverUp)); @@ -51,7 +51,7 @@ namespace ITC81DB_2.Controls this.buttonUnder1.DownImage = this.buttonUnder2.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engLightUnderDown)); this.buttonUnder1.UpImage = this.buttonUnder2.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engLightUnderUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.buttonOver1.DownImage = this.buttonOver2.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnLightOverDown)); this.buttonOver1.UpImage = this.buttonOver2.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnLightOverUp)); @@ -60,10 +60,10 @@ namespace ITC81DB_2.Controls this.buttonUnder1.DownImage = this.buttonUnder2.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnLightUnderDown)); this.buttonUnder1.UpImage = this.buttonUnder2.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnLightUnderUp)); } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Czech) { } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.buttonOver1.DownImage = this.buttonOver2.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnLightOverDown)); this.buttonOver1.UpImage = this.buttonOver2.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnLightOverUp)); @@ -87,9 +87,9 @@ namespace ITC81DB_2.Controls { } - public void UpdateEquipmentStatusDisplay(DataStore.EquipmentStatus status) + public void UpdateEquipmentStatusDisplay(Define.E_EquipmentStatus status) { - if (status == DataStore.EquipmentStatus.Start) + if (status == Define.E_EquipmentStatus.Start) { this.labelWeight1.Text = Helper.StringToDecimalPlaces("0", this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); this.labelWeight2.Text = Helper.StringToDecimalPlaces("0", this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); @@ -109,22 +109,22 @@ namespace ITC81DB_2.Controls this.buttonOver2.ButtonUp(); } } - public void UpdateStopWeightDisplay(DataStore.EquipmentStatus status, WeightData data1, WeightData data2) + public void UpdateStopWeightDisplay(Define.E_EquipmentStatus status, WeightData data1, WeightData data2) { this.UpdateDisplayStopWeight1(status, data1); this.UpdateDisplayStopWeight2(status, data2); } - private void UpdateDisplayStopWeight1(DataStore.EquipmentStatus status, WeightData data) + private void UpdateDisplayStopWeight1(Define.E_EquipmentStatus status, WeightData data) { string value = ""; // 영점 아이콘표시 - if (data.Status == DataStore.WeightStatus.WeightZero) + if (data.Status == Define.E_WeightStatus.WeightZero) this.pictureBoxIconZero1.Visible = true; else this.pictureBoxIconZero1.Visible = false; - if (status == DataStore.EquipmentStatus.Stop) + if (status == Define.E_EquipmentStatus.Stop) { // 중량 value = Helper.DoubleToString(data.Weight, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); @@ -132,17 +132,17 @@ namespace ITC81DB_2.Controls this.labelWeight1.Text = value; } } - private void UpdateDisplayStopWeight2(DataStore.EquipmentStatus status, WeightData data) + private void UpdateDisplayStopWeight2(Define.E_EquipmentStatus status, WeightData data) { string value = ""; // 영점 아이콘표시 - if (data.Status == DataStore.WeightStatus.WeightZero) + if (data.Status == Define.E_WeightStatus.WeightZero) this.pictureBoxIconZero2.Visible = true; else this.pictureBoxIconZero2.Visible = false; - if (status == DataStore.EquipmentStatus.Stop) + if (status == Define.E_EquipmentStatus.Stop) { // 중량 value = Helper.DoubleToString(data.Weight, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); @@ -150,21 +150,21 @@ namespace ITC81DB_2.Controls this.labelWeight2.Text = value; } } - private void UpdateDisplayJudgmentIcon1(DataStore.JudgmentStatus status) + private void UpdateDisplayJudgmentIcon1(Define.E_JudgmentStatus status) { - if (status == DataStore.JudgmentStatus.Under) + if (status == Define.E_JudgmentStatus.Under) { this.buttonUnder1.ButtonDown(); this.buttonPass1.ButtonUp(); this.buttonOver1.ButtonUp(); } - else if (status == DataStore.JudgmentStatus.Pass) + else if (status == Define.E_JudgmentStatus.Pass) { this.buttonUnder1.ButtonUp(); this.buttonPass1.ButtonDown(); this.buttonOver1.ButtonUp(); } - else if (status == DataStore.JudgmentStatus.Over) + else if (status == Define.E_JudgmentStatus.Over) { this.buttonUnder1.ButtonUp(); this.buttonPass1.ButtonUp(); @@ -177,21 +177,21 @@ namespace ITC81DB_2.Controls this.buttonOver1.ButtonUp(); } } - private void UpdateDisplayJudgmentIcon2(DataStore.JudgmentStatus status) + private void UpdateDisplayJudgmentIcon2(Define.E_JudgmentStatus status) { - if (status == DataStore.JudgmentStatus.Under) + if (status == Define.E_JudgmentStatus.Under) { this.buttonUnder2.ButtonDown(); this.buttonPass2.ButtonUp(); this.buttonOver2.ButtonUp(); } - else if (status == DataStore.JudgmentStatus.Pass) + else if (status == Define.E_JudgmentStatus.Pass) { this.buttonUnder2.ButtonUp(); this.buttonPass2.ButtonDown(); this.buttonOver2.ButtonUp(); } - else if (status == DataStore.JudgmentStatus.Over) + else if (status == Define.E_JudgmentStatus.Over) { this.buttonUnder2.ButtonUp(); this.buttonPass2.ButtonUp(); @@ -224,17 +224,17 @@ namespace ITC81DB_2.Controls else this.labelIconNET2.Visible = false; } - public void UpdateCurrentProductDisplay(DataStore.EquipmentStatus status, ProductItem pItem1, ProductItem pItem2, WeightData wData1, WeightData wData2) + public void UpdateCurrentProductDisplay(Define.E_EquipmentStatus status, ProductItem pItem1, ProductItem pItem2, WeightData wData1, WeightData wData2) { this.UpdateDisplayIconNET1(pItem1); this.UpdateDisplayIconNET2(pItem2); } - public void UpdateStartWeightDisplay1(DataStore.EquipmentStatus status, WeightData data) + public void UpdateStartWeightDisplay1(Define.E_EquipmentStatus status, WeightData data) { string value = ""; - if (data.JudgmentStatus == DataStore.JudgmentStatus.Empty) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Empty) return; // 중량 @@ -243,7 +243,7 @@ namespace ITC81DB_2.Controls this.labelWeight1.Text = value; // GAP 아이콘 표시 - if (data.JudgmentStatus == DataStore.JudgmentStatus.Double) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Double) { if (this.pictureBoxIconGap1.Visible != true) this.pictureBoxIconGap1.Visible = true; @@ -252,7 +252,7 @@ namespace ITC81DB_2.Controls this.pictureBoxIconGap1.Visible = false; // Metal 아이콘 표시 - if (data.JudgmentStatus == DataStore.JudgmentStatus.Metal) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Metal) { if (this.pictureBoxIconMetal1.Visible != true) this.pictureBoxIconMetal1.Visible = true; @@ -262,11 +262,11 @@ namespace ITC81DB_2.Controls this.UpdateDisplayJudgmentIcon1(data.JudgmentStatus); } - public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData data) + public void UpdateStartWeightDisplay2(Define.E_EquipmentStatus status, WeightData data) { string value = ""; - if (data.JudgmentStatus == DataStore.JudgmentStatus.Empty) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Empty) return; // 중량 @@ -275,7 +275,7 @@ namespace ITC81DB_2.Controls this.labelWeight2.Text = value; // GAP 아이콘 표시 - if (data.JudgmentStatus == DataStore.JudgmentStatus.Double) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Double) { if (this.pictureBoxIconGap2.Visible != true) this.pictureBoxIconGap2.Visible = true; @@ -284,7 +284,7 @@ namespace ITC81DB_2.Controls this.pictureBoxIconGap2.Visible = false; // Metal 아이콘 표시 - if (data.JudgmentStatus == DataStore.JudgmentStatus.Metal) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Metal) { if (this.pictureBoxIconMetal2.Visible != true) this.pictureBoxIconMetal2.Visible = true; diff --git a/ITC81DB_2/Controls/MainDisplay/ControlMainWeightScreen.resx b/ITC81DB_2/Controls/MainDisplay/ControlMainWeightScreen.resx index b89ee58..c3fb57f 100644 --- a/ITC81DB_2/Controls/MainDisplay/ControlMainWeightScreen.resx +++ b/ITC81DB_2/Controls/MainDisplay/ControlMainWeightScreen.resx @@ -527,6 +527,417 @@ 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 + vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L + Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA + bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z + llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW + ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s + xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6 + eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw + YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR + XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm + WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl + xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2 + dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8 + V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za + Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v + Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb + PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/ + 0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h + /HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr + XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS + fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ + tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOvgAADr4B6kKxwAAAA8lJREFUeF7tmzFO60AQ + QNNRpYhERwVVUoGE6KCChi4UCBqUJsoVuAJX4ApcgStwBa7AFfz19mei0TDhW3xvNmvPSE/Ea3u90Tzv + rjdmtFwumyAoRQgYFCUEDIoSAgZFCQGDooSAQVEGK+DDw0NzcXGxgW3vuJLM5/Pm9vY2sY/t64JBCkgy + T05Omufn5w1s50oyAmnZf0LacHNz05yfn6e/kLN9JaleQJJzdHTUjEaj1sxms3SeDrYRxbvG/0Cd1K1l + /wkRje/0/v6+bl2T9iGod42aqV5Am6g2IT2LjlwCIg3ytA0RzROQMqCt3rVqZJACksDaBPz8/EzbwA3E + /NC7Xm2EgOvIJWCbIVgH256AOnK1tQSDmAPaJO9yCAbqRSoP2qcjBOwZJNMKSNJ3JSBDJcLThm3oYNsT + kM9yfJ+eiEPAdeQS0Lv+T7FNQCmHPi3H9ErAxWKxSRLI0NcXAWk3sIzkXatGeiUgiSFRAlIdHx83b29v + 6zT+jW0CknTgs1f/b/AE1G20TCaT5unp6ZuAOnLdLCXolYCIpYOE2kTyWSTT8fHxkfZBl8sc23pgyi1y + A0hPFwJWhifg4eFhkktim4A6ukwwYlkBqR/u7+/TPkFuAIkQsDI8AW3Z6+trM51OiwrYNrSA8l0g5oB7 + ShsBKUMKKyBisg+6XOboUkDq8q5RM70X0IomibTlbFMOXS5z0JNStwyv8PLyktphYUjmWG4AvksIWBme + gAxXlAtsX19fuwLmmldRtzxgwOnpaXo6pz3yq4yGMvaFgHvO4+NjSqYklqTpIGkiHtCzkGB6GoZcHZTn + ntjf3d1t5p92acgLXkDgO3B8n3790FQtIPIxnOnhTQcJbBu5BWSRHPms+G1CHpyow6u7ZqoWkF7PSvfb + yC0gwye9mY2vr6/UG7IP+OzdOOw7Oztz666ZwQko79XptUEit4Dj8fibWEh1cHCQ5oPyAMRnjrWyIirH + enXXTNUCIo03ibfoeSDJRVzKdbCdU0CurYObgHZ4wypl3s1FHfbY2qlaQND/ObYNew5luxaQ3oteTAc3 + j/R+PJlzfekF2WePDwF7QgkB5YHJhsz/ZA1Q5oE25EHEq7tmQsB15BaQJSPedLFzzzbBOZzLMo5Xd82E + gOvILSBcXV2llyPo5dosETEEcyzyca5XZ+0MUkDwfiHxjusaeWmWhyHmefaNGFitVmkf80aWXng/0Kur + DwxWwH2ABygePmQJRri8vOzNv13+ixAwKEoIGBQlBAyKEgIGRQkBg6KEgEFRQsCgKCFgUJBl8wd7cDwC + 0KwnEwAAAABJRU5ErkJggg== + + + + + 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 + qn9B5ijUQQ+RzQAAAABJRU5ErkJggg== + + + + + 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 @@ -975,417 +1386,6 @@ vNQSL7XESy3xUku81BIvtcRLLfFSS7zUEi+1xEst8VJLvNQSL7XESy3xUku81BIvtcRLLfFSS7zUEi+1 xEst8VJLvNQSL7XESy3xUku81BIvtcRLLfFSS7zUEi+1xEst8VJLvNQSL7XES6lft38AgDoeNfgCJIMA AAAASUVORK5CYII= - - - - - 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 - 0KwnEwAAAABJRU5ErkJggg== - - - - - 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 - qn9B5ijUQQ+RzQAAAABJRU5ErkJggg== - - - - - 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 diff --git a/ITC81DB_2/DataStore.cs b/ITC81DB_2/DataStore.cs index 5fd494b..bff66fb 100644 --- a/ITC81DB_2/DataStore.cs +++ b/ITC81DB_2/DataStore.cs @@ -7,239 +7,6 @@ using System.Text; namespace ITC81DB_2 { - public class DataStore - { - #region Enum - public enum EquipmentStatus - { - Stop = 0, - Start = 1, - } - - public enum Line - { - Line1 = 1, - Line2 = 2, - } - - public enum DisplayMode - { - Normal, - Menu, - Calibration, - SystemSetting, - IOTest, - Bypass, - EquipmentTest, - SorterTest, - } - - public enum DisplayStore - { - MainDisplay, - - BasicDataBackup, - BasicDataStatistics, - BasicHelp, - BasicProduct, - BasicTime, - - ConfiCommunication, - ConfiHelp, - ConfiOptionBoard, - ConfiOptionBoard1, - - EquipHelp, - EquipInitialize, - EquipUpdate, - EquipFuctionSetting, - EquipUser, - EquipEngineer, - - InforAS, - InforHelp, - InforSystem, - - SystemAutoZero, - SystemCalibration, - SystemHelp, - SystemIOTest, - SystemJudgmentSetting, - SystemSorterSetting, - } - - public enum FormStore - { - FormNone = 0, - FormMainDisplay, - FormMenu, - } - - public enum MainDisplayStore - { - //DisplayStop, - BarGraph, - LineGraph, - List, - DataStat, - SubMenu, - Feedback, - } - - public enum MenuSide - { - Basic, - Configuration, - System, - Equipment, - Information, - } - - public enum MenuBottomBasic - { - DataBackup, - DataStatistics, - Help, - Product, - Time, - } - - public enum MenuBottomConfiguration - { - Communication, - Help, - OptionBoard, - } - - public enum MenuBottomEquipment - { - FunctionSetting, - Help, - Initialize, - Update, - User, - Engineer, - } - - public enum MenuBottomSystem - { - AutoZero, - Calibration, - Help, - IOTest, - JudgmentSetting, - SorterSetting, - } - - public enum MenuBottomInformation - { - Help, - SystemInformation, - AS, - } - - public enum LanguageID - { - Korean, - English, - Chinese, - Czech, - Russian, - German, - Spanish, - } - - public enum JudgmentStatus - { - Empty, - Under, - Pass, - Over, - Double, - Metal, - ExNg, - } - - public enum WeightStatus - { - Empty, - WeightChange, - WeightZero, - CalNomal, - CalBalans, - CalStandby, - CalFinish, - CalError, - } - - public enum UserGroup - { - None = 0, - Level1Operator, - Level2Engineer, - Level3Manager, - Level4Developer, - LogOff, - } - - public enum ResponseData - { - NAK = 0, - ACK = 1, - } - - public enum UpdateCheck - { - Fail, - Success, - NotUsbMomery, - NotUpdateFolder, - NotFile, - } - - public enum WeightInputMode - { - Weight, - Deviation, - } - - public enum Step2 - { - Step1, - Step2, - } - - public enum Step3 - { - Step1, - Step2, - Step3, - } - - public enum Step4 - { - Step1, - Step2, - Step3, - Step4, - } - - public enum EnumFileUserPassword - { - f0_Level1 = 0, - f1_Level2 = 1, - f2_Level3 = 2, - } - - public enum EnumFileUserGroup - { - f0_Level1 = 0, - f1_Level2 = 1, - f2_Level3 = 2, - } - #endregion - } - #region CommunicationCommand public class CommunicationCommand { @@ -739,7 +506,7 @@ namespace ITC81DB_2 private bool m_IsBypassDirectionPass2; private bool m_IsBypassOnce2; - private DataStore.LanguageID m_Language; + private Define.E_LanguageID m_Language; #endregion #region Constructor @@ -874,7 +641,7 @@ namespace ITC81DB_2 set { this.m_IsBypassOnce2 = value; } } - public DataStore.LanguageID Language + public Define.E_LanguageID Language { get { return this.m_Language; } set { this.m_Language = value; } @@ -911,7 +678,7 @@ namespace ITC81DB_2 this.MainBoardVersion = "000"; this.Unit = "g"; - this.Language = DataStore.LanguageID.Korean; + this.Language = Define.E_LanguageID.Korean; } #endregion } @@ -939,7 +706,7 @@ namespace ITC81DB_2 [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 4)] public string Unit; - public DataStore.LanguageID Language; + public Define.E_LanguageID Language; public bool DummyBool1; public bool DummyBool2; @@ -1284,8 +1051,8 @@ namespace ITC81DB_2 private int m_ExNGCount; private double m_Weight; - private DataStore.JudgmentStatus m_JudgmentStatus; - private DataStore.WeightStatus m_Status; + private Define.E_JudgmentStatus m_JudgmentStatus; + private Define.E_WeightStatus m_Status; private string m_ADCValue; private int m_ProductionSpeed; @@ -1553,36 +1320,36 @@ namespace ITC81DB_2 set { this.m_ADCValue = value; } } - public DataStore.JudgmentStatus JudgmentStatus + public Define.E_JudgmentStatus JudgmentStatus { get { return this.m_JudgmentStatus; } set { this.m_JudgmentStatus = value; - if (value == DataStore.JudgmentStatus.Under) + if (value == Define.E_JudgmentStatus.Under) { if (this.UnderCount < 10000000) this.UnderCount++; else this.UnderCount = 0; } - else if (value == DataStore.JudgmentStatus.Pass) + else if (value == Define.E_JudgmentStatus.Pass) { if (this.PassCount < 10000000) this.PassCount++; else this.PassCount = 0; } - else if (value == DataStore.JudgmentStatus.Over) + else if (value == Define.E_JudgmentStatus.Over) { if (this.OverCount < 10000000) this.OverCount++; else this.OverCount = 0; } - else if (value == DataStore.JudgmentStatus.Double || value == DataStore.JudgmentStatus.Metal - || value == DataStore.JudgmentStatus.ExNg) + else if (value == Define.E_JudgmentStatus.Double || value == Define.E_JudgmentStatus.Metal + || value == Define.E_JudgmentStatus.ExNg) { if (this.ExNGCount < 10000000) this.ExNGCount++; @@ -1592,7 +1359,7 @@ namespace ITC81DB_2 } } - public DataStore.WeightStatus Status + public Define.E_WeightStatus Status { get { return this.m_Status; } set { this.m_Status = value; } @@ -1661,8 +1428,8 @@ namespace ITC81DB_2 this.ExNGCount = 0; this.Weight = 0.0; this.ADCValue = "12345"; - this.JudgmentStatus = DataStore.JudgmentStatus.Empty; - this.Status = DataStore.WeightStatus.Empty; + this.JudgmentStatus = Define.E_JudgmentStatus.Empty; + this.Status = Define.E_WeightStatus.Empty; this.ProductionSpeed = 0; this.WeightString = "0"; @@ -1694,13 +1461,13 @@ namespace ITC81DB_2 } } - public void WeightSum(DataStore.JudgmentStatus status) + public void WeightSum(Define.E_JudgmentStatus status) { - if (status == DataStore.JudgmentStatus.Over) + if (status == Define.E_JudgmentStatus.Over) this.OverSumWeight += this.Weight; - else if (status == DataStore.JudgmentStatus.Pass) + else if (status == Define.E_JudgmentStatus.Pass) this.PassSumWeight += this.Weight; - else if (status == DataStore.JudgmentStatus.Under) + else if (status == Define.E_JudgmentStatus.Under) this.UnderSumWeight += this.Weight; } @@ -3114,10 +2881,10 @@ namespace ITC81DB_2 public class SystemStatus { #region Field - private DataStore.EquipmentStatus m_Equipment; - private DataStore.DisplayStore m_CurrentDisplay; - private DataStore.DisplayMode m_CurrentMode; - private DataStore.WeightInputMode m_CurrentWeightInputMode; + private Define.E_EquipmentStatus m_Equipment; + private Define.E_DisplayStore m_CurrentDisplay; + private Define.E_DisplayMode m_CurrentMode; + private Define.E_WeightInputMode m_CurrentWeightInputMode; private UserPasswordType m_CurrentUserPasswordType; private UserItem m_CurrentUser; @@ -3131,22 +2898,22 @@ namespace ITC81DB_2 #endregion #region Property - public DataStore.EquipmentStatus Equipment + public Define.E_EquipmentStatus Equipment { get { return this.m_Equipment; } set { this.m_Equipment = value; } } - public DataStore.DisplayStore CurrentDisplay + public Define.E_DisplayStore CurrentDisplay { get { return this.m_CurrentDisplay; } set { this.m_CurrentDisplay = value; } } - public DataStore.DisplayMode CurrentMode + public Define.E_DisplayMode CurrentMode { get { return this.m_CurrentMode; } set { this.m_CurrentMode = value; } } - public DataStore.WeightInputMode CurrentWeightInputMode + public Define.E_WeightInputMode CurrentWeightInputMode { get { return this.m_CurrentWeightInputMode; } set { this.m_CurrentWeightInputMode = value; } @@ -3167,16 +2934,16 @@ namespace ITC81DB_2 #region Method public void Initialization() { - this.Equipment = DataStore.EquipmentStatus.Stop; - this.CurrentDisplay = DataStore.DisplayStore.MainDisplay; - this.CurrentMode = DataStore.DisplayMode.Normal; - this.CurrentWeightInputMode = DataStore.WeightInputMode.Weight; + this.Equipment = Define.E_EquipmentStatus.Stop; + this.CurrentDisplay = Define.E_DisplayStore.MainDisplay; + this.CurrentMode = Define.E_DisplayMode.Normal; + this.CurrentWeightInputMode = Define.E_WeightInputMode.Weight; this.CurrentUserPasswordType = new UserPasswordType(); this.CurrentUser = new UserItem(); this.CurrentUser.ID = ""; this.CurrentUser.Password = ""; - this.CurrentUser.Group = DataStore.UserGroup.LogOff; + this.CurrentUser.Group = Define.E_UserGroup.LogOff; } #endregion } @@ -3191,7 +2958,7 @@ namespace ITC81DB_2 private string m_Level3Password; private string m_Level4Password; - private DataStore.UserGroup m_Group; + private Define.E_UserGroup m_Group; #endregion #region Constructor @@ -3223,7 +2990,7 @@ namespace ITC81DB_2 set { this.m_Level4Password = value; } } - public DataStore.UserGroup Group + public Define.E_UserGroup Group { get { return this.m_Group; } set { this.m_Group = value; } @@ -3238,7 +3005,7 @@ namespace ITC81DB_2 this.Level3Password = "3000"; this.Level4Password = "0714"; - this.Group = DataStore.UserGroup.None; + this.Group = Define.E_UserGroup.None; } #endregion } @@ -3307,7 +3074,7 @@ namespace ITC81DB_2 this.DeveloperUser = new UserItem(); this.DeveloperUser.ID = "Intech"; this.DeveloperUser.Password = "20090810"; - this.DeveloperUser.Group = DataStore.UserGroup.Level4Developer; + this.DeveloperUser.Group = Define.E_UserGroup.Level4Developer; } public UserItem FindUser(string id) @@ -3327,7 +3094,7 @@ namespace ITC81DB_2 // 일반 유저 검색 for (int i = 0; i < this.Level1Users.Count; i++) { - if (this.Level1Users[i].Group != DataStore.UserGroup.None) + if (this.Level1Users[i].Group != Define.E_UserGroup.None) { if (this.Level1Users[i].ID.Trim() == id.Trim()) { @@ -3339,7 +3106,7 @@ namespace ITC81DB_2 } } - if (this.Level2Users[i].Group != DataStore.UserGroup.None) + if (this.Level2Users[i].Group != Define.E_UserGroup.None) { if (this.Level2Users[i].ID.Trim() == id.Trim()) { @@ -3351,7 +3118,7 @@ namespace ITC81DB_2 } } - if (this.Level3Users[i].Group != DataStore.UserGroup.None) + if (this.Level3Users[i].Group != Define.E_UserGroup.None) { if (this.Level3Users[i].ID.Trim() == id.Trim()) { @@ -3542,7 +3309,7 @@ namespace ITC81DB_2 #region Field private string m_ID; private string m_Password; - private DataStore.UserGroup m_Group; + private Define.E_UserGroup m_Group; #endregion #region Constructor @@ -3563,7 +3330,7 @@ namespace ITC81DB_2 get { return this.m_Password; } set { this.m_Password = value; } } - public DataStore.UserGroup Group + public Define.E_UserGroup Group { get { return this.m_Group; } set { this.m_Group = value; } @@ -3575,7 +3342,7 @@ namespace ITC81DB_2 { this.ID = "-"; this.Password = "-"; - this.Group = DataStore.UserGroup.None; + this.Group = Define.E_UserGroup.None; } #endregion } @@ -3589,7 +3356,7 @@ namespace ITC81DB_2 [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 20)] public string Password; - public DataStore.UserGroup Group; + public Define.E_UserGroup Group; [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 20)] public string Dummy1; @@ -3646,19 +3413,19 @@ namespace ITC81DB_2 this.Level3 = new UserGroupItem(); } - public bool GetLevel1AccessRight(DataStore.DisplayStore display) + public bool GetLevel1AccessRight(Define.E_DisplayStore display) { bool ret = false; return ret; } - public bool GetLevel2AccessRight(DataStore.DisplayStore display) + public bool GetLevel2AccessRight(Define.E_DisplayStore display) { bool ret = false; return ret; } - public bool GetLevel3AccessRight(DataStore.DisplayStore display) + public bool GetLevel3AccessRight(Define.E_DisplayStore display) { bool ret = false; diff --git a/ITC81DB_2/Define.cs b/ITC81DB_2/Define.cs new file mode 100644 index 0000000..ed9c8b3 --- /dev/null +++ b/ITC81DB_2/Define.cs @@ -0,0 +1,254 @@ +using System; +using System.Linq; +using System.Collections.ObjectModel; +using System.Collections.Generic; +using System.Runtime.InteropServices; +using System.Text; + +namespace ITC81DB_2 +{ + public class Define + { + #region Enum + public enum E_EquipmentStatus + { + Stop = 0, + Start = 1, + } + + public enum Line + { + Line1 = 1, + Line2 = 2, + } + + public enum E_DisplayMode + { + Normal, + Menu, + Calibration, + SystemSetting, + IOTest, + Bypass, + EquipmentTest, + SorterTest, + } + + public enum E_DisplayStore + { + MainDisplay, + + BasicDataBackup, + BasicDataStatistics, + BasicHelp, + BasicProduct, + BasicTime, + + ConfiCommunication, + ConfiHelp, + ConfiOptionBoard, + ConfiOptionBoard1, + ConfiSerial, + + EquipHelp, + EquipInitialize, + EquipUpdate, + EquipFuctionSetting, + EquipUser, + EquipEngineer, + + InforAS, + InforHelp, + InforSystem, + + SystemAutoZero, + SystemCalibration, + SystemHelp, + SystemIOTest, + SystemJudgmentSetting, + SystemSorterSetting, + } + + public enum E_FormStore + { + FormNone = 0, + FormMainDisplay, + FormMenu, + } + + public enum E_MainDisplayStore + { + //DisplayStop, + BarGraph, + LineGraph, + List, + DataStat, + SubMenu, + Feedback, + } + + public enum E_MenuSide + { + Basic, + Configuration, + System, + Equipment, + Information, + } + + public enum E_MenuBottomBasic + { + DataBackup, + DataStatistics, + Help, + Product, + Time, + } + + public enum E_MenuBottomConfiguration + { + Communication, + Help, + OptionBoard, + SerialCOM1, + SerialCOM3, + SerialCOM4, + } + + public enum E_MenuBottomEquipment + { + FunctionSetting, + Help, + Initialize, + Update, + User, + Engineer, + } + + public enum E_MenuBottomSystem + { + AutoZero, + Calibration, + Help, + IOTest, + JudgmentSetting, + SorterSetting, + } + + public enum E_MenuBottomInformation + { + Help, + SystemInformation, + AS, + } + + public enum E_LanguageID + { + Korean, + English, + Chinese, + Czech, + Russian, + German, + Spanish, + } + + public enum E_JudgmentStatus + { + Empty, + Under, + Pass, + Over, + Double, + Metal, + ExNg, + } + + public enum E_WeightStatus + { + Empty, + WeightChange, + WeightZero, + CalNomal, + CalBalans, + CalStandby, + CalFinish, + CalError, + } + + public enum E_UserGroup + { + None = 0, + Level1Operator, + Level2Engineer, + Level3Manager, + Level4Developer, + LogOff, + } + + public enum E_ResponseData + { + NAK = 0, + ACK = 1, + } + + public enum E_UpdateCheck + { + Fail, + Success, + NotUsbMomery, + NotUpdateFolder, + NotFile, + } + + public enum E_WeightInputMode + { + Weight, + Deviation, + } + + public enum E_Step2 + { + Step1, + Step2, + } + + public enum E_Step3 + { + Step1, + Step2, + Step3, + } + + public enum E_Step4 + { + Step1, + Step2, + Step3, + Step4, + } + + public enum E_SeparateType + { + STXANDETX, + ETXONLY, + NONEFRAME_READTIMEOUT, + STXONLY, + } + + public enum E_EnumFileUserPassword + { + f0_Level1 = 0, + f1_Level2 = 1, + f2_Level3 = 2, + } + + public enum E_EnumFileUserGroup + { + f0_Level1 = 0, + f1_Level2 = 1, + f2_Level3 = 2, + } + #endregion + } +} diff --git a/ITC81DB_2/DialogForms/DialogFormLogOn.cs b/ITC81DB_2/DialogForms/DialogFormLogOn.cs index f75b3d8..24f6b45 100644 --- a/ITC81DB_2/DialogForms/DialogFormLogOn.cs +++ b/ITC81DB_2/DialogForms/DialogFormLogOn.cs @@ -19,7 +19,7 @@ namespace ITC81DB_2.DialogForms #endregion #region Constructor - public DialogFormLogOn(FormMain parent, DataStore.LanguageID language) + public DialogFormLogOn(FormMain parent, Define.E_LanguageID language) { InitializeComponent(); @@ -39,11 +39,11 @@ namespace ITC81DB_2.DialogForms #endregion #region Method - public void InitializeDesign(DataStore.LanguageID language) + public void InitializeDesign(Define.E_LanguageID language) { Class1 images = new Class1(); - if (language == DataStore.LanguageID.English) + if (language == Define.E_LanguageID.English) { this.labelTitleLogin.Text = "Login"; this.labelTitleID.Text = "ID"; @@ -56,7 +56,7 @@ namespace ITC81DB_2.DialogForms this.buttonLogon.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainLoginDown)); this.buttonLogon.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainLoginUp)); } - else if (language == DataStore.LanguageID.Chinese) + else if (language == Define.E_LanguageID.Chinese) { this.labelTitleLogin.Text = "登錄"; this.labelTitleID.Text = "用户名"; @@ -69,10 +69,10 @@ namespace ITC81DB_2.DialogForms this.buttonLogon.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnMainLoginLoginDown)); this.buttonLogon.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnMainLoginLoginUp)); } - else if (language == DataStore.LanguageID.Czech) + else if (language == Define.E_LanguageID.Czech) { } - else if (language == DataStore.LanguageID.Spanish) + else if (language == Define.E_LanguageID.Spanish) { this.labelTitleLogin.Text = "Acceso"; this.labelTitleID.Text = "ID"; diff --git a/ITC81DB_2/DialogForms/DialogFormMessage.cs b/ITC81DB_2/DialogForms/DialogFormMessage.cs index 12d76fd..3bbd166 100644 --- a/ITC81DB_2/DialogForms/DialogFormMessage.cs +++ b/ITC81DB_2/DialogForms/DialogFormMessage.cs @@ -20,7 +20,7 @@ namespace ITC81DB_2.DialogForms { InitializeComponent(); } - public DialogFormMessage(string str, DataStore.LanguageID language) + public DialogFormMessage(string str, Define.E_LanguageID language) { InitializeComponent(); @@ -28,25 +28,25 @@ namespace ITC81DB_2.DialogForms this.labelMessage1.Text = ""; this.labelMessage2.Text = ""; - if (language == DataStore.LanguageID.Korean) + if (language == Define.E_LanguageID.Korean) { this.labelErrorCode.Text = "Notice"; this.labelMessage1.Text = str + "개의 파일이 백업되었습니다."; this.labelMessage2.Text = ""; } - else if (language == DataStore.LanguageID.English) + else if (language == Define.E_LanguageID.English) { this.labelErrorCode.Text = "Notice"; this.labelMessage1.Text = str + " files are backed up"; this.labelMessage2.Text = ""; } - else if (language == DataStore.LanguageID.Chinese) + else if (language == Define.E_LanguageID.Chinese) { this.labelErrorCode.Text = "注意"; this.labelMessage1.Text = "备份" + str + "个文件"; this.labelMessage2.Text = ""; } - else if (language == DataStore.LanguageID.Spanish) + else if (language == Define.E_LanguageID.Spanish) { this.labelErrorCode.Text = "Darse cuenta"; this.labelMessage1.Text = str + " archivos están respaldados"; @@ -57,7 +57,7 @@ namespace ITC81DB_2.DialogForms } } - public DialogFormMessage(int code, DataStore.LanguageID language) + public DialogFormMessage(int code, Define.E_LanguageID language) { InitializeComponent(); @@ -65,7 +65,7 @@ namespace ITC81DB_2.DialogForms this.labelMessage1.Text = ""; this.labelMessage2.Text = ""; - if (language == DataStore.LanguageID.Korean) + if (language == Define.E_LanguageID.Korean) { this.buttonOK.Text = "OK"; @@ -231,7 +231,7 @@ namespace ITC81DB_2.DialogForms } #endregion } - else if (language == DataStore.LanguageID.English) + else if (language == Define.E_LanguageID.English) { this.buttonOK.Text = "OK"; @@ -396,7 +396,7 @@ namespace ITC81DB_2.DialogForms } #endregion } - else if (language == DataStore.LanguageID.Chinese) + else if (language == Define.E_LanguageID.Chinese) { this.buttonOK.Text = "确认"; @@ -562,7 +562,7 @@ namespace ITC81DB_2.DialogForms } #endregion } - else if (language == DataStore.LanguageID.Spanish) + else if (language == Define.E_LanguageID.Spanish) { #region 스페인어 switch (code) @@ -730,7 +730,7 @@ namespace ITC81DB_2.DialogForms } } - public DialogFormMessage(int code, DataStore.LanguageID language, string message) + public DialogFormMessage(int code, Define.E_LanguageID language, string message) { InitializeComponent(); @@ -740,7 +740,7 @@ namespace ITC81DB_2.DialogForms switch (language) { - case DataStore.LanguageID.Korean: + case Define.E_LanguageID.Korean: #region Korean switch (code) { @@ -754,7 +754,7 @@ namespace ITC81DB_2.DialogForms } #endregion break; - case DataStore.LanguageID.English: + case Define.E_LanguageID.English: #region English switch (code) { @@ -768,7 +768,7 @@ namespace ITC81DB_2.DialogForms } #endregion break; - case DataStore.LanguageID.Chinese: + case Define.E_LanguageID.Chinese: #region Chinese switch (code) { @@ -782,7 +782,7 @@ namespace ITC81DB_2.DialogForms } #endregion break; - case DataStore.LanguageID.Spanish: + case Define.E_LanguageID.Spanish: #region Spanish switch (code) { diff --git a/ITC81DB_2/DialogForms/DialogFormNumKeyPad.cs b/ITC81DB_2/DialogForms/DialogFormNumKeyPad.cs index fdb9b39..38b2269 100644 --- a/ITC81DB_2/DialogForms/DialogFormNumKeyPad.cs +++ b/ITC81DB_2/DialogForms/DialogFormNumKeyPad.cs @@ -25,7 +25,7 @@ namespace ITC81DB_2.DialogForms #endregion #region Constructor - public DialogFormNumKeyPad(string value, int dig, int decimalPlaces, bool isSignEnable, DataStore.LanguageID language) + public DialogFormNumKeyPad(string value, int dig, int decimalPlaces, bool isSignEnable, Define.E_LanguageID language) { InitializeComponent(); @@ -89,21 +89,21 @@ namespace ITC81DB_2.DialogForms #endregion #region Method - private void InitializeDesign(DataStore.LanguageID language) + private void InitializeDesign(Define.E_LanguageID language) { Class1 images = new Class1(); - if (language == DataStore.LanguageID.English) + if (language == Define.E_LanguageID.English) { this.buttonEnter.Text = "Enter"; this.buttonCancel.Text = "Esc"; } - else if (language == DataStore.LanguageID.Chinese) + else if (language == Define.E_LanguageID.Chinese) { this.buttonEnter.Text = "确认"; this.buttonCancel.Text = "X"; } - else if (language == DataStore.LanguageID.Spanish) + else if (language == Define.E_LanguageID.Spanish) { this.buttonEnter.Text = "Entrar"; this.buttonCancel.Text = "X"; diff --git a/ITC81DB_2/DialogForms/DialogFormPasswordKeyPad.cs b/ITC81DB_2/DialogForms/DialogFormPasswordKeyPad.cs index f557940..eaf0f31 100644 --- a/ITC81DB_2/DialogForms/DialogFormPasswordKeyPad.cs +++ b/ITC81DB_2/DialogForms/DialogFormPasswordKeyPad.cs @@ -24,7 +24,7 @@ namespace ITC81DB_2.DialogForms private int m_Digit; private int m_DecPoint; - private DataStore.UserGroup m_Group; + private Define.E_UserGroup m_Group; #endregion #region Property @@ -65,7 +65,7 @@ namespace ITC81DB_2.DialogForms set { this.m_DecPoint = value; } } - public DataStore.UserGroup Group + public Define.E_UserGroup Group { get { return this.m_Group; } set { this.m_Group = value; } @@ -73,7 +73,7 @@ namespace ITC81DB_2.DialogForms #endregion #region Constructor - public DialogFormPasswordKeyPad(DataStore.LanguageID language, UserPasswordType user) + public DialogFormPasswordKeyPad(Define.E_LanguageID language, UserPasswordType user) { InitializeComponent(); @@ -101,20 +101,20 @@ namespace ITC81DB_2.DialogForms } } - private void InitializeDesign(DataStore.LanguageID language) + private void InitializeDesign(Define.E_LanguageID language) { Class1 images = new Class1(); - if (language == DataStore.LanguageID.English) + if (language == Define.E_LanguageID.English) { } - else if (language == DataStore.LanguageID.Chinese) + else if (language == Define.E_LanguageID.Chinese) { } - else if (language == DataStore.LanguageID.Czech) + else if (language == Define.E_LanguageID.Czech) { } - else if (language == DataStore.LanguageID.Spanish) + else if (language == Define.E_LanguageID.Spanish) { } else @@ -152,22 +152,22 @@ namespace ITC81DB_2.DialogForms if (this.InputKey == this.PasswordDeveloper) { this.DialogResult = DialogResult.OK; - this.Group = DataStore.UserGroup.Level4Developer; + this.Group = Define.E_UserGroup.Level4Developer; } else if (this.InputKey == this.PasswordManager) { this.DialogResult = DialogResult.OK; - this.Group = DataStore.UserGroup.Level3Manager; + this.Group = Define.E_UserGroup.Level3Manager; } else if (this.InputKey == this.PasswordEngineer) { this.DialogResult = DialogResult.OK; - this.Group = DataStore.UserGroup.Level2Engineer; + this.Group = Define.E_UserGroup.Level2Engineer; } else if (this.InputKey == this.PasswordOperator) { this.DialogResult = DialogResult.OK; - this.Group = DataStore.UserGroup.Level1Operator; + this.Group = Define.E_UserGroup.Level1Operator; } } diff --git a/ITC81DB_2/DialogForms/DialogFormPasswordKeyPad1.cs b/ITC81DB_2/DialogForms/DialogFormPasswordKeyPad1.cs index 7eb43c9..de8a4fa 100644 --- a/ITC81DB_2/DialogForms/DialogFormPasswordKeyPad1.cs +++ b/ITC81DB_2/DialogForms/DialogFormPasswordKeyPad1.cs @@ -27,7 +27,7 @@ namespace ITC81DB_2.DialogForms #endregion #region Constructor - public DialogFormPasswordKeyPad1(DataStore.LanguageID language) + public DialogFormPasswordKeyPad1(Define.E_LanguageID language) { InitializeComponent(); @@ -50,20 +50,20 @@ namespace ITC81DB_2.DialogForms } } - private void InitializeDesign(DataStore.LanguageID language) + private void InitializeDesign(Define.E_LanguageID language) { Class1 images = new Class1(); - if (language == DataStore.LanguageID.English) + if (language == Define.E_LanguageID.English) { } - else if (language == DataStore.LanguageID.Chinese) + else if (language == Define.E_LanguageID.Chinese) { } - else if (language == DataStore.LanguageID.Czech) + else if (language == Define.E_LanguageID.Czech) { } - else if (language == DataStore.LanguageID.Spanish) + else if (language == Define.E_LanguageID.Spanish) { } else diff --git a/ITC81DB_2/DialogForms/DialogFormYesNo.cs b/ITC81DB_2/DialogForms/DialogFormYesNo.cs index 80dc78d..4e61d1a 100644 --- a/ITC81DB_2/DialogForms/DialogFormYesNo.cs +++ b/ITC81DB_2/DialogForms/DialogFormYesNo.cs @@ -21,11 +21,11 @@ namespace ITC81DB_2.DialogForms InitializeComponent(); } - public DialogFormYesNo(DataStore.LanguageID language, int ok) + public DialogFormYesNo(Define.E_LanguageID language, int ok) { InitializeComponent(); - if (language == DataStore.LanguageID.Korean) + if (language == Define.E_LanguageID.Korean) { this.buttonYes.Text = "Yes"; this.buttonNo.Text = "No"; @@ -145,12 +145,27 @@ namespace ITC81DB_2.DialogForms this.labelMessage1.Text = "해당 값을 기준값으로 설정하시겠습니까?"; this.labelMessage2.Text = ""; break; + case 28: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "파일을 삭제하시겠습니까?"; + this.labelMessage2.Text = ""; + break; + case 29: + this.labelErrorCode.Text = "Login"; + this.labelMessage1.Text = "비밀번호를 초기화 하시겠습니까?"; + this.labelMessage2.Text = ""; + break; + case 30: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "현재 장비 타입을 변경하시겠습니까?"; + this.labelMessage2.Text = "재부팅이 필요합니다."; + break; default: break; } #endregion } - else if (language == DataStore.LanguageID.English) + else if (language == Define.E_LanguageID.English) { this.buttonYes.Text = "Yes"; this.buttonNo.Text = "No"; @@ -270,12 +285,27 @@ namespace ITC81DB_2.DialogForms this.labelMessage1.Text = "Do you want to set that value as the 'Pass' value?"; this.labelMessage2.Text = ""; break; + case 28: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "Are you sure you want to delete the file?"; + this.labelMessage2.Text = ""; + break; + case 29: + this.labelErrorCode.Text = "Login"; + this.labelMessage1.Text = "Do you want to reset your password?"; + this.labelMessage2.Text = ""; + break; + case 30: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "Would you like to change the current equipment type?"; + this.labelMessage2.Text = "A reboot is required."; + break; default: break; } #endregion } - else if (language == DataStore.LanguageID.Chinese) + else if (language == Define.E_LanguageID.Chinese) { this.buttonYes.Text = "是"; this.buttonNo.Text = "否"; @@ -395,12 +425,309 @@ namespace ITC81DB_2.DialogForms this.labelMessage1.Text = "您想将该值设置为“通过”值吗?"; this.labelMessage2.Text = ""; break; + case 28: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "您确定要删除该文件吗?"; + this.labelMessage2.Text = ""; + break; + case 29: + this.labelErrorCode.Text = "登录"; + this.labelMessage1.Text = "您想重置密码吗?"; + this.labelMessage2.Text = ""; + break; + case 30: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "您想更改当前的设备类型吗?"; + this.labelMessage2.Text = "需要重新启动。"; + break; default: break; } #endregion } - else if (language == DataStore.LanguageID.Spanish) + else if (language == Define.E_LanguageID.Russian) + { + this.buttonYes.Text = "Да"; + this.buttonNo.Text = "Нет"; + + #region 러시아어 + switch (ok) + { + case 1: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "Хотите вернуть оригинальную DLL?"; + break; + case 2: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "Хотите изменить язык?"; + break; + case 3: + this.labelErrorCode.Text = "Обновить"; + this.labelMessage1.Text = "Программа будет обновлена"; + break; + case 4: + this.labelErrorCode.Text = "스타일러스"; + this.labelMessage1.Text = "화면 보정을 실행하시겠습니까?"; + break; + case 5: + this.labelErrorCode.Text = "Инициализация"; + this.labelMessage1.Text = "Все данные будут инициализированы"; + break; + case 6: + this.labelErrorCode.Text = "LCD инициализация"; + this.labelMessage1.Text = "Все данные в LCD будут инициализированы"; + break; + case 7: + this.labelErrorCode.Text = "Инициализация главной платы"; + this.labelMessage1.Text = "Все данные главной платы будут инициализированы"; + break; + case 8: + this.labelErrorCode.Text = "Сброс"; + this.labelMessage1.Text = "Очистить текущие данные?"; + break; + case 9: + this.labelErrorCode.Text = "Загрузка"; + this.labelMessage1.Text = "Загрузить текущее значение?"; + break; + case 10: + this.labelErrorCode.Text = "Загрузка"; + this.labelMessage1.Text = "Загрузить новый данные мотора?"; + break; + case 11: + this.labelErrorCode.Text = "Загрузка"; + this.labelMessage1.Text = "Хотите изменить текущий номер строки?"; + break; + case 12: + this.labelErrorCode.Text = "Логин"; + this.labelMessage1.Text = "Выйти?"; + break; + case 13: + this.labelErrorCode.Text = "Логин"; + this.labelMessage1.Text = "Зарегестрировать пользователя?"; + break; + case 14: + this.labelErrorCode.Text = "Логин"; + this.labelMessage1.Text = "Удалить пользователя?"; + break; + case 15: + this.labelErrorCode.Text = "Логин"; + this.labelMessage1.Text = "Использовать функцию входа?"; + break; + case 16: + this.labelErrorCode.Text = "Логин"; + this.labelMessage1.Text = "Отменить функцию входа?"; + break; + case 17: + this.labelErrorCode.Text = "Штрих-код"; + this.labelMessage1.Text = "Использовать функцию штрих-кода?"; + break; + case 18: + this.labelErrorCode.Text = "Штрих-код"; + this.labelMessage1.Text = "Отменить функцию штрих-кода?"; + break; + case 19: + this.labelErrorCode.Text = "Сброс"; + this.labelMessage1.Text = "Очистить все данные?"; + break; + case 20: + this.labelErrorCode.Text = "Инициализация"; + this.labelMessage1.Text = "Очистить данные счетчика?"; + break; + case 21: + this.labelErrorCode.Text = "Локальная сеть"; + this.labelMessage1.Text = "Установить локальный IP-адрес вручную?"; + break; + case 22: + this.labelErrorCode.Text = "Локальная сеть"; + this.labelMessage1.Text = "Установить локальный IP-адрес для DHCP?"; + break; + case 23: + this.labelErrorCode.Text = "Возврат"; + this.labelMessage1.Text = "Сделать резервную копию текущих данных?"; + break; + case 24: + this.labelErrorCode.Text = "Случайный режим"; + this.labelMessage1.Text = "Изменение десятичной точки сбрасывает настройки "; + this.labelMessage2.Text = "случайного режима. Изменить десятичную точку?"; + break; + case 25: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "Вы будете использовать функции?"; + this.labelMessage2.Text = ""; + break; + case 26: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "Отменить функцию? Связанные элементы будут"; + this.labelMessage2.Text = "переведены в состояние инициализации."; + break; + case 27: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "Вы хотите установить это значение как"; + this.labelMessage2.Text = "«Норма» значение?"; + break; + case 28: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "Вы уверены, что хотите удалить файл?"; + this.labelMessage2.Text = ""; + break; + case 29: + this.labelErrorCode.Text = "Логин"; + this.labelMessage1.Text = "Вы хотите сбросить свой пароль?"; + this.labelMessage2.Text = ""; + break; + case 30: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "Хотите изменить текущий тип оборудования?"; + this.labelMessage2.Text = "Требуется перезагрузка."; + break; + default: + break; + } + #endregion + } + else if (language == Define.E_LanguageID.German) + { + this.buttonYes.Text = "Ja"; + this.buttonNo.Text = "Nein"; + + #region 독일어 + switch (ok) + { + case 1: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "Möchten Sie die ursprüngliche"; + this.labelMessage2.Text = "DDL-Bibliothek wirklich zurückgeben?"; + break; + case 2: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "Möchten Sie die Sprache wirklich ändern?"; + break; + case 3: + this.labelErrorCode.Text = "Aktualisierung"; + this.labelMessage1.Text = "Programm wird aktualisiert"; + break; + case 4: + this.labelErrorCode.Text = "스타일러스"; + this.labelMessage1.Text = "화면 보정을 실행하시겠습니까?"; + break; + case 5: + this.labelErrorCode.Text = "Werkseinstellung"; + this.labelMessage1.Text = "Alle Daten werden initialisiert"; + break; + case 6: + this.labelErrorCode.Text = "LCD-Initialisierung"; + this.labelMessage1.Text = "Alle LCD-Daten werden initialisiert"; + break; + case 7: + this.labelErrorCode.Text = "Mainboard-Initialisierung"; + this.labelMessage1.Text = "Alle Daten auf der Hauptplatine werden initialisiert"; + break; + case 8: + this.labelErrorCode.Text = "Löschen"; + this.labelMessage1.Text = "Möchten Sie die aktuellen"; + this.labelMessage2.Text = "Teilenummern-Daten wirklich löschen?"; + break; + case 9: + this.labelErrorCode.Text = "Motor Download"; + this.labelMessage1.Text = "Möchten Sie den aktuellen Wert wirklich herunterladen?"; + break; + case 10: + this.labelErrorCode.Text = "Motor Download"; + this.labelMessage1.Text = "Möchten Sie wirklich einen neuen Motor herunterladen?"; + break; + case 11: + this.labelErrorCode.Text = "Motor Download"; + this.labelMessage1.Text = "Möchten Sie die aktuelle Zeilennummer wirklich ändern?"; + break; + case 12: + this.labelErrorCode.Text = "Einloggen"; + this.labelMessage1.Text = "Möchten Sie sich abmelden?"; + break; + case 13: + this.labelErrorCode.Text = "Einloggen"; + this.labelMessage1.Text = "Möchten Sie den Benutzer registrieren?"; + break; + case 14: + this.labelErrorCode.Text = "Einloggen"; + this.labelMessage1.Text = "Möchten Sie diesen Benutzer wirklich löschen?"; + break; + case 15: + this.labelErrorCode.Text = "Einloggen"; + this.labelMessage1.Text = "Möchten Sie die Anmeldefunktion wirklich aktivieren?"; + break; + case 16: + this.labelErrorCode.Text = "Einloggen"; + this.labelMessage1.Text = "Möchten Sie die Anmeldefunktion wirklich deaktivieren?"; + break; + case 17: + this.labelErrorCode.Text = "Barcode"; + this.labelMessage1.Text = "Möchten Sie die Barcode-Funktion wirklich aktivieren?"; + break; + case 18: + this.labelErrorCode.Text = "Barcode"; + this.labelMessage1.Text = "Möchten Sie die Barcode-Funktion wirklich deaktivieren?"; + break; + case 19: + this.labelErrorCode.Text = "Löschen"; + this.labelMessage1.Text = "Möchten Sie wirklich alle Teilenummernzahlen löschen?"; + break; + case 20: + this.labelErrorCode.Text = "Initialisieren"; + this.labelMessage1.Text = "Alarmzählerdaten initialisieren?"; + break; + case 21: + this.labelErrorCode.Text = "Ethernet"; + this.labelMessage1.Text = "Möchten Sie die lokale IP-Adresse statisch festlegen?"; + break; + case 22: + this.labelErrorCode.Text = "Ethernet"; + this.labelMessage1.Text = "Möchten Sie die lokale IP-Adresse auf DHCP setzen?"; + break; + case 23: + this.labelErrorCode.Text = "Sicherung"; + this.labelMessage1.Text = "Möchten Sie Ihre aktuellen Daten sichern?"; + break; + case 24: + this.labelErrorCode.Text = "Initialisieren Sie die Zufallsmoduseinstellung"; + this.labelMessage1.Text = "Wenn der Dezimalpunkt geändert wird, wird der"; + this.labelMessage2.Text = "Zufallsmoduseinstellung initialisiert. Willst du es ändern?"; + break; + case 25: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "Möchten Sie die funktion wirklich aktivieren?"; + this.labelMessage2.Text = ""; + break; + case 26: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "Möchten Sie die funktion wirklich deaktivieren?"; + this.labelMessage2.Text = "Verwandte Elemente werden in den Initialisierungsstatus geändert."; + break; + case 27: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "Möchten Sie diesen Wert als 'Bestehen'-Wert festlegen?"; + this.labelMessage2.Text = ""; + break; + case 28: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "Möchten Sie die Datei wirklich löschen?"; + this.labelMessage2.Text = ""; + break; + case 29: + this.labelErrorCode.Text = "Einloggen"; + this.labelMessage1.Text = "Möchten Sie Ihr Passwort zurücksetzen?"; + this.labelMessage2.Text = ""; + break; + case 30: + this.labelErrorCode.Text = ""; + this.labelMessage1.Text = "Möchten Sie Ihren aktuellen Gerätetyp ändern?"; + this.labelMessage2.Text = "Ein Neustart ist erforderlich."; + break; + default: + break; + } + #endregion + } + else if (language == Define.E_LanguageID.Spanish) { this.buttonYes.Text = "Sí"; this.buttonNo.Text = "No"; @@ -527,257 +854,20 @@ namespace ITC81DB_2.DialogForms this.labelMessage1.Text = "¿Desea establecer ese valor como el valor de referencia?"; this.labelMessage2.Text = ""; break; - default: - break; - } - #endregion - } - else if (language == DataStore.LanguageID.Russian) - { - this.buttonYes.Text = "Да"; - this.buttonNo.Text = "Нет"; - - #region 러시아어 - switch (ok) - { - case 1: + case 28: this.labelErrorCode.Text = ""; - this.labelMessage1.Text = "Хотите вернуть оригинальную DLL?"; - break; - case 2: - this.labelErrorCode.Text = ""; - this.labelMessage1.Text = "Хотите изменить язык?"; - break; - case 3: - this.labelErrorCode.Text = "Обновить"; - this.labelMessage1.Text = "Программа будет обновлена"; - break; - case 4: - this.labelErrorCode.Text = "스타일러스"; - this.labelMessage1.Text = "화면 보정을 실행하시겠습니까?"; - break; - case 5: - this.labelErrorCode.Text = "Инициализация"; - this.labelMessage1.Text = "Все данные будут инициализированы"; - break; - case 6: - this.labelErrorCode.Text = "LCD инициализация"; - this.labelMessage1.Text = "Все данные в LCD будут инициализированы"; - break; - case 7: - this.labelErrorCode.Text = "Инициализация главной платы"; - this.labelMessage1.Text = "Все данные главной платы будут инициализированы"; - break; - case 8: - this.labelErrorCode.Text = "Сброс"; - this.labelMessage1.Text = "Очистить текущие данные?"; - break; - case 9: - this.labelErrorCode.Text = "Загрузка"; - this.labelMessage1.Text = "Загрузить текущее значение?"; - break; - case 10: - this.labelErrorCode.Text = "Загрузка"; - this.labelMessage1.Text = "Загрузить новый данные мотора?"; - break; - case 11: - this.labelErrorCode.Text = "Загрузка"; - this.labelMessage1.Text = "Хотите изменить текущий номер строки?"; - break; - case 12: - this.labelErrorCode.Text = "Логин"; - this.labelMessage1.Text = "Выйти?"; - break; - case 13: - this.labelErrorCode.Text = "Логин"; - this.labelMessage1.Text = "Зарегестрировать пользователя?"; - break; - case 14: - this.labelErrorCode.Text = "Логин"; - this.labelMessage1.Text = "Удалить пользователя?"; - break; - case 15: - this.labelErrorCode.Text = "Логин"; - this.labelMessage1.Text = "Использовать функцию входа?"; - break; - case 16: - this.labelErrorCode.Text = "Логин"; - this.labelMessage1.Text = "Отменить функцию входа?"; - break; - case 17: - this.labelErrorCode.Text = "Штрих-код"; - this.labelMessage1.Text = "Использовать функцию штрих-кода?"; - break; - case 18: - this.labelErrorCode.Text = "Штрих-код"; - this.labelMessage1.Text = "Отменить функцию штрих-кода?"; - break; - case 19: - this.labelErrorCode.Text = "Сброс"; - this.labelMessage1.Text = "Очистить все данные?"; - break; - case 20: - this.labelErrorCode.Text = "Инициализация"; - this.labelMessage1.Text = "Очистить данные счетчика?"; - break; - case 21: - this.labelErrorCode.Text = "Локальная сеть"; - this.labelMessage1.Text = "Установить локальный IP-адрес вручную?"; - break; - case 22: - this.labelErrorCode.Text = "Локальная сеть"; - this.labelMessage1.Text = "Установить локальный IP-адрес для DHCP?"; - break; - case 23: - this.labelErrorCode.Text = "Возврат"; - this.labelMessage1.Text = "Сделать резервную копию текущих данных?"; - break; - case 24: - this.labelErrorCode.Text = "Случайный режим"; - this.labelMessage1.Text = "Изменение десятичной точки сбрасывает настройки "; - this.labelMessage2.Text = "случайного режима. Изменить десятичную точку?"; - break; - case 25: - this.labelErrorCode.Text = ""; - this.labelMessage1.Text = "Вы будете использовать функции?"; + this.labelMessage1.Text = "¿Estás seguro de que quieres eliminar el archivo?"; this.labelMessage2.Text = ""; break; - case 26: - this.labelErrorCode.Text = ""; - this.labelMessage1.Text = "Отменить функцию? Связанные элементы будут"; - this.labelMessage2.Text = "переведены в состояние инициализации."; - break; - case 27: - this.labelErrorCode.Text = ""; - this.labelMessage1.Text = "Вы хотите установить это значение как"; - this.labelMessage2.Text = "«Норма» значение?"; - break; - default: - break; - } - #endregion - } - else if (language == DataStore.LanguageID.German) - { - this.buttonYes.Text = "Ja"; - this.buttonNo.Text = "Nein"; - - #region 독일어 - switch (ok) - { - case 1: - this.labelErrorCode.Text = ""; - this.labelMessage1.Text = "Möchten Sie die ursprüngliche"; - this.labelMessage2.Text = "DDL-Bibliothek wirklich zurückgeben?"; - break; - case 2: - this.labelErrorCode.Text = ""; - this.labelMessage1.Text = "Möchten Sie die Sprache wirklich ändern?"; - break; - case 3: - this.labelErrorCode.Text = "Aktualisierung"; - this.labelMessage1.Text = "Programm wird aktualisiert"; - break; - case 4: - this.labelErrorCode.Text = "스타일러스"; - this.labelMessage1.Text = "화면 보정을 실행하시겠습니까?"; - break; - case 5: - this.labelErrorCode.Text = "Werkseinstellung"; - this.labelMessage1.Text = "Alle Daten werden initialisiert"; - break; - case 6: - this.labelErrorCode.Text = "LCD-Initialisierung"; - this.labelMessage1.Text = "Alle LCD-Daten werden initialisiert"; - break; - case 7: - this.labelErrorCode.Text = "Mainboard-Initialisierung"; - this.labelMessage1.Text = "Alle Daten auf der Hauptplatine werden initialisiert"; - break; - case 8: - this.labelErrorCode.Text = "Löschen"; - this.labelMessage1.Text = "Möchten Sie die aktuellen"; - this.labelMessage2.Text = "Teilenummern-Daten wirklich löschen?"; - break; - case 9: - this.labelErrorCode.Text = "Motor Download"; - this.labelMessage1.Text = "Möchten Sie den aktuellen Wert wirklich herunterladen?"; - break; - case 10: - this.labelErrorCode.Text = "Motor Download"; - this.labelMessage1.Text = "Möchten Sie wirklich einen neuen Motor herunterladen?"; - break; - case 11: - this.labelErrorCode.Text = "Motor Download"; - this.labelMessage1.Text = "Möchten Sie die aktuelle Zeilennummer wirklich ändern?"; - break; - case 12: - this.labelErrorCode.Text = "Einloggen"; - this.labelMessage1.Text = "Möchten Sie sich abmelden?"; - break; - case 13: - this.labelErrorCode.Text = "Einloggen"; - this.labelMessage1.Text = "Möchten Sie den Benutzer registrieren?"; - break; - case 14: - this.labelErrorCode.Text = "Einloggen"; - this.labelMessage1.Text = "Möchten Sie diesen Benutzer wirklich löschen?"; - break; - case 15: - this.labelErrorCode.Text = "Einloggen"; - this.labelMessage1.Text = "Möchten Sie die Anmeldefunktion wirklich aktivieren?"; - break; - case 16: - this.labelErrorCode.Text = "Einloggen"; - this.labelMessage1.Text = "Möchten Sie die Anmeldefunktion wirklich deaktivieren?"; - break; - case 17: - this.labelErrorCode.Text = "Barcode"; - this.labelMessage1.Text = "Möchten Sie die Barcode-Funktion wirklich aktivieren?"; - break; - case 18: - this.labelErrorCode.Text = "Barcode"; - this.labelMessage1.Text = "Möchten Sie die Barcode-Funktion wirklich deaktivieren?"; - break; - case 19: - this.labelErrorCode.Text = "Löschen"; - this.labelMessage1.Text = "Möchten Sie wirklich alle Teilenummernzahlen löschen?"; - break; - case 20: - this.labelErrorCode.Text = "Initialisieren"; - this.labelMessage1.Text = "Alarmzählerdaten initialisieren?"; - break; - case 21: - this.labelErrorCode.Text = "Ethernet"; - this.labelMessage1.Text = "Möchten Sie die lokale IP-Adresse statisch festlegen?"; - break; - case 22: - this.labelErrorCode.Text = "Ethernet"; - this.labelMessage1.Text = "Möchten Sie die lokale IP-Adresse auf DHCP setzen?"; - break; - case 23: - this.labelErrorCode.Text = "Sicherung"; - this.labelMessage1.Text = "Möchten Sie Ihre aktuellen Daten sichern?"; - break; - case 24: - this.labelErrorCode.Text = "Initialisieren Sie die Zufallsmoduseinstellung"; - this.labelMessage1.Text = "Wenn der Dezimalpunkt geändert wird, wird der"; - this.labelMessage2.Text = "Zufallsmoduseinstellung initialisiert. Willst du es ändern?"; - break; - case 25: - this.labelErrorCode.Text = ""; - this.labelMessage1.Text = "Möchten Sie die funktion wirklich aktivieren?"; + case 29: + this.labelErrorCode.Text = "Acceso"; + this.labelMessage1.Text = "¿Quieres restablecer tu contraseña?"; this.labelMessage2.Text = ""; break; - case 26: + case 30: this.labelErrorCode.Text = ""; - this.labelMessage1.Text = "Möchten Sie die funktion wirklich deaktivieren?"; - this.labelMessage2.Text = "Verwandte Elemente werden in den Initialisierungsstatus geändert."; - break; - case 27: - this.labelErrorCode.Text = ""; - this.labelMessage1.Text = "Möchten Sie diesen Wert als 'Bestehen'-Wert festlegen?"; - this.labelMessage2.Text = ""; + this.labelMessage1.Text = "¿Le gustaría cambiar su tipo de equipo actual?"; + this.labelMessage2.Text = "Es necesario reiniciar."; break; default: break; diff --git a/ITC81DB_2/Forms/FormMain.Designer.cs b/ITC81DB_2/Forms/FormMain.Designer.cs index 0daff67..4ce12bb 100644 --- a/ITC81DB_2/Forms/FormMain.Designer.cs +++ b/ITC81DB_2/Forms/FormMain.Designer.cs @@ -34,7 +34,6 @@ this.smartFileCommunicationLog = new SmartX.SmartFile(); this.smartFileDataBackup1 = new SmartX.SmartFile(); this.smartConfigs = new SmartX.SmartConfigs(); - this.serialPort3 = new System.IO.Ports.SerialPort(this.components); this.serialPort1 = new System.IO.Ports.SerialPort(this.components); this.serialPort4 = new System.IO.Ports.SerialPort(this.components); this.smartSerialPort2 = new SmartX.SmartSerialPort(); @@ -43,6 +42,7 @@ this.timerSensorError2 = new System.Windows.Forms.Timer(); this.timerEntryNotDetectedIgnoreTime1 = new System.Windows.Forms.Timer(); this.timerEntryNotDetectedIgnoreTime2 = new System.Windows.Forms.Timer(); + this.smartSerialPort3 = new SmartX.SmartSerialPort(); ((System.ComponentModel.ISupportInitialize)(this.smartForm)).BeginInit(); this.SuspendLayout(); // @@ -72,10 +72,6 @@ // this.smartFileDataBackup1.FilePathName = null; // - // serialPort3 - // - this.serialPort3.PortName = "COM3"; - // // serialPort4 // this.serialPort4.PortName = "COM4"; @@ -122,6 +118,25 @@ // this.timerEntryNotDetectedIgnoreTime2.Tick += new System.EventHandler(this.timerEntryNotDetectedIgnoreTime2_Tick); // + // smartSerialPort3 + // + this.smartSerialPort3.Baud_Rate = SmartX.SmartSerialPort.BAUDRATE._9600bps; + this.smartSerialPort3.ErrorCheckCodeType = SmartX.SmartSerialPort.ERRORCHECKCODETYPES.ASCIICODE; + this.smartSerialPort3.ErrorCheckMode = SmartX.SmartSerialPort.ERRORCHECK.NONE; + this.smartSerialPort3.ErrorCode_Location = SmartX.SmartSerialPort.ERRORCODELOCATION.HEADER; + this.smartSerialPort3.ETXCode = ((byte)(3)); + this.smartSerialPort3.ETXCodes = null; + this.smartSerialPort3.FrameBufferSize = ((uint)(1024u)); + this.smartSerialPort3.FrameSeparationType = SmartX.SmartSerialPort.FRAMESEPARATIONTYPES.NONEFRAME_READTIMEOUT; + this.smartSerialPort3.HeadErrorCodeOffset = 0; + this.smartSerialPort3.PortNo = SmartX.SmartSerialPort.COMPORTNO.COM3; + this.smartSerialPort3.ReadTimeout = 10; + this.smartSerialPort3.ReceiveDetect = SmartX.SmartSerialPort.RECEIVEDETECTTYPE.EVENT_QUEUE; + this.smartSerialPort3.ReceiveFrameDebugMode = false; + this.smartSerialPort3.RS485SoftwareDetection = false; + this.smartSerialPort3.STXCode = ((byte)(2)); + this.smartSerialPort3.TailErrorCodeOffset = 0; + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -143,7 +158,6 @@ public SmartX.SmartFile smartFileIO; public SmartX.SmartFile smartFileCommunicationLog; public SmartX.SmartConfigs smartConfigs; - private System.IO.Ports.SerialPort serialPort3; private System.IO.Ports.SerialPort serialPort1; private System.IO.Ports.SerialPort serialPort4; private SmartX.SmartSerialPort smartSerialPort2; @@ -152,6 +166,7 @@ private System.Windows.Forms.Timer timerSensorError2; private System.Windows.Forms.Timer timerEntryNotDetectedIgnoreTime1; private System.Windows.Forms.Timer timerEntryNotDetectedIgnoreTime2; + private SmartX.SmartSerialPort smartSerialPort3; } } diff --git a/ITC81DB_2/Forms/FormMain.cs b/ITC81DB_2/Forms/FormMain.cs index edd44df..154c3cd 100644 --- a/ITC81DB_2/Forms/FormMain.cs +++ b/ITC81DB_2/Forms/FormMain.cs @@ -323,7 +323,7 @@ namespace ITC81DB_2.Forms else { data.IsEntryStucked = true; - if (this.CurrentSystemStatus.Equipment == DataStore.EquipmentStatus.Start) + if (this.CurrentSystemStatus.Equipment == Define.E_EquipmentStatus.Start) { this.TransferData(CommunicationCommand.BuzzerOnContinuousEnable, CommunicationID.MainBoard); this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); @@ -349,7 +349,7 @@ namespace ITC81DB_2.Forms if (this.IsJudgmentNow1 == false) { data.IsEntryNotDetected = true; - if (this.CurrentSystemStatus.Equipment == DataStore.EquipmentStatus.Start) + if (this.CurrentSystemStatus.Equipment == Define.E_EquipmentStatus.Start) { this.TransferData(CommunicationCommand.BuzzerOnContinuousEnable, CommunicationID.MainBoard); this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); @@ -361,7 +361,7 @@ namespace ITC81DB_2.Forms if (this.IsJudgmentNow2 == false) { data.IsEntryNotDetected = true; - if (this.CurrentSystemStatus.Equipment == DataStore.EquipmentStatus.Start) + if (this.CurrentSystemStatus.Equipment == Define.E_EquipmentStatus.Start) { this.TransferData(CommunicationCommand.BuzzerOnContinuousEnable, CommunicationID.MainBoard); this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); @@ -412,7 +412,7 @@ namespace ITC81DB_2.Forms /// Set Mode /// /// - public void SetDisplayMode(DataStore.DisplayMode mode) + public void SetDisplayMode(Define.E_DisplayMode mode) { if (this.CurrentSystemStatus.CurrentMode == mode) return; @@ -421,28 +421,28 @@ namespace ITC81DB_2.Forms switch (mode) { - case DataStore.DisplayMode.Normal: + case Define.E_DisplayMode.Normal: this.TransferData(CommunicationCommand.ModeNormal, CommunicationID.MainBoard); break; - case DataStore.DisplayMode.Menu: + case Define.E_DisplayMode.Menu: this.TransferData(CommunicationCommand.ModeMenu, CommunicationID.MainBoard); break; - case DataStore.DisplayMode.Calibration: + case Define.E_DisplayMode.Calibration: this.TransferData(CommunicationCommand.ModeCalibration, CommunicationID.MainBoard); break; - case DataStore.DisplayMode.SystemSetting: + case Define.E_DisplayMode.SystemSetting: this.TransferData(CommunicationCommand.ModeJudgment, CommunicationID.MainBoard); break; - case DataStore.DisplayMode.IOTest: + case Define.E_DisplayMode.IOTest: this.TransferData(CommunicationCommand.ModeIOTest, CommunicationID.MainBoard); break; - case DataStore.DisplayMode.Bypass: + case Define.E_DisplayMode.Bypass: this.TransferData(CommunicationCommand.ModeBypass, CommunicationID.MainBoard); break; - case DataStore.DisplayMode.EquipmentTest: + case Define.E_DisplayMode.EquipmentTest: this.TransferData(CommunicationCommand.ModeEquipmentTest, CommunicationID.MainBoard); break; - case DataStore.DisplayMode.SorterTest: + case Define.E_DisplayMode.SorterTest: this.TransferData(CommunicationCommand.ModeRejectorTest, CommunicationID.MainBoard); break; default: @@ -453,7 +453,7 @@ namespace ITC81DB_2.Forms /// Set User /// /// - public void SetUser(DataStore.UserGroup user) + public void SetUser(Define.E_UserGroup user) { if (this.CurrentSystemStatus.CurrentUserPasswordType.Group != user) this.CurrentSystemStatus.CurrentUserPasswordType.Group = user; @@ -941,6 +941,28 @@ namespace ITC81DB_2.Forms return ret; } + public int TransferDataCOM3(string command, string id) + { + int ret = 0; + string chkSum = "cc"; + StringBuilder sb = new StringBuilder(); + + sb.Append(command); + sb.Append(id); + + chkSum = this.Checksumcalculator(sb.ToString()); + + sb.Append(chkSum); + + if (this.smartSerialPort3.IsOpen == true) + this.smartSerialPort3.WriteNoneFrame((char)0x02 + sb.ToString() + (char)0x03, SmartSerialPort.CODETYPES.ASCIICODE); + + // 통신 확인 로그 + if (this.IsCommunicationLogOpen == true) + this.smartFileCommunicationLog.WriteString(string.Format("Send COM3({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, sb.ToString())); + + return ret; + } public int TransferDataStream(string command, string id, string address, string data) { int ret = 0; @@ -966,6 +988,31 @@ namespace ITC81DB_2.Forms return ret; } + public int TransferDataToCOM3Stream(string command, string id, string address, string data) + { + int ret = 0; + string chkSum = "cc"; + StringBuilder sb = new StringBuilder(); + + sb.Append(command); + sb.Append(id); + sb.Append(Helper.StringZeroFillDigits4(data.Length.ToString())); + sb.Append(address); + sb.Append(data); + + chkSum = this.Checksumcalculator(sb.ToString()); + + sb.Append(chkSum); + + if (this.smartSerialPort3.IsOpen == true) + this.smartSerialPort3.WriteNoneFrame((char)0x02 + sb.ToString() + (char)0x03, SmartSerialPort.CODETYPES.ASCIICODE); + + // 통신 확인 로그 + if (this.IsCommunicationLogOpen == true) + this.smartFileCommunicationLog.WriteString(string.Format("Send COM3 ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, sb.ToString())); + + return ret; + } private void ReceiveData() { int ret = 0; @@ -1038,9 +1085,9 @@ namespace ITC81DB_2.Forms { case "CI0": #region Main Board Booted - if (this.CurrentSystemStatus.Equipment == DataStore.EquipmentStatus.Start) + if (this.CurrentSystemStatus.Equipment == Define.E_EquipmentStatus.Start) { - this.CurrentSystemStatus.Equipment = DataStore.EquipmentStatus.Stop; + this.CurrentSystemStatus.Equipment = Define.E_EquipmentStatus.Stop; // 생산속도 Clear this.CurrentWeightData1.ProductionSpeed = 0; @@ -1067,7 +1114,7 @@ namespace ITC81DB_2.Forms break; case "CBS": #region 운전 - this.CurrentSystemStatus.Equipment = DataStore.EquipmentStatus.Start; + this.CurrentSystemStatus.Equipment = Define.E_EquipmentStatus.Start; // 운전시 중량 0 으로 Clear this.CurrentWeightData1.Weight = 0.0; @@ -1085,7 +1132,7 @@ namespace ITC81DB_2.Forms // 운전 시, Pop up 창 자동 Close this.ChildFormMainDisplay.PopUpWarningClose(); - if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.MainDisplay) + if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.MainDisplay) this.ChildFormMainDisplay.UpdateEquipmentStatusDisplay(this.CurrentSystemStatus.Equipment); else this.ChildFormMenu.UpdateEquipmentStatusDisplay(this.CurrentSystemStatus.Equipment); @@ -1096,7 +1143,7 @@ namespace ITC81DB_2.Forms break; case "CBT": #region 정지 - this.CurrentSystemStatus.Equipment = DataStore.EquipmentStatus.Stop; + this.CurrentSystemStatus.Equipment = Define.E_EquipmentStatus.Stop; // 생산속도 Clear this.CurrentWeightData1.ProductionSpeed = 0; @@ -1110,7 +1157,7 @@ namespace ITC81DB_2.Forms this.SaveCounterFile1(this.CurrentWeightData1, this.SystemConfig1.ProductNumber - 1); this.SaveCounterFile2(this.CurrentWeightData2, this.SystemConfig1.ProductNumber - 1); - if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.MainDisplay) + if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.MainDisplay) this.ChildFormMainDisplay.UpdateEquipmentStatusDisplay(this.CurrentSystemStatus.Equipment); else this.ChildFormMenu.UpdateEquipmentStatusDisplay(this.CurrentSystemStatus.Equipment); @@ -1130,7 +1177,7 @@ namespace ITC81DB_2.Forms #endregion break; case "CSa": - if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.MainDisplay) + if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.MainDisplay) { try { @@ -1359,10 +1406,10 @@ namespace ITC81DB_2.Forms this.UpdateScreen(); - if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.MainDisplay) + if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.MainDisplay) this.ChildFormMainDisplay.UpdateCurrentProductDisplay(this.CurrentSystemStatus.Equipment, this.CurrentProductItem1, this.CurrentProductItem2, this.CurrentWeightData1, this.CurrentWeightData2); - else if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.SystemJudgmentSetting) + else if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.SystemJudgmentSetting) this.ChildFormMenu.CenterSystemJudgmentSetting.UpdateCurrentProductDisplay(this.CurrentSystemStatus.Equipment, this.CurrentProductItem1, this.CurrentProductItem2); break; case "3601": @@ -1370,9 +1417,9 @@ namespace ITC81DB_2.Forms this.CurrentCalibrationItem.Constant1 = receiveData.Substring(0, 7).Trim(); this.CurrentCalibrationItem.Constant2 = receiveData.Substring(7, 7).Trim(); #endregion - if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.SystemCalibration) + if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.SystemCalibration) this.ChildFormMenu.CenterSystemCalibration.UpdateConstantDisplay(this.CurrentCalibrationItem); - else if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.SystemJudgmentSetting) + else if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.SystemJudgmentSetting) this.ChildFormMenu.CenterSystemJudgmentSetting.UpdateConstantDisplay(this.CurrentSystemStatus.Equipment, this.CurrentCalibrationItem); break; case "3901": @@ -1392,9 +1439,9 @@ namespace ITC81DB_2.Forms this.CurrentSystemParameter9510.AutoZero1Variate = receiveData.Substring(8, 4).Trim(); this.CurrentSystemParameter9510.AutoZero1Mode = receiveData.Substring(12, 4).Trim(); #endregion - if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.SystemAutoZero) + if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.SystemAutoZero) this.ChildFormMenu.CenterSystemAutoZero.UpdateZero1ParameterDisplay(this.CurrentSystemParameter9510); - else if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.MainDisplay) + else if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.MainDisplay) this.ChildFormMainDisplay.MainSubMenu.UpdateZero1ParameterDisplay(this.CurrentSystemParameter9510); break; case "4902": @@ -1413,9 +1460,9 @@ namespace ITC81DB_2.Forms this.CurrentSystemParameter9511.AutoZero1Variate = receiveData.Substring(8, 4).Trim(); this.CurrentSystemParameter9511.AutoZero1Mode = receiveData.Substring(12, 4).Trim(); #endregion - if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.SystemAutoZero) + if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.SystemAutoZero) this.ChildFormMenu.CenterSystemAutoZero.UpdateZero3ParameterDisplay(this.CurrentSystemParameter9511); - else if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.MainDisplay) + else if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.MainDisplay) this.ChildFormMainDisplay.MainSubMenu.UpdateZero2ParameterDisplay(this.CurrentSystemParameter9511); break; case "4904": @@ -1571,47 +1618,47 @@ namespace ITC81DB_2.Forms private int ReceiveCommandPW0(string lane, string address, string receiveData) { int ret = 0; - DataStore.ResponseData response = DataStore.ResponseData.NAK; + Define.E_ResponseData response = Define.E_ResponseData.NAK; try { if (receiveData == "0") - response = DataStore.ResponseData.NAK; + response = Define.E_ResponseData.NAK; else - response = DataStore.ResponseData.ACK; + response = Define.E_ResponseData.ACK; switch (address) { case "4004": - if (response == DataStore.ResponseData.ACK) + if (response == Define.E_ResponseData.ACK) this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._4901_ParameterRead1, ""); break; case "4005": - if (response == DataStore.ResponseData.ACK) + if (response == Define.E_ResponseData.ACK) this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._4902_ParameterRead2, ""); break; case "4024": - if (response == DataStore.ResponseData.ACK) + if (response == Define.E_ResponseData.ACK) this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._4903_ParameterRead3, ""); break; case "4025": - if (response == DataStore.ResponseData.ACK) + if (response == Define.E_ResponseData.ACK) this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._4904_ParameterRead4, ""); break; case "9006": - if (response == DataStore.ResponseData.ACK) + if (response == Define.E_ResponseData.ACK) this.TransferProductParameter1(this.SystemConfig1.ProductNumber); break; case "9007": - if (response == DataStore.ResponseData.ACK) + if (response == Define.E_ResponseData.ACK) this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._2001_ProductNumber, ""); break; case "9045": - if (response == DataStore.ResponseData.ACK) + if (response == Define.E_ResponseData.ACK) this.TransferProductParameter2(this.SystemConfig1.ProductNumber); break; case "9046": - if (response == DataStore.ResponseData.ACK) + if (response == Define.E_ResponseData.ACK) this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._2001_ProductNumber, ""); break; default: @@ -1629,14 +1676,14 @@ namespace ITC81DB_2.Forms private int ReceiveCommandPB0(string lane, string address, string receiveData) { int ret = 0; - DataStore.ResponseData response = DataStore.ResponseData.NAK; + Define.E_ResponseData response = Define.E_ResponseData.NAK; try { if (receiveData == "0000") - response = DataStore.ResponseData.NAK; + response = Define.E_ResponseData.NAK; else - response = DataStore.ResponseData.ACK; + response = Define.E_ResponseData.ACK; switch (address) { @@ -1670,7 +1717,7 @@ namespace ITC81DB_2.Forms case "Z": #region Value Assign - if (this.CurrentSystemStatus.Equipment == DataStore.EquipmentStatus.Stop) + if (this.CurrentSystemStatus.Equipment == Define.E_EquipmentStatus.Stop) { this.CurrentWeightData1.Status = Helper.StringToWeightStatus(receiveData.Substring(0, 2)); this.ConverterAlarm(ref this.CurrentWeightData1, receiveData.Substring(2, 3), 1); @@ -1692,7 +1739,7 @@ namespace ITC81DB_2.Forms } #endregion - if (this.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.MainDisplay) + if (this.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.MainDisplay) this.ChildFormMainDisplay.UpdateStopWeightDisplay(this.CurrentSystemStatus.Equipment, this.CurrentWeightData1, this.CurrentWeightData2); break; default: @@ -1732,7 +1779,7 @@ namespace ITC81DB_2.Forms this.CurrentWeightData1.WeightSum(this.CurrentWeightData1.JudgmentStatus); #endregion // 통신 제대로 받으면 ACK - this.TransferData(string.Format("{0}{1}{2}", CommunicationCommand.RunWeightData, (int)DataStore.ResponseData.ACK, transferCount), CommunicationID.MainBoard); + this.TransferData(string.Format("{0}{1}{2}", CommunicationCommand.RunWeightData, (int)Define.E_ResponseData.ACK, transferCount), CommunicationID.MainBoard); this.IsJudgmentNow1 = true; // 로그 @@ -1746,17 +1793,17 @@ namespace ITC81DB_2.Forms switch (this.SystemConfig1.SerialCOM1Mode) { case 1: - this.TransferSerialCOM1(this.Transfer_1_STD1(this.SystemConfig1, DataStore.Line.Line1, this.CurrentWeightData1, this.CurrentProductItem1)); + this.TransferSerialCOM1(this.Transfer_1_STD1(this.SystemConfig1, Define.Line.Line1, this.CurrentWeightData1, this.CurrentProductItem1)); break; case 2: this.TransferSerialCOM1(this.Transfer_2_Remote(this.CurrentWeightData1, this.CurrentProductItem1)); break; case 3: if (this.SystemConfig1.IsPrint1Enable == true) - this.TransferSerialCOM1(this.Transfer_3_Print(this.CurrentWeightData1, DataStore.Line.Line1, this.CurrentProductItem1)); + this.TransferSerialCOM1(this.Transfer_3_Print(this.CurrentWeightData1, Define.Line.Line1, this.CurrentProductItem1)); break; case 4: - this.TransferSerialCOM1(this.Transfer_4_STD2(this.SystemConfig1, DataStore.Line.Line1, this.CurrentWeightData1, this.CurrentProductItem1)); + this.TransferSerialCOM1(this.Transfer_4_STD2(this.SystemConfig1, Define.Line.Line1, this.CurrentWeightData1, this.CurrentProductItem1)); break; default: break; @@ -1768,17 +1815,17 @@ namespace ITC81DB_2.Forms switch (this.SystemConfig1.SerialCOM3Mode) { case 1: - this.TransferSerialCOM3(this.Transfer_1_STD1(this.SystemConfig1, DataStore.Line.Line1, this.CurrentWeightData1, this.CurrentProductItem1)); + this.TransferSerialCOM3(this.Transfer_1_STD1(this.SystemConfig1, Define.Line.Line1, this.CurrentWeightData1, this.CurrentProductItem1)); break; case 2: this.TransferSerialCOM3(this.Transfer_2_Remote(this.CurrentWeightData1, this.CurrentProductItem1)); break; case 3: if (this.SystemConfig1.IsPrint1Enable == true) - this.TransferSerialCOM3(this.Transfer_3_Print(this.CurrentWeightData1, DataStore.Line.Line1, this.CurrentProductItem1)); + this.TransferSerialCOM3(this.Transfer_3_Print(this.CurrentWeightData1, Define.Line.Line1, this.CurrentProductItem1)); break; case 4: - this.TransferSerialCOM3(this.Transfer_4_STD2(this.SystemConfig1, DataStore.Line.Line1, this.CurrentWeightData1, this.CurrentProductItem1)); + this.TransferSerialCOM3(this.Transfer_4_STD2(this.SystemConfig1, Define.Line.Line1, this.CurrentWeightData1, this.CurrentProductItem1)); break; default: break; @@ -1788,11 +1835,11 @@ namespace ITC81DB_2.Forms // CurrentDisplay switch (this.CurrentSystemStatus.CurrentDisplay) { - case DataStore.DisplayStore.MainDisplay: + case Define.E_DisplayStore.MainDisplay: #region MainDisplay this.ChildFormMainDisplay.UpdateStartWeightDisplay1(this.CurrentSystemStatus.Equipment, this.CurrentWeightData1); - if (this.CurrentWeightData1.JudgmentStatus != DataStore.JudgmentStatus.Empty) + if (this.CurrentWeightData1.JudgmentStatus != Define.E_JudgmentStatus.Empty) this.DataBackup1(this.CurrentWeightData1); // 표준분포 @@ -1815,7 +1862,7 @@ namespace ITC81DB_2.Forms this.CurrentWeightData2.WeightSum(this.CurrentWeightData2.JudgmentStatus); #endregion // 통신 제대로 받으면 ACK - this.TransferData(string.Format("{0}{1}{2}", CommunicationCommand.RunWeightData, (int)DataStore.ResponseData.ACK, transferCount), CommunicationID.MainBoard); + this.TransferData(string.Format("{0}{1}{2}", CommunicationCommand.RunWeightData, (int)Define.E_ResponseData.ACK, transferCount), CommunicationID.MainBoard); this.IsJudgmentNow2 = true; // 로그 @@ -1829,17 +1876,17 @@ namespace ITC81DB_2.Forms switch (this.SystemConfig1.SerialCOM1Mode) { case 1: - this.TransferSerialCOM1(this.Transfer_1_STD1(this.SystemConfig1, DataStore.Line.Line2, this.CurrentWeightData2, this.CurrentProductItem2)); + this.TransferSerialCOM1(this.Transfer_1_STD1(this.SystemConfig1, Define.Line.Line2, this.CurrentWeightData2, this.CurrentProductItem2)); break; case 2: this.TransferSerialCOM1(this.Transfer_2_Remote(this.CurrentWeightData2, this.CurrentProductItem2)); break; case 3: if (this.SystemConfig1.IsPrint2Enable == true) - this.TransferSerialCOM1(this.Transfer_3_Print(this.CurrentWeightData2, DataStore.Line.Line2, this.CurrentProductItem2)); + this.TransferSerialCOM1(this.Transfer_3_Print(this.CurrentWeightData2, Define.Line.Line2, this.CurrentProductItem2)); break; case 4: - this.TransferSerialCOM1(this.Transfer_4_STD2(this.SystemConfig1, DataStore.Line.Line2, this.CurrentWeightData2, this.CurrentProductItem2)); + this.TransferSerialCOM1(this.Transfer_4_STD2(this.SystemConfig1, Define.Line.Line2, this.CurrentWeightData2, this.CurrentProductItem2)); break; default: break; @@ -1851,17 +1898,17 @@ namespace ITC81DB_2.Forms switch (this.SystemConfig1.SerialCOM3Mode) { case 1: - this.TransferSerialCOM3(this.Transfer_1_STD1(this.SystemConfig1, DataStore.Line.Line2, this.CurrentWeightData2, this.CurrentProductItem2)); + this.TransferSerialCOM3(this.Transfer_1_STD1(this.SystemConfig1, Define.Line.Line2, this.CurrentWeightData2, this.CurrentProductItem2)); break; case 2: this.TransferSerialCOM3(this.Transfer_2_Remote(this.CurrentWeightData2, this.CurrentProductItem2)); break; case 3: if(this.SystemConfig1.IsPrint2Enable == true) - this.TransferSerialCOM3(this.Transfer_3_Print(this.CurrentWeightData2, DataStore.Line.Line2, this.CurrentProductItem2)); + this.TransferSerialCOM3(this.Transfer_3_Print(this.CurrentWeightData2, Define.Line.Line2, this.CurrentProductItem2)); break; case 4: - this.TransferSerialCOM3(this.Transfer_4_STD2(this.SystemConfig1, DataStore.Line.Line2, this.CurrentWeightData2, this.CurrentProductItem2)); + this.TransferSerialCOM3(this.Transfer_4_STD2(this.SystemConfig1, Define.Line.Line2, this.CurrentWeightData2, this.CurrentProductItem2)); break; default: break; @@ -1871,11 +1918,11 @@ namespace ITC81DB_2.Forms // CurrentDisplay switch (this.CurrentSystemStatus.CurrentDisplay) { - case DataStore.DisplayStore.MainDisplay: + case Define.E_DisplayStore.MainDisplay: #region MainDisplay this.ChildFormMainDisplay.UpdateStartWeightDisplay2(this.CurrentSystemStatus.Equipment, this.CurrentWeightData2); - if (this.CurrentWeightData2.JudgmentStatus != DataStore.JudgmentStatus.Empty) + if (this.CurrentWeightData2.JudgmentStatus != Define.E_JudgmentStatus.Empty) this.DataBackup2(this.CurrentWeightData2); // 표준분포 @@ -1936,7 +1983,7 @@ namespace ITC81DB_2.Forms for (int i = 0; i < 8; i++) this.CollectionIOTest_InputData[i] = receiveData.Substring(i, 1); #endregion - if (this.CurrentSystemStatus.CurrentMode == DataStore.DisplayMode.IOTest) + if (this.CurrentSystemStatus.CurrentMode == Define.E_DisplayMode.IOTest) this.ChildFormMenu.CenterSystemIOTest.UpdateInputRead(this.CollectionIOTest_InputData); break; default: @@ -2063,6 +2110,15 @@ namespace ITC81DB_2.Forms #endregion #region Serial Communication + public string PadLeft(int length, string sValue) + { + string temp; + + temp = sValue.PadLeft(length, ' '); + + return temp; + } + #region Serial COM1 public void OpenSerialCOM1() { @@ -2112,54 +2168,54 @@ namespace ITC81DB_2.Forms #region Serial COM3 public void OpenSerialCOM3() { - if (this.SystemConfig1.SerialCOM3Mode == 0) + if (this.SystemConfig1.SerialCOM3Mode == 0 && this.SystemConfig1.EquipmentType != 8) return; - if (this.serialPort3.IsOpen == true) - this.serialPort3.Close(); + this.CloseSerialCOM3(); switch (this.SystemConfig1.SerialCOM3BaudRate) { case 0: - this.serialPort3.BaudRate = 9600; + this.smartSerialPort3.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps; break; case 1: - this.serialPort3.BaudRate = 19200; + this.smartSerialPort3.Baud_Rate = SmartSerialPort.BAUDRATE._19200bps; break; case 2: - this.serialPort3.BaudRate = 38400; + this.smartSerialPort3.Baud_Rate = SmartSerialPort.BAUDRATE._38400bps; break; case 3: - this.serialPort3.BaudRate = 115200; + this.smartSerialPort3.Baud_Rate = SmartSerialPort.BAUDRATE._115200bps; break; default: - this.serialPort3.BaudRate = 9600; + this.smartSerialPort3.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps; break; } - this.serialPort3.Open(); + this.smartSerialPort3.Open(); } public void CloseSerialCOM3() { - this.serialPort3.Close(); + if (this.smartSerialPort3.IsOpen == true) + this.smartSerialPort3.Close(); } public void TransferSerialCOM3(string strTemp) { - if (this.serialPort3.IsOpen == true) - this.serialPort3.WriteLine(strTemp); + if (this.smartSerialPort3.IsOpen == true) + this.smartSerialPort3.WriteNoneFrame(strTemp, SmartSerialPort.CODETYPES.ASCIICODE); } - public void TransferSerialCOM3(byte[] buffer, int offset, int count) + public void TransferSerialCOM3(byte[] buffer) { - if (this.serialPort3.IsOpen == true) - this.serialPort3.Write(buffer, offset, count); + if (this.smartSerialPort3.IsOpen == true) + this.smartSerialPort3.WriteNoneFrame(buffer); } #endregion - private string Transfer_1_STD1(SystemConfigurationItem system, DataStore.Line line, WeightData weight, ProductItem product) + private string Transfer_1_STD1(SystemConfigurationItem system, Define.Line line, WeightData weight, ProductItem product) { StringBuilder sb = new StringBuilder(); - if (weight.JudgmentStatus == DataStore.JudgmentStatus.Empty) + if (weight.JudgmentStatus == Define.E_JudgmentStatus.Empty) return ""; sb.Append((char)0x02); @@ -2173,24 +2229,24 @@ namespace ITC81DB_2.Forms switch (weight.JudgmentStatus) { - case DataStore.JudgmentStatus.Empty: + case Define.E_JudgmentStatus.Empty: break; - case DataStore.JudgmentStatus.Under: + case Define.E_JudgmentStatus.Under: sb.Append("U"); break; - case DataStore.JudgmentStatus.Pass: + case Define.E_JudgmentStatus.Pass: sb.Append("P"); break; - case DataStore.JudgmentStatus.Over: + case Define.E_JudgmentStatus.Over: sb.Append("O"); break; - case DataStore.JudgmentStatus.Double: + case Define.E_JudgmentStatus.Double: sb.Append("D"); break; - case DataStore.JudgmentStatus.Metal: + case Define.E_JudgmentStatus.Metal: sb.Append("M"); break; - case DataStore.JudgmentStatus.ExNg: + case Define.E_JudgmentStatus.ExNg: sb.Append("E"); break; default: @@ -2207,7 +2263,7 @@ namespace ITC81DB_2.Forms { StringBuilder sb = new StringBuilder(); - if (weight.JudgmentStatus == DataStore.JudgmentStatus.Empty) + if (weight.JudgmentStatus == Define.E_JudgmentStatus.Empty) return ""; sb.Append((char)0x02); @@ -2215,24 +2271,24 @@ namespace ITC81DB_2.Forms switch (weight.JudgmentStatus) { - case DataStore.JudgmentStatus.Empty: + case Define.E_JudgmentStatus.Empty: break; - case DataStore.JudgmentStatus.Under: + case Define.E_JudgmentStatus.Under: sb.Append("U"); break; - case DataStore.JudgmentStatus.Pass: + case Define.E_JudgmentStatus.Pass: sb.Append("P"); break; - case DataStore.JudgmentStatus.Over: + case Define.E_JudgmentStatus.Over: sb.Append("O"); break; - case DataStore.JudgmentStatus.Double: + case Define.E_JudgmentStatus.Double: sb.Append("D"); break; - case DataStore.JudgmentStatus.Metal: + case Define.E_JudgmentStatus.Metal: sb.Append("M"); break; - case DataStore.JudgmentStatus.ExNg: + case Define.E_JudgmentStatus.ExNg: sb.Append("E"); break; default: @@ -2245,24 +2301,24 @@ namespace ITC81DB_2.Forms return sb.ToString(); } - private string Transfer_3_Print(WeightData weight, DataStore.Line line, ProductItem product) + private string Transfer_3_Print(WeightData weight, Define.Line line, ProductItem product) { string value = ""; StringBuilder sb = new StringBuilder(); - if (weight.JudgmentStatus == DataStore.JudgmentStatus.Empty) + if (weight.JudgmentStatus == Define.E_JudgmentStatus.Empty) return ""; sb.Append(string.Format("{0, 4}", this.SystemConfig1.ProductNumber)); sb.Append(string.Format("{0, 3}", (int)line)); - if (weight.JudgmentStatus == DataStore.JudgmentStatus.Under) + if (weight.JudgmentStatus == Define.E_JudgmentStatus.Under) sb.Append(" U"); - else if (weight.JudgmentStatus == DataStore.JudgmentStatus.Pass) + else if (weight.JudgmentStatus == Define.E_JudgmentStatus.Pass) sb.Append(" P"); - else if (weight.JudgmentStatus == DataStore.JudgmentStatus.Over) + else if (weight.JudgmentStatus == Define.E_JudgmentStatus.Over) sb.Append(" O"); - else if (weight.JudgmentStatus == DataStore.JudgmentStatus.Double) + else if (weight.JudgmentStatus == Define.E_JudgmentStatus.Double) sb.Append(" D"); else sb.Append(" E"); @@ -2274,11 +2330,11 @@ namespace ITC81DB_2.Forms return sb.ToString(); } - private string Transfer_4_STD2(SystemConfigurationItem system, DataStore.Line line, WeightData weight, ProductItem product) + private string Transfer_4_STD2(SystemConfigurationItem system, Define.Line line, WeightData weight, ProductItem product) { StringBuilder sb = new StringBuilder(); - if (weight.JudgmentStatus == DataStore.JudgmentStatus.Empty) + if (weight.JudgmentStatus == Define.E_JudgmentStatus.Empty) return ""; sb.Append((char)0x02); @@ -2298,24 +2354,24 @@ namespace ITC81DB_2.Forms switch (weight.JudgmentStatus) { - case DataStore.JudgmentStatus.Empty: + case Define.E_JudgmentStatus.Empty: break; - case DataStore.JudgmentStatus.Under: + case Define.E_JudgmentStatus.Under: sb.Append("U"); break; - case DataStore.JudgmentStatus.Pass: + case Define.E_JudgmentStatus.Pass: sb.Append("P"); break; - case DataStore.JudgmentStatus.Over: + case Define.E_JudgmentStatus.Over: sb.Append("O"); break; - case DataStore.JudgmentStatus.Double: + case Define.E_JudgmentStatus.Double: sb.Append("D"); break; - case DataStore.JudgmentStatus.Metal: + case Define.E_JudgmentStatus.Metal: sb.Append("M"); break; - case DataStore.JudgmentStatus.ExNg: + case Define.E_JudgmentStatus.ExNg: sb.Append("E"); break; default: @@ -2821,7 +2877,7 @@ namespace ITC81DB_2.Forms structItem.Dummy19 = false; structItem.Dummy20 = false; - this.smartFileIO.WriteStructure(structItem, (int)DataStore.EnumFileUserGroup.f0_Level1); + this.smartFileIO.WriteStructure(structItem, (int)Define.E_EnumFileUserGroup.f0_Level1); #endregion #region Level2 @@ -2874,7 +2930,7 @@ namespace ITC81DB_2.Forms structItem.Dummy19 = false; structItem.Dummy20 = false; - this.smartFileIO.WriteStructure(structItem, (int)DataStore.EnumFileUserGroup.f1_Level2); + this.smartFileIO.WriteStructure(structItem, (int)Define.E_EnumFileUserGroup.f1_Level2); #endregion #region Level3 @@ -2927,7 +2983,7 @@ namespace ITC81DB_2.Forms structItem.Dummy19 = false; structItem.Dummy20 = false; - this.smartFileIO.WriteStructure(structItem, (int)DataStore.EnumFileUserGroup.f2_Level3); + this.smartFileIO.WriteStructure(structItem, (int)Define.E_EnumFileUserGroup.f2_Level3); #endregion this.smartFileIO.Close(); @@ -3003,7 +3059,7 @@ namespace ITC81DB_2.Forms structItem.Dummy19 = false; structItem.Dummy20 = false; - this.smartFileIO.WriteStructure(structItem, (int)DataStore.EnumFileUserGroup.f0_Level1); + this.smartFileIO.WriteStructure(structItem, (int)Define.E_EnumFileUserGroup.f0_Level1); #endregion this.smartFileIO.Close(); @@ -3079,7 +3135,7 @@ namespace ITC81DB_2.Forms structItem.Dummy19 = false; structItem.Dummy20 = false; - this.smartFileIO.WriteStructure(structItem, (int)DataStore.EnumFileUserGroup.f1_Level2); + this.smartFileIO.WriteStructure(structItem, (int)Define.E_EnumFileUserGroup.f1_Level2); #endregion this.smartFileIO.Close(); @@ -3155,7 +3211,7 @@ namespace ITC81DB_2.Forms structItem.Dummy19 = false; structItem.Dummy20 = false; - this.smartFileIO.WriteStructure(structItem, (int)DataStore.EnumFileUserGroup.f2_Level3); + this.smartFileIO.WriteStructure(structItem, (int)Define.E_EnumFileUserGroup.f2_Level3); #endregion this.smartFileIO.Close(); @@ -3184,7 +3240,7 @@ namespace ITC81DB_2.Forms try { #region Level1 - structItem = (StructUserGroupItem)this.smartFileIO.ReadStructure((int)DataStore.EnumFileUserGroup.f0_Level1, typeof(StructUserGroupItem)); + structItem = (StructUserGroupItem)this.smartFileIO.ReadStructure((int)Define.E_EnumFileUserGroup.f0_Level1, typeof(StructUserGroupItem)); item.Level1.IsBasic = structItem.IsBasic; item.Level1.IsBasicDataBackup = structItem.IsBasicDataBackup; @@ -3216,7 +3272,7 @@ namespace ITC81DB_2.Forms #endregion #region Level2 - structItem = (StructUserGroupItem)this.smartFileIO.ReadStructure((int)DataStore.EnumFileUserGroup.f1_Level2, typeof(StructUserGroupItem)); + structItem = (StructUserGroupItem)this.smartFileIO.ReadStructure((int)Define.E_EnumFileUserGroup.f1_Level2, typeof(StructUserGroupItem)); item.Level2.IsBasic = structItem.IsBasic; item.Level2.IsBasicDataBackup = structItem.IsBasicDataBackup; @@ -3248,7 +3304,7 @@ namespace ITC81DB_2.Forms #endregion #region Level3 - structItem = (StructUserGroupItem)this.smartFileIO.ReadStructure((int)DataStore.EnumFileUserGroup.f2_Level3, typeof(StructUserGroupItem)); + structItem = (StructUserGroupItem)this.smartFileIO.ReadStructure((int)Define.E_EnumFileUserGroup.f2_Level3, typeof(StructUserGroupItem)); item.Level3.IsBasic = structItem.IsBasic; item.Level3.IsBasicDataBackup = structItem.IsBasicDataBackup; @@ -3294,9 +3350,9 @@ namespace ITC81DB_2.Forms { this.CurrentSystemStatus.CurrentUserPasswordType.Initialization(); - this.smartFileIO.WriteString(this.CurrentSystemStatus.CurrentUserPasswordType.Level1Password, (int)DataStore.EnumFileUserPassword.f0_Level1); - this.smartFileIO.WriteString(this.CurrentSystemStatus.CurrentUserPasswordType.Level2Password, (int)DataStore.EnumFileUserPassword.f1_Level2); - this.smartFileIO.WriteString(this.CurrentSystemStatus.CurrentUserPasswordType.Level3Password, (int)DataStore.EnumFileUserPassword.f2_Level3); + this.smartFileIO.WriteString(this.CurrentSystemStatus.CurrentUserPasswordType.Level1Password, (int)Define.E_EnumFileUserPassword.f0_Level1); + this.smartFileIO.WriteString(this.CurrentSystemStatus.CurrentUserPasswordType.Level2Password, (int)Define.E_EnumFileUserPassword.f1_Level2); + this.smartFileIO.WriteString(this.CurrentSystemStatus.CurrentUserPasswordType.Level3Password, (int)Define.E_EnumFileUserPassword.f2_Level3); } public void SaveUserGroupPasswordFile(UserPasswordType item) { @@ -3318,9 +3374,9 @@ namespace ITC81DB_2.Forms this.CreateUserGroupPasswordFile(); } - this.smartFileIO.WriteString(item.Level1Password, (int)DataStore.EnumFileUserPassword.f0_Level1); - this.smartFileIO.WriteString(item.Level2Password, (int)DataStore.EnumFileUserPassword.f1_Level2); - this.smartFileIO.WriteString(item.Level3Password, (int)DataStore.EnumFileUserPassword.f2_Level3); + this.smartFileIO.WriteString(item.Level1Password, (int)Define.E_EnumFileUserPassword.f0_Level1); + this.smartFileIO.WriteString(item.Level2Password, (int)Define.E_EnumFileUserPassword.f1_Level2); + this.smartFileIO.WriteString(item.Level3Password, (int)Define.E_EnumFileUserPassword.f2_Level3); this.smartFileIO.Close(); } @@ -3346,9 +3402,9 @@ namespace ITC81DB_2.Forms try { - this.CurrentSystemStatus.CurrentUserPasswordType.Level1Password = this.smartFileIO.ReadString((int)DataStore.EnumFileUserPassword.f0_Level1); - this.CurrentSystemStatus.CurrentUserPasswordType.Level2Password = this.smartFileIO.ReadString((int)DataStore.EnumFileUserPassword.f1_Level2); - this.CurrentSystemStatus.CurrentUserPasswordType.Level3Password = this.smartFileIO.ReadString((int)DataStore.EnumFileUserPassword.f2_Level3); + this.CurrentSystemStatus.CurrentUserPasswordType.Level1Password = this.smartFileIO.ReadString((int)Define.E_EnumFileUserPassword.f0_Level1); + this.CurrentSystemStatus.CurrentUserPasswordType.Level2Password = this.smartFileIO.ReadString((int)Define.E_EnumFileUserPassword.f1_Level2); + this.CurrentSystemStatus.CurrentUserPasswordType.Level3Password = this.smartFileIO.ReadString((int)Define.E_EnumFileUserPassword.f2_Level3); } catch { @@ -3369,7 +3425,7 @@ namespace ITC81DB_2.Forms structItem.ID = "L1"; structItem.Password = "1111"; - structItem.Group = DataStore.UserGroup.Level1Operator; + structItem.Group = Define.E_UserGroup.Level1Operator; structItem.Dummy1 = ""; structItem.Dummy2 = ""; @@ -3486,7 +3542,7 @@ namespace ITC81DB_2.Forms structItem.ID = "L2"; structItem.Password = "2222"; - structItem.Group = DataStore.UserGroup.Level2Engineer; + structItem.Group = Define.E_UserGroup.Level2Engineer; structItem.Dummy1 = ""; structItem.Dummy2 = ""; @@ -3603,7 +3659,7 @@ namespace ITC81DB_2.Forms structItem.ID = "L3"; structItem.Password = "3333"; - structItem.Group = DataStore.UserGroup.Level3Manager; + structItem.Group = Define.E_UserGroup.Level3Manager; structItem.Dummy1 = ""; structItem.Dummy2 = ""; @@ -4636,7 +4692,7 @@ namespace ITC81DB_2.Forms this.CreateForm(); this.SmartSplashProgramLoad.Finish(); - this.smartForm.Show((int)DataStore.FormStore.FormMainDisplay); + this.smartForm.Show((int)Define.E_FormStore.FormMainDisplay); this.ChildFormMainDisplay.UpdateEquipmentStatusDisplay(this.CurrentSystemStatus.Equipment); this.TimerSensorErrorInterval(); @@ -4701,7 +4757,7 @@ namespace ITC81DB_2.Forms private void timerSensorError1_Tick(object sender, EventArgs e) { this.timerSensorError1.Enabled = false; - if (this.SystemConfig1.Language == DataStore.LanguageID.Korean) + if (this.SystemConfig1.Language == Define.E_LanguageID.Korean) this.ChildFormMainDisplay.PopUpWarning("#1 진입센서 이상"); else this.ChildFormMainDisplay.PopUpWarning("#1 Entry Sensor stucked"); @@ -4712,7 +4768,7 @@ namespace ITC81DB_2.Forms private void timerSensorError2_Tick(object sender, EventArgs e) { this.timerSensorError2.Enabled = false; - if (this.SystemConfig1.Language == DataStore.LanguageID.Korean) + if (this.SystemConfig1.Language == Define.E_LanguageID.Korean) this.ChildFormMainDisplay.PopUpWarning("#2 진입센서 이상"); else this.ChildFormMainDisplay.PopUpWarning("#2 Entry Sensor stucked"); @@ -4721,5 +4777,10 @@ namespace ITC81DB_2.Forms this.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); } #endregion + + private void smartSerialPort3_OnReadQueueEvent() + { + + } } } \ No newline at end of file diff --git a/ITC81DB_2/Forms/FormMain.resx b/ITC81DB_2/Forms/FormMain.resx index b96f13d..d7b4182 100644 --- a/ITC81DB_2/Forms/FormMain.resx +++ b/ITC81DB_2/Forms/FormMain.resx @@ -129,9 +129,6 @@ 836, 17 - - 1071, 17 - 961, 17 @@ -156,6 +153,9 @@ 604, 51 + + 887, 52 + WEBPAD diff --git a/ITC81DB_2/Forms/FormMainDisplay.cs b/ITC81DB_2/Forms/FormMainDisplay.cs index d9dd894..4ebbdc0 100644 --- a/ITC81DB_2/Forms/FormMainDisplay.cs +++ b/ITC81DB_2/Forms/FormMainDisplay.cs @@ -23,7 +23,7 @@ namespace ITC81DB_2.Forms private List AlarmListBool; - private DataStore.MainDisplayStore CurrentDisplay; + private Define.E_MainDisplayStore CurrentDisplay; public ControlMainAlarm MainAlarm; public ControlMainBarGraph MainBarGraph; @@ -60,7 +60,7 @@ namespace ITC81DB_2.Forms { Class1 images = new Class1(); - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.buttonZero.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayZeroDisable)); this.buttonZero.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayZeroDown)); @@ -74,7 +74,7 @@ namespace ITC81DB_2.Forms this.buttonUser.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayLogOffDown)); this.buttonUser.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayLogOffUp)); } - else if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.buttonZero.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnMainZeroDisable)); this.buttonZero.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnMainZeroDown)); @@ -88,7 +88,7 @@ namespace ITC81DB_2.Forms this.buttonUser.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnMainLogOffDown)); this.buttonUser.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnMainLogOffUp)); } - else if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.buttonZero.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnFormMainDisplayZeroDisable)); this.buttonZero.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnFormMainDisplayZeroDown)); @@ -117,7 +117,7 @@ namespace ITC81DB_2.Forms this.buttonUser.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMainDisplayLogOffUp)); } - if (this.ParentForm.CurrentSystemStatus.CurrentWeightInputMode == DataStore.WeightInputMode.Deviation) + if (this.ParentForm.CurrentSystemStatus.CurrentWeightInputMode == Define.E_WeightInputMode.Deviation) this.buttonWeightInputMode.ButtonDown(); else this.buttonWeightInputMode.ButtonUp(); @@ -192,9 +192,9 @@ namespace ITC81DB_2.Forms if (this.ParentForm.SystemConfig1.IsLogin == true) this.UpdateDisplayUser(this.ParentForm.CurrentSystemStatus); else - this.ParentForm.CurrentSystemStatus.CurrentUser.Group = DataStore.UserGroup.Level4Developer; + this.ParentForm.CurrentSystemStatus.CurrentUser.Group = Define.E_UserGroup.Level4Developer; - this.CurrentDisplay = DataStore.MainDisplayStore.BarGraph; + this.CurrentDisplay = Define.E_MainDisplayStore.BarGraph; this.DisplayBottomMain(this.CurrentDisplay); } @@ -264,7 +264,7 @@ namespace ITC81DB_2.Forms if (data1.IsEntryNotDetected == true) { this.MainAlarm.listBoxMessage.Items.Add("#1 Entry Not Detected"); - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Korean) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Korean) this.PopUpWarning("#1 제품진입 미감지"); else this.PopUpWarning("#1 Entry not detected"); @@ -272,7 +272,7 @@ namespace ITC81DB_2.Forms if (data2.IsEntryNotDetected == true) { this.MainAlarm.listBoxMessage.Items.Add("#2 Entry Not Detected"); - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Korean) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Korean) this.PopUpWarning("#2 제품진입 미감지"); else this.PopUpWarning("#2 Entry not detected"); @@ -280,7 +280,7 @@ namespace ITC81DB_2.Forms if (data1.IsEntryStucked == true) { this.MainAlarm.listBoxMessage.Items.Add("#1 Entry Sensor Stucked"); - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Korean) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Korean) this.PopUpWarning("#1 진입센서 이상"); else this.PopUpWarning("#1 Entry Sensor Stucked"); @@ -288,7 +288,7 @@ namespace ITC81DB_2.Forms if (data2.IsEntryStucked == true) { this.MainAlarm.listBoxMessage.Items.Add("#2 Entry Sensor Stucked"); - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Korean) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Korean) this.PopUpWarning("#2 진입센서 이상"); else this.PopUpWarning("#2 Entry Sensor Stucked"); @@ -405,11 +405,11 @@ namespace ITC81DB_2.Forms switch (status.CurrentUser.Group) { - case DataStore.UserGroup.LogOff: + case Define.E_UserGroup.LogOff: id = ""; - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) group = "关闭"; - else if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) group = "Apagado"; else group = "Off"; @@ -424,11 +424,11 @@ namespace ITC81DB_2.Forms this.buttonMenu.Enabled = false; break; - case DataStore.UserGroup.Level1Operator: + case Define.E_UserGroup.Level1Operator: id = status.CurrentUser.ID; - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) group = "级别1"; - else if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) group = "Nivel 1"; else group = "Level1"; @@ -441,16 +441,16 @@ namespace ITC81DB_2.Forms this.buttonClear.Enabled = true; this.labelProductName.Enabled = true; - if (status.Equipment == DataStore.EquipmentStatus.Stop) + if (status.Equipment == Define.E_EquipmentStatus.Stop) this.buttonMenu.Enabled = true; else this.buttonMenu.Enabled = false; break; - case DataStore.UserGroup.Level2Engineer: + case Define.E_UserGroup.Level2Engineer: id = status.CurrentUser.ID; - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) group = "级别2"; - else if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) group = "Nivel 2"; else group = "Level2"; @@ -463,16 +463,16 @@ namespace ITC81DB_2.Forms this.buttonClear.Enabled = true; this.labelProductName.Enabled = true; - if (status.Equipment == DataStore.EquipmentStatus.Stop) + if (status.Equipment == Define.E_EquipmentStatus.Stop) this.buttonMenu.Enabled = true; else this.buttonMenu.Enabled = false; break; - case DataStore.UserGroup.Level3Manager: + case Define.E_UserGroup.Level3Manager: id = status.CurrentUser.ID; - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) group = "级别3"; - else if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) group = "Nivel 3"; else group = "Level3"; @@ -485,16 +485,16 @@ namespace ITC81DB_2.Forms this.buttonClear.Enabled = true; this.labelProductName.Enabled = true; - if (status.Equipment == DataStore.EquipmentStatus.Stop) + if (status.Equipment == Define.E_EquipmentStatus.Stop) this.buttonMenu.Enabled = true; else this.buttonMenu.Enabled = false; break; - case DataStore.UserGroup.Level4Developer: + case Define.E_UserGroup.Level4Developer: id = status.CurrentUser.ID; - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) group = "级别4"; - else if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) group = "Nivel 4"; else group = "Level4"; @@ -507,16 +507,16 @@ namespace ITC81DB_2.Forms this.buttonClear.Enabled = true; this.labelProductName.Enabled = true; - if (status.Equipment == DataStore.EquipmentStatus.Stop) + if (status.Equipment == Define.E_EquipmentStatus.Stop) this.buttonMenu.Enabled = true; else this.buttonMenu.Enabled = false; break; default: id = ""; - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) group = "关闭"; - else if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) group = "Apagado"; else group = "Off"; @@ -537,12 +537,12 @@ namespace ITC81DB_2.Forms if (this.labelUserID.Text != id) this.labelUserID.Text = id; } - public void UpdateEquipmentStatusDisplay(DataStore.EquipmentStatus status) + public void UpdateEquipmentStatusDisplay(Define.E_EquipmentStatus status) { this.MainBarGraph.UpdateEquipmentStatusDisplay(status); this.MainWeightScreen.UpdateEquipmentStatusDisplay(status); - if (status == DataStore.EquipmentStatus.Start) + if (status == Define.E_EquipmentStatus.Start) { this.pictureBoxStart.Visible = true; this.pictureBoxStop.Visible = false; @@ -560,7 +560,7 @@ namespace ITC81DB_2.Forms this.buttonConveyorUpDown.Enabled = true; this.buttonConveyorUpDown.ButtonUp(); - if (this.ParentForm.CurrentSystemStatus.CurrentUser.Group == DataStore.UserGroup.LogOff) + if (this.ParentForm.CurrentSystemStatus.CurrentUser.Group == Define.E_UserGroup.LogOff) { this.buttonProductNo.Enabled = false; this.labelProductName.Enabled = false; @@ -574,7 +574,7 @@ namespace ITC81DB_2.Forms } } } - public void UpdateCurrentProductDisplay(DataStore.EquipmentStatus status, ProductItem pItem1, ProductItem pItem2, WeightData wData1, WeightData wData2) + public void UpdateCurrentProductDisplay(Define.E_EquipmentStatus status, ProductItem pItem1, ProductItem pItem2, WeightData wData1, WeightData wData2) { string value = ""; @@ -599,7 +599,7 @@ namespace ITC81DB_2.Forms if (this.MainLineGraph != null) this.MainLineGraph.UpdateCurrentProductDisplay(status, pItem1, pItem2, wData1, wData2); } - public void UpdateStopWeightDisplay(DataStore.EquipmentStatus status, WeightData data1, WeightData data2) + public void UpdateStopWeightDisplay(Define.E_EquipmentStatus status, WeightData data1, WeightData data2) { // 알람표시 this.UpdateDisplayAlarmView(data1, data2); @@ -609,12 +609,12 @@ namespace ITC81DB_2.Forms if (this.MainWeightScreen != null) this.MainWeightScreen.UpdateStopWeightDisplay(status, data1, data2); } - public void UpdateStartWeightDisplay1(DataStore.EquipmentStatus status, WeightData data) + public void UpdateStartWeightDisplay1(Define.E_EquipmentStatus status, WeightData data) { // 알람표시 this.UpdateDisplayAlarmView(data, this.ParentForm.CurrentWeightData2); - if (data.JudgmentStatus == DataStore.JudgmentStatus.Empty) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Empty) return; if (this.MainBarGraph != null) @@ -628,12 +628,12 @@ namespace ITC81DB_2.Forms if (this.MainWeightScreen != null) this.MainWeightScreen.UpdateStartWeightDisplay1(status, data); } - public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData data) + public void UpdateStartWeightDisplay2(Define.E_EquipmentStatus status, WeightData data) { // 알람표시 this.UpdateDisplayAlarmView(this.ParentForm.CurrentWeightData1, data); - if (data.JudgmentStatus == DataStore.JudgmentStatus.Empty) + if (data.JudgmentStatus == Define.E_JudgmentStatus.Empty) return; if (this.MainBarGraph != null) @@ -717,7 +717,7 @@ namespace ITC81DB_2.Forms } else { - this.CurrentDisplay = DataStore.MainDisplayStore.BarGraph; + this.CurrentDisplay = Define.E_MainDisplayStore.BarGraph; this.DisplayBottomMain(this.CurrentDisplay); } @@ -727,7 +727,7 @@ namespace ITC81DB_2.Forms buttons[i].Visible = true; } } - public void UpdateDisplayMenuButton(DataStore.MainDisplayStore main) + public void UpdateDisplayMenuButton(Define.E_MainDisplayStore main) { this.buttonStop.ButtonUp(); this.buttonStartMenu.ButtonUp(); @@ -739,27 +739,27 @@ namespace ITC81DB_2.Forms switch (main) { - case DataStore.MainDisplayStore.SubMenu: + case Define.E_MainDisplayStore.SubMenu: if (this.buttonStartMenu.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonStartMenu.ButtonDown(); break; - case DataStore.MainDisplayStore.BarGraph: + case Define.E_MainDisplayStore.BarGraph: if (this.buttonBargraph.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonBargraph.ButtonDown(); break; - case DataStore.MainDisplayStore.LineGraph: + case Define.E_MainDisplayStore.LineGraph: if (this.buttonLinegraph.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonLinegraph.ButtonDown(); break; - case DataStore.MainDisplayStore.List: + case Define.E_MainDisplayStore.List: if (this.buttonList.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonList.ButtonDown(); break; - case DataStore.MainDisplayStore.DataStat: + case Define.E_MainDisplayStore.DataStat: if (this.buttonDataStat.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonDataStat.ButtonDown(); break; - case DataStore.MainDisplayStore.Feedback: + case Define.E_MainDisplayStore.Feedback: if (this.buttonFeedback.ButtonStatus != SmartButton.BUTSTATUS.DOWN) this.buttonFeedback.ButtonDown(); break; @@ -767,37 +767,37 @@ namespace ITC81DB_2.Forms break; } } - public void DisplayBottomMain(DataStore.MainDisplayStore main) + public void DisplayBottomMain(Define.E_MainDisplayStore main) { this.UpdateDisplayMenuButton(main); switch (main) { - case DataStore.MainDisplayStore.SubMenu: + case Define.E_MainDisplayStore.SubMenu: this.MainSubMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainSubMenu.BringToFront(); this.MainWeightScreen.BringToFront(); break; - case DataStore.MainDisplayStore.BarGraph: + case Define.E_MainDisplayStore.BarGraph: this.MainBarGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainBarGraph.BringToFront(); break; - case DataStore.MainDisplayStore.LineGraph: + case Define.E_MainDisplayStore.LineGraph: this.MainLineGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainLineGraph.BringToFront(); this.MainWeightScreen.BringToFront(); break; - case DataStore.MainDisplayStore.List: + case Define.E_MainDisplayStore.List: this.MainList.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainList.BringToFront(); this.MainWeightScreen.BringToFront(); break; - case DataStore.MainDisplayStore.DataStat: + case Define.E_MainDisplayStore.DataStat: this.MainDataStatistics.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainDataStatistics.BringToFront(); this.MainWeightScreen.BringToFront(); break; - case DataStore.MainDisplayStore.Feedback: + case Define.E_MainDisplayStore.Feedback: this.MainFeedback.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.MainFeedback.BringToFront(); this.MainWeightScreen.BringToFront(); @@ -818,8 +818,8 @@ namespace ITC81DB_2.Forms public void DisplayRefresh(SystemStatus status) { - this.ParentForm.CurrentSystemStatus.CurrentDisplay = DataStore.DisplayStore.MainDisplay; - this.ParentForm.SetDisplayMode(DataStore.DisplayMode.Normal); + this.ParentForm.CurrentSystemStatus.CurrentDisplay = Define.E_DisplayStore.MainDisplay; + this.ParentForm.SetDisplayMode(Define.E_DisplayMode.Normal); this.UpdateDisplayUser(status); this.UpdateIcomDisplay(); @@ -827,11 +827,11 @@ namespace ITC81DB_2.Forms if (this.ParentForm.SystemConfig1.EquipmentType == 4) this.buttonConveyorUpDown.ButtonUp(); - if (this.CurrentDisplay == DataStore.MainDisplayStore.Feedback) + if (this.CurrentDisplay == Define.E_MainDisplayStore.Feedback) { if (this.MainFeedback.IsUsingFeedback() == false) { - this.CurrentDisplay = DataStore.MainDisplayStore.BarGraph; + this.CurrentDisplay = Define.E_MainDisplayStore.BarGraph; this.DisplayBottomMain(this.CurrentDisplay); } } @@ -1005,7 +1005,7 @@ namespace ITC81DB_2.Forms } private void buttonUser_Click(object sender, EventArgs e) { - if (this.ParentForm.CurrentSystemStatus.CurrentUser.Group == DataStore.UserGroup.LogOff) + if (this.ParentForm.CurrentSystemStatus.CurrentUser.Group == Define.E_UserGroup.LogOff) { DialogFormLogOn logOn = new DialogFormLogOn(this.ParentForm, this.ParentForm.SystemConfig1.Language); if (logOn.ShowDialog() == DialogResult.OK) @@ -1015,19 +1015,19 @@ namespace ITC81DB_2.Forms switch (this.CurrentDisplay) { - case DataStore.MainDisplayStore.SubMenu: + case Define.E_MainDisplayStore.SubMenu: this.MainSubMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MainDisplayStore.BarGraph: + case Define.E_MainDisplayStore.BarGraph: this.MainBarGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MainDisplayStore.LineGraph: + case Define.E_MainDisplayStore.LineGraph: this.MainLineGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MainDisplayStore.List: + case Define.E_MainDisplayStore.List: this.MainList.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MainDisplayStore.DataStat: + case Define.E_MainDisplayStore.DataStat: this.MainDataStatistics.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; default: @@ -1044,26 +1044,26 @@ namespace ITC81DB_2.Forms DialogFormYesNo msg = new DialogFormYesNo(this.ParentForm.SystemConfig1.Language, 12); if (msg.ShowDialog() == DialogResult.Yes) { - this.ParentForm.CurrentSystemStatus.CurrentUser.Group = DataStore.UserGroup.LogOff; + this.ParentForm.CurrentSystemStatus.CurrentUser.Group = Define.E_UserGroup.LogOff; this.buttonUser.ButtonUp(); this.DisplayRefresh(this.ParentForm.CurrentSystemStatus); switch (this.CurrentDisplay) { - case DataStore.MainDisplayStore.SubMenu: + case Define.E_MainDisplayStore.SubMenu: this.MainSubMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MainDisplayStore.BarGraph: + case Define.E_MainDisplayStore.BarGraph: this.MainBarGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MainDisplayStore.LineGraph: + case Define.E_MainDisplayStore.LineGraph: this.MainLineGraph.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MainDisplayStore.List: + case Define.E_MainDisplayStore.List: this.MainList.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MainDisplayStore.DataStat: + case Define.E_MainDisplayStore.DataStat: this.MainDataStatistics.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; default: @@ -1075,9 +1075,9 @@ namespace ITC81DB_2.Forms private void buttonWeightInputMode_Click(object sender, EventArgs e) { if (this.buttonWeightInputMode.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CurrentSystemStatus.CurrentWeightInputMode = DataStore.WeightInputMode.Deviation; + this.ParentForm.CurrentSystemStatus.CurrentWeightInputMode = Define.E_WeightInputMode.Deviation; else - this.ParentForm.CurrentSystemStatus.CurrentWeightInputMode = DataStore.WeightInputMode.Weight; + this.ParentForm.CurrentSystemStatus.CurrentWeightInputMode = Define.E_WeightInputMode.Weight; this.UpdateCurrentProductDisplay(this.ParentForm.CurrentSystemStatus.Equipment, this.ParentForm.CurrentProductItem1, this.ParentForm.CurrentProductItem2, this.ParentForm.CurrentWeightData1, this.ParentForm.CurrentWeightData2); @@ -1086,17 +1086,17 @@ namespace ITC81DB_2.Forms { if (this.ParentForm.SystemConfig1.IsLogin == false) { - if (this.ParentForm.CurrentSystemStatus.Equipment == DataStore.EquipmentStatus.Stop) + if (this.ParentForm.CurrentSystemStatus.Equipment == Define.E_EquipmentStatus.Stop) { - ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormMenu); + ((FormMain)(Owner)).smartForm.Show((int)Define.E_FormStore.FormMenu); this.ParentForm.ChildFormMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus); } } else { - if (this.ParentForm.CurrentSystemStatus.Equipment == DataStore.EquipmentStatus.Stop) + if (this.ParentForm.CurrentSystemStatus.Equipment == Define.E_EquipmentStatus.Stop) { - ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormMenu); + ((FormMain)(Owner)).smartForm.Show((int)Define.E_FormStore.FormMenu); this.ParentForm.ChildFormMenu.DisplayRefresh(this.ParentForm.CurrentSystemStatus); } } @@ -1104,43 +1104,43 @@ namespace ITC81DB_2.Forms private void buttonStop_Click(object sender, EventArgs e) { - this.CurrentDisplay = DataStore.MainDisplayStore.BarGraph; + this.CurrentDisplay = Define.E_MainDisplayStore.BarGraph; this.DisplayBottomMain(this.CurrentDisplay); } private void buttonBargraph_Click(object sender, EventArgs e) { - this.CurrentDisplay = DataStore.MainDisplayStore.BarGraph; + this.CurrentDisplay = Define.E_MainDisplayStore.BarGraph; this.DisplayBottomMain(this.CurrentDisplay); } private void buttonLinegraph_Click(object sender, EventArgs e) { - this.CurrentDisplay = DataStore.MainDisplayStore.LineGraph; + this.CurrentDisplay = Define.E_MainDisplayStore.LineGraph; this.DisplayBottomMain(this.CurrentDisplay); } private void buttonList_Click(object sender, EventArgs e) { - this.CurrentDisplay = DataStore.MainDisplayStore.List; + this.CurrentDisplay = Define.E_MainDisplayStore.List; this.DisplayBottomMain(this.CurrentDisplay); } private void buttonDataStat_Click(object sender, EventArgs e) { - this.CurrentDisplay = DataStore.MainDisplayStore.DataStat; + this.CurrentDisplay = Define.E_MainDisplayStore.DataStat; this.DisplayBottomMain(this.CurrentDisplay); } private void buttonStartMenu_Click(object sender, EventArgs e) { - this.CurrentDisplay = DataStore.MainDisplayStore.SubMenu; + this.CurrentDisplay = Define.E_MainDisplayStore.SubMenu; this.DisplayBottomMain(this.CurrentDisplay); } private void buttonFeedback_Click(object sender, EventArgs e) { - this.CurrentDisplay = DataStore.MainDisplayStore.Feedback; + this.CurrentDisplay = Define.E_MainDisplayStore.Feedback; this.DisplayBottomMain(this.CurrentDisplay); } diff --git a/ITC81DB_2/Forms/FormMenu.cs b/ITC81DB_2/Forms/FormMenu.cs index 971dd5f..03a71d9 100644 --- a/ITC81DB_2/Forms/FormMenu.cs +++ b/ITC81DB_2/Forms/FormMenu.cs @@ -20,7 +20,7 @@ namespace ITC81DB_2.Forms #region Field private FormMain m_ParentForm; - private DataStore.MenuSide SelectedSideMenu; + private Define.E_MenuSide SelectedSideMenu; private Collection CollectionButtonMenu; // 기본설정 @@ -85,7 +85,7 @@ namespace ITC81DB_2.Forms { Class1 images = new Class1(); - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.English) { this.buttonBasic.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMenuDefaultDisable)); this.buttonBasic.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMenuDefaultDown)); @@ -103,7 +103,7 @@ namespace ITC81DB_2.Forms this.buttonInformation.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMenuInformationDown)); this.buttonInformation.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engFormMenuInformationUp)); } - else if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + else if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) { this.buttonBasic.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnFormMenuDefaultDisable)); this.buttonBasic.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnFormMenuDefaultDown)); @@ -121,7 +121,7 @@ namespace ITC81DB_2.Forms this.buttonInformation.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnFormMenuInformationDown)); this.buttonInformation.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnFormMenuInformationUp)); } - else if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) { this.buttonBasic.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnFormMenuDefaultDisable)); this.buttonBasic.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.spnFormMenuDefaultDown)); @@ -160,7 +160,7 @@ namespace ITC81DB_2.Forms } private void DefaultSetting() { - this.SelectedSideMenu = DataStore.MenuSide.Basic; + this.SelectedSideMenu = Define.E_MenuSide.Basic; this.CollectionButtonMenu = new Collection(); this.CollectionButtonMenu.Clear(); @@ -309,19 +309,19 @@ namespace ITC81DB_2.Forms switch (this.SelectedSideMenu) { - case DataStore.MenuSide.Basic: + case Define.E_MenuSide.Basic: this.bottomBasic.CurrentControlEnable(enable); break; - case DataStore.MenuSide.Configuration: + case Define.E_MenuSide.Configuration: this.bottomConfiguration.CurrentControlEnable(enable); break; - case DataStore.MenuSide.System: + case Define.E_MenuSide.System: this.bottomSystem.CurrentControlEnable(enable); break; - case DataStore.MenuSide.Equipment: + case Define.E_MenuSide.Equipment: this.bottomEquipment.CurrentControlEnable(enable); break; - case DataStore.MenuSide.Information: + case Define.E_MenuSide.Information: this.bottomInformation.CurrentControlEnable(enable); break; default: @@ -334,11 +334,11 @@ namespace ITC81DB_2.Forms switch (user.Group) { - case DataStore.UserGroup.LogOff: + case Define.E_UserGroup.LogOff: id = ""; - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) group = "关闭"; - else if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) group = "Apagado"; else group = "Off"; @@ -352,11 +352,11 @@ namespace ITC81DB_2.Forms this.buttonEquipment.Enabled = false; this.buttonInformation.Enabled = true; break; - case DataStore.UserGroup.Level1Operator: + case Define.E_UserGroup.Level1Operator: id = user.ID; - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) group = "级别1"; - else if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) group = "Nivel 1"; else group = "Level1"; @@ -370,11 +370,11 @@ namespace ITC81DB_2.Forms this.buttonEquipment.Enabled = false; this.buttonInformation.Enabled = true; break; - case DataStore.UserGroup.Level2Engineer: + case Define.E_UserGroup.Level2Engineer: id = user.ID; - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) group = "级别2"; - else if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) group = "Nivel 2"; else group = "Level2"; @@ -388,11 +388,11 @@ namespace ITC81DB_2.Forms this.buttonEquipment.Enabled = false; this.buttonInformation.Enabled = true; break; - case DataStore.UserGroup.Level3Manager: + case Define.E_UserGroup.Level3Manager: id = user.ID; - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) group = "级别3"; - else if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) group = "Nivel 3"; else group = "Level3"; @@ -406,11 +406,11 @@ namespace ITC81DB_2.Forms this.buttonEquipment.Enabled = true; this.buttonInformation.Enabled = true; break; - case DataStore.UserGroup.Level4Developer: + case Define.E_UserGroup.Level4Developer: id = user.ID; - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) group = "级别4"; - else if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) group = "Nivel 4"; else group = "Level4"; @@ -426,9 +426,9 @@ namespace ITC81DB_2.Forms break; default: id = ""; - if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) + if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Chinese) group = "关闭"; - else if (this.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) + else if (this.ParentForm.SystemConfig1.Language == Define.E_LanguageID.Spanish) group = "Apagado"; else group = "Off"; @@ -449,20 +449,20 @@ namespace ITC81DB_2.Forms if (this.labelUserID.Text != id) this.labelUserID.Text = id; } - private bool EquipmentRun(DataStore.DisplayStore currentDisplay) + private bool EquipmentRun(Define.E_DisplayStore currentDisplay) { - if (currentDisplay == DataStore.DisplayStore.SystemJudgmentSetting - || currentDisplay == DataStore.DisplayStore.SystemSorterSetting) + if (currentDisplay == Define.E_DisplayStore.SystemJudgmentSetting + || currentDisplay == Define.E_DisplayStore.SystemSorterSetting) return true; else return false; } - private void DisplaySideMenu(DataStore.MenuSide menu) + private void DisplaySideMenu(Define.E_MenuSide menu) { switch (menu) { - case DataStore.MenuSide.Basic: + case Define.E_MenuSide.Basic: this.bottomBasic.Visible = true; this.bottomConfiguration.Visible = false; this.bottomSystem.Visible = false; @@ -471,7 +471,7 @@ namespace ITC81DB_2.Forms this.bottomBasic.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MenuSide.Configuration: + case Define.E_MenuSide.Configuration: this.bottomBasic.Visible = false; this.bottomConfiguration.Visible = true; this.bottomSystem.Visible = false; @@ -480,7 +480,7 @@ namespace ITC81DB_2.Forms this.bottomConfiguration.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MenuSide.System: + case Define.E_MenuSide.System: this.bottomBasic.Visible = false; this.bottomConfiguration.Visible = false; this.bottomSystem.Visible = true; @@ -489,7 +489,7 @@ namespace ITC81DB_2.Forms this.bottomSystem.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MenuSide.Equipment: + case Define.E_MenuSide.Equipment: this.bottomBasic.Visible = false; this.bottomConfiguration.Visible = false; this.bottomSystem.Visible = false; @@ -498,7 +498,7 @@ namespace ITC81DB_2.Forms this.bottomEquipment.DisplayRefresh(this.ParentForm.CurrentSystemStatus); break; - case DataStore.MenuSide.Information: + case Define.E_MenuSide.Information: this.bottomBasic.Visible = false; this.bottomConfiguration.Visible = false; this.bottomSystem.Visible = false; @@ -511,11 +511,11 @@ namespace ITC81DB_2.Forms break; } } - public void DisplayHiddenMenu(DataStore.DisplayStore menu, SystemConfigurationItem systemConfig) + public void DisplayHiddenMenu(Define.E_DisplayStore menu, SystemConfigurationItem systemConfig) { switch (menu) { - case DataStore.DisplayStore.EquipHelp: + case Define.E_DisplayStore.EquipHelp: this.CenterEquipHelp.DisplayHiddenMenu(true); this.bottomEquipment.DisplayHiddenMenu(true); break; @@ -523,27 +523,27 @@ namespace ITC81DB_2.Forms break; } } - public void DisplayBottomBasic(DataStore.MenuBottomBasic menu) + public void DisplayBottomBasic(Define.E_MenuBottomBasic menu) { switch (menu) { - case DataStore.MenuBottomBasic.DataBackup: + case Define.E_MenuBottomBasic.DataBackup: this.CenterBasicDataBackup.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterBasicDataBackup.BringToFront(); break; - case DataStore.MenuBottomBasic.DataStatistics: + case Define.E_MenuBottomBasic.DataStatistics: this.CenterBasicDataStatistics.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterBasicDataStatistics.BringToFront(); break; - case DataStore.MenuBottomBasic.Help: + case Define.E_MenuBottomBasic.Help: this.CenterBasicHelp.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterBasicHelp.BringToFront(); break; - case DataStore.MenuBottomBasic.Product: + case Define.E_MenuBottomBasic.Product: this.CenterBasicProduct.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterBasicProduct.BringToFront(); break; - case DataStore.MenuBottomBasic.Time: + case Define.E_MenuBottomBasic.Time: this.CenterBasicTime.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterBasicTime.BringToFront(); break; @@ -553,19 +553,19 @@ namespace ITC81DB_2.Forms this.bottomBasic.UpdateDisplayMenuButton(menu); } - public void DisplayBottomConfiguration(DataStore.MenuBottomConfiguration menu) + public void DisplayBottomConfiguration(Define.E_MenuBottomConfiguration menu) { switch (menu) { - case DataStore.MenuBottomConfiguration.Communication: + case Define.E_MenuBottomConfiguration.Communication: this.CenterConfiCommunication.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterConfiCommunication.BringToFront(); break; - case DataStore.MenuBottomConfiguration.Help: + case Define.E_MenuBottomConfiguration.Help: this.CenterConfiHelp.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterConfiHelp.BringToFront(); break; - case DataStore.MenuBottomConfiguration.OptionBoard: + case Define.E_MenuBottomConfiguration.OptionBoard: this.CenterConfiOptionBoard.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterConfiOptionBoard.BringToFront(); break; @@ -575,31 +575,31 @@ namespace ITC81DB_2.Forms this.bottomConfiguration.UpdateDisplayMenuButton(menu); } - public void DisplayBottomSystem(DataStore.MenuBottomSystem menu) + public void DisplayBottomSystem(Define.E_MenuBottomSystem menu) { switch (menu) { - case DataStore.MenuBottomSystem.Calibration: + case Define.E_MenuBottomSystem.Calibration: this.CenterSystemCalibration.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterSystemCalibration.BringToFront(); break; - case DataStore.MenuBottomSystem.AutoZero: + case Define.E_MenuBottomSystem.AutoZero: this.CenterSystemAutoZero.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterSystemAutoZero.BringToFront(); break; - case DataStore.MenuBottomSystem.Help: + case Define.E_MenuBottomSystem.Help: this.CenterSystemHelp.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterSystemHelp.BringToFront(); break; - case DataStore.MenuBottomSystem.IOTest: + case Define.E_MenuBottomSystem.IOTest: this.CenterSystemIOTest.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterSystemIOTest.BringToFront(); break; - case DataStore.MenuBottomSystem.JudgmentSetting: + case Define.E_MenuBottomSystem.JudgmentSetting: this.CenterSystemJudgmentSetting.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterSystemJudgmentSetting.BringToFront(); break; - case DataStore.MenuBottomSystem.SorterSetting: + case Define.E_MenuBottomSystem.SorterSetting: this.CenterSystemSorterSetting.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterSystemSorterSetting.BringToFront(); break; @@ -609,34 +609,34 @@ namespace ITC81DB_2.Forms this.bottomSystem.UpdateDisplayMenuButton(menu); } - public void DisplayBottomEquipment(DataStore.MenuBottomEquipment menu) + public void DisplayBottomEquipment(Define.E_MenuBottomEquipment menu) { this.bottomEquipment.DisplayHiddenMenu(false); switch (menu) { - case DataStore.MenuBottomEquipment.Help: + case Define.E_MenuBottomEquipment.Help: this.CenterEquipHelp.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterEquipHelp.BringToFront(); break; - case DataStore.MenuBottomEquipment.Initialize: + case Define.E_MenuBottomEquipment.Initialize: this.Refresh(); this.CenterEquipInitialize.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterEquipInitialize.BringToFront(); break; - case DataStore.MenuBottomEquipment.Update: + case Define.E_MenuBottomEquipment.Update: this.CenterEquipUpdate.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterEquipUpdate.BringToFront(); break; - case DataStore.MenuBottomEquipment.FunctionSetting: + case Define.E_MenuBottomEquipment.FunctionSetting: this.CenterEquipFunctionSetting.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterEquipFunctionSetting.BringToFront(); break; - case DataStore.MenuBottomEquipment.User: + case Define.E_MenuBottomEquipment.User: this.CenterEquipUser.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterEquipUser.BringToFront(); break; - case DataStore.MenuBottomEquipment.Engineer: + case Define.E_MenuBottomEquipment.Engineer: this.bottomEquipment.DisplayHiddenMenu(true); this.CenterEquipEngineer.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterEquipEngineer.BringToFront(); @@ -647,19 +647,19 @@ namespace ITC81DB_2.Forms this.bottomEquipment.UpdateDisplayMenuButton(menu); } - public void DisplayBottomInformation(DataStore.MenuBottomInformation menu) + public void DisplayBottomInformation(Define.E_MenuBottomInformation menu) { switch (menu) { - case DataStore.MenuBottomInformation.Help: + case Define.E_MenuBottomInformation.Help: this.CenterInforHelp.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterInforHelp.BringToFront(); break; - case DataStore.MenuBottomInformation.SystemInformation: + case Define.E_MenuBottomInformation.SystemInformation: this.CenterInforSystemInformation.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterInforSystemInformation.BringToFront(); break; - case DataStore.MenuBottomInformation.AS: + case Define.E_MenuBottomInformation.AS: this.CenterInforAS.DisplayRefresh(this.ParentForm.CurrentSystemStatus); this.CenterInforAS.BringToFront(); break; @@ -668,9 +668,9 @@ namespace ITC81DB_2.Forms } this.bottomInformation.UpdateDisplayMenuButton(menu); } - public void UpdateEquipmentStatusDisplay(DataStore.EquipmentStatus status) + public void UpdateEquipmentStatusDisplay(Define.E_EquipmentStatus status) { - if (status == DataStore.EquipmentStatus.Start) + if (status == Define.E_EquipmentStatus.Start) { this.buttonBasic.Enabled = false; this.buttonConfiguration.Enabled = false; @@ -688,9 +688,9 @@ namespace ITC81DB_2.Forms this.pictureBoxStart.Visible = true; this.pictureBoxStop.Visible = false; - if (this.ParentForm.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.SystemJudgmentSetting) + if (this.ParentForm.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.SystemJudgmentSetting) this.CenterSystemJudgmentSetting.UpdateEquipmentStatusDisplay(status); - else if (this.ParentForm.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.SystemSorterSetting) + else if (this.ParentForm.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.SystemSorterSetting) this.CenterSystemSorterSetting.UpdateEquipmentStatusDisplay(status); } else @@ -711,9 +711,9 @@ namespace ITC81DB_2.Forms this.pictureBoxStart.Visible = false; this.pictureBoxStop.Visible = true; - if (this.ParentForm.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.SystemJudgmentSetting) + if (this.ParentForm.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.SystemJudgmentSetting) this.CenterSystemJudgmentSetting.UpdateEquipmentStatusDisplay(status); - else if (this.ParentForm.CurrentSystemStatus.CurrentDisplay == DataStore.DisplayStore.SystemSorterSetting) + else if (this.ParentForm.CurrentSystemStatus.CurrentDisplay == Define.E_DisplayStore.SystemSorterSetting) this.CenterSystemSorterSetting.UpdateEquipmentStatusDisplay(status); } } @@ -722,77 +722,77 @@ namespace ITC81DB_2.Forms { switch (this.ParentForm.SystemConfig1.Language) { - case DataStore.LanguageID.English: + case Define.E_LanguageID.English: #region 영문 switch (status.CurrentDisplay) { - case DataStore.DisplayStore.BasicDataBackup: + case Define.E_DisplayStore.BasicDataBackup: this.labelTitleRoot.Text = "Basic > Data backup"; break; - case DataStore.DisplayStore.BasicDataStatistics: + case Define.E_DisplayStore.BasicDataStatistics: this.labelTitleRoot.Text = "Basic > Data statistics"; break; - case DataStore.DisplayStore.BasicHelp: + case Define.E_DisplayStore.BasicHelp: this.labelTitleRoot.Text = "Basic > Help"; break; - case DataStore.DisplayStore.BasicProduct: + case Define.E_DisplayStore.BasicProduct: this.labelTitleRoot.Text = "Basic > Product settings"; break; - case DataStore.DisplayStore.BasicTime: + case Define.E_DisplayStore.BasicTime: this.labelTitleRoot.Text = "Basic > Time setting"; break; - case DataStore.DisplayStore.ConfiCommunication: + case Define.E_DisplayStore.ConfiCommunication: this.labelTitleRoot.Text = "Configuration > Serial"; break; - case DataStore.DisplayStore.ConfiHelp: + case Define.E_DisplayStore.ConfiHelp: this.labelTitleRoot.Text = "Configuration > Help"; break; - case DataStore.DisplayStore.ConfiOptionBoard: + case Define.E_DisplayStore.ConfiOptionBoard: this.labelTitleRoot.Text = "Configuration > Option board"; break; - case DataStore.DisplayStore.EquipFuctionSetting: + case Define.E_DisplayStore.EquipFuctionSetting: this.labelTitleRoot.Text = "Equipment > Feature Settings"; break; - case DataStore.DisplayStore.EquipHelp: + case Define.E_DisplayStore.EquipHelp: this.labelTitleRoot.Text = "Equipment > Help"; break; - case DataStore.DisplayStore.EquipInitialize: + case Define.E_DisplayStore.EquipInitialize: this.labelTitleRoot.Text = "Equipment > Initialization"; break; - case DataStore.DisplayStore.EquipUpdate: + case Define.E_DisplayStore.EquipUpdate: this.labelTitleRoot.Text = "Equipment > Update"; break; - case DataStore.DisplayStore.EquipUser: + case Define.E_DisplayStore.EquipUser: this.labelTitleRoot.Text = "Equipment > User Settings"; break; - case DataStore.DisplayStore.EquipEngineer: + case Define.E_DisplayStore.EquipEngineer: this.labelTitleRoot.Text = "Equipment > Engineer Settings"; break; - case DataStore.DisplayStore.InforAS: + case Define.E_DisplayStore.InforAS: this.labelTitleRoot.Text = "Information > A/S"; break; - case DataStore.DisplayStore.InforHelp: + case Define.E_DisplayStore.InforHelp: this.labelTitleRoot.Text = "Information > Help"; break; - case DataStore.DisplayStore.InforSystem: + case Define.E_DisplayStore.InforSystem: this.labelTitleRoot.Text = "Information > Information"; break; - case DataStore.DisplayStore.SystemAutoZero: + case Define.E_DisplayStore.SystemAutoZero: this.labelTitleRoot.Text = "System > Auto zero"; break; - case DataStore.DisplayStore.SystemCalibration: + case Define.E_DisplayStore.SystemCalibration: this.labelTitleRoot.Text = "System > Calibration"; break; - case DataStore.DisplayStore.SystemHelp: + case Define.E_DisplayStore.SystemHelp: this.labelTitleRoot.Text = "System > Help"; break; - case DataStore.DisplayStore.SystemIOTest: + case Define.E_DisplayStore.SystemIOTest: this.labelTitleRoot.Text = "System > I/O test"; break; - case DataStore.DisplayStore.SystemJudgmentSetting: + case Define.E_DisplayStore.SystemJudgmentSetting: this.labelTitleRoot.Text = "System > Judgment"; break; - case DataStore.DisplayStore.SystemSorterSetting: + case Define.E_DisplayStore.SystemSorterSetting: this.labelTitleRoot.Text = "System > Sorter settings"; break; default: @@ -800,74 +800,74 @@ namespace ITC81DB_2.Forms } #endregion break; - case DataStore.LanguageID.Chinese: + case Define.E_LanguageID.Chinese: #region 중문 switch (status.CurrentDisplay) { - case DataStore.DisplayStore.BasicDataBackup: + case Define.E_DisplayStore.BasicDataBackup: this.labelTitleRoot.Text = "基本 > 数据备份"; break; - case DataStore.DisplayStore.BasicDataStatistics: + case Define.E_DisplayStore.BasicDataStatistics: this.labelTitleRoot.Text = "基本 > 数据统计"; break; - case DataStore.DisplayStore.BasicHelp: + case Define.E_DisplayStore.BasicHelp: this.labelTitleRoot.Text = "基本 > 帮助"; break; - case DataStore.DisplayStore.BasicProduct: + case Define.E_DisplayStore.BasicProduct: this.labelTitleRoot.Text = "基本 > 产品设置"; break; - case DataStore.DisplayStore.BasicTime: + case Define.E_DisplayStore.BasicTime: this.labelTitleRoot.Text = "基本 > 时间设定"; break; - case DataStore.DisplayStore.ConfiCommunication: + case Define.E_DisplayStore.ConfiCommunication: this.labelTitleRoot.Text = "选项 > 串行端口"; break; - case DataStore.DisplayStore.ConfiHelp: + case Define.E_DisplayStore.ConfiHelp: this.labelTitleRoot.Text = "选项 > 帮助"; break; - case DataStore.DisplayStore.ConfiOptionBoard: + case Define.E_DisplayStore.ConfiOptionBoard: this.labelTitleRoot.Text = "选项 > 选项板"; break; - case DataStore.DisplayStore.EquipFuctionSetting: + case Define.E_DisplayStore.EquipFuctionSetting: this.labelTitleRoot.Text = "设备 > 功能设定"; break; - case DataStore.DisplayStore.EquipHelp: + case Define.E_DisplayStore.EquipHelp: this.labelTitleRoot.Text = "设备 > 帮助"; break; - case DataStore.DisplayStore.EquipInitialize: + case Define.E_DisplayStore.EquipInitialize: this.labelTitleRoot.Text = "设备 > 工厂初期化"; break; - case DataStore.DisplayStore.EquipUpdate: + case Define.E_DisplayStore.EquipUpdate: this.labelTitleRoot.Text = "设备 > 更新"; break; - case DataStore.DisplayStore.EquipUser: + case Define.E_DisplayStore.EquipUser: this.labelTitleRoot.Text = "设备 > 用户设置"; break; - case DataStore.DisplayStore.EquipEngineer: + case Define.E_DisplayStore.EquipEngineer: this.labelTitleRoot.Text = "设备 > 工程师设置"; break; - case DataStore.DisplayStore.InforAS: + case Define.E_DisplayStore.InforAS: this.labelTitleRoot.Text = "信息 > A/S"; break; - case DataStore.DisplayStore.InforHelp: + case Define.E_DisplayStore.InforHelp: this.labelTitleRoot.Text = "信息 > 帮助"; break; - case DataStore.DisplayStore.InforSystem: + case Define.E_DisplayStore.InforSystem: this.labelTitleRoot.Text = "信息 > 系统信息"; break; - case DataStore.DisplayStore.SystemAutoZero: + case Define.E_DisplayStore.SystemAutoZero: this.labelTitleRoot.Text = "系统 > 自动零点跟踪"; break; - case DataStore.DisplayStore.SystemCalibration: + case Define.E_DisplayStore.SystemCalibration: this.labelTitleRoot.Text = "系统 > 校准"; break; - case DataStore.DisplayStore.SystemHelp: + case Define.E_DisplayStore.SystemHelp: this.labelTitleRoot.Text = "系统 > 帮助"; break; - case DataStore.DisplayStore.SystemIOTest: + case Define.E_DisplayStore.SystemIOTest: this.labelTitleRoot.Text = "系统 > I/O测试"; break; - case DataStore.DisplayStore.SystemSorterSetting: + case Define.E_DisplayStore.SystemSorterSetting: this.labelTitleRoot.Text = "系统 > 筛选设定"; break; default: @@ -875,77 +875,77 @@ namespace ITC81DB_2.Forms } #endregion break; - case DataStore.LanguageID.Spanish: + case Define.E_LanguageID.Spanish: #region 스페인어 switch (status.CurrentDisplay) { - case DataStore.DisplayStore.BasicDataBackup: + case Define.E_DisplayStore.BasicDataBackup: this.labelTitleRoot.Text = "Básico > Copia de seguridad"; break; - case DataStore.DisplayStore.BasicDataStatistics: + case Define.E_DisplayStore.BasicDataStatistics: this.labelTitleRoot.Text = "Básico > Estadistica de datos"; break; - case DataStore.DisplayStore.BasicHelp: + case Define.E_DisplayStore.BasicHelp: this.labelTitleRoot.Text = "Básico > Ayudar"; break; - case DataStore.DisplayStore.BasicProduct: + case Define.E_DisplayStore.BasicProduct: this.labelTitleRoot.Text = "Básico > Ajuste de producto"; break; - case DataStore.DisplayStore.BasicTime: + case Define.E_DisplayStore.BasicTime: this.labelTitleRoot.Text = "Básico > Ajuste de tiempo"; break; - case DataStore.DisplayStore.ConfiCommunication: + case Define.E_DisplayStore.ConfiCommunication: this.labelTitleRoot.Text = "Configuración > Serial"; break; - case DataStore.DisplayStore.ConfiHelp: + case Define.E_DisplayStore.ConfiHelp: this.labelTitleRoot.Text = "Configuración > Ayudar"; break; - case DataStore.DisplayStore.ConfiOptionBoard: + case Define.E_DisplayStore.ConfiOptionBoard: this.labelTitleRoot.Text = "Configuración > Tablero opcional"; break; - case DataStore.DisplayStore.EquipFuctionSetting: + case Define.E_DisplayStore.EquipFuctionSetting: this.labelTitleRoot.Text = "Equipos > Funciones"; break; - case DataStore.DisplayStore.EquipHelp: + case Define.E_DisplayStore.EquipHelp: this.labelTitleRoot.Text = "Equipos > Ayudar"; break; - case DataStore.DisplayStore.EquipInitialize: + case Define.E_DisplayStore.EquipInitialize: this.labelTitleRoot.Text = "Equipos > Inicializar"; break; - case DataStore.DisplayStore.EquipUpdate: + case Define.E_DisplayStore.EquipUpdate: this.labelTitleRoot.Text = "Equipos > Actualizar"; break; - case DataStore.DisplayStore.EquipUser: + case Define.E_DisplayStore.EquipUser: this.labelTitleRoot.Text = "Equipos > Usuario"; break; - case DataStore.DisplayStore.EquipEngineer: + case Define.E_DisplayStore.EquipEngineer: this.labelTitleRoot.Text = "Equipos > Ingeniería"; break; - case DataStore.DisplayStore.InforAS: + case Define.E_DisplayStore.InforAS: this.labelTitleRoot.Text = "Información > Servicio al Cliente"; break; - case DataStore.DisplayStore.InforHelp: + case Define.E_DisplayStore.InforHelp: this.labelTitleRoot.Text = "Información > Ayudar"; break; - case DataStore.DisplayStore.InforSystem: + case Define.E_DisplayStore.InforSystem: this.labelTitleRoot.Text = "Información > Información"; break; - case DataStore.DisplayStore.SystemAutoZero: + case Define.E_DisplayStore.SystemAutoZero: this.labelTitleRoot.Text = "Sistema > Seguimiento de cero"; break; - case DataStore.DisplayStore.SystemCalibration: + case Define.E_DisplayStore.SystemCalibration: this.labelTitleRoot.Text = "Sistema > Calibración"; break; - case DataStore.DisplayStore.SystemHelp: + case Define.E_DisplayStore.SystemHelp: this.labelTitleRoot.Text = "Sistema > Ayudar"; break; - case DataStore.DisplayStore.SystemIOTest: + case Define.E_DisplayStore.SystemIOTest: this.labelTitleRoot.Text = "Sistema > Test I/O"; break; - case DataStore.DisplayStore.SystemJudgmentSetting: + case Define.E_DisplayStore.SystemJudgmentSetting: this.labelTitleRoot.Text = "Sistema > Dictar sentencia"; break; - case DataStore.DisplayStore.SystemSorterSetting: + case Define.E_DisplayStore.SystemSorterSetting: this.labelTitleRoot.Text = "Sistema > Clasificador"; break; default: @@ -957,73 +957,73 @@ namespace ITC81DB_2.Forms #region 한글 switch (status.CurrentDisplay) { - case DataStore.DisplayStore.BasicDataBackup: + case Define.E_DisplayStore.BasicDataBackup: this.labelTitleRoot.Text = "기본설정 > 데이터백업"; break; - case DataStore.DisplayStore.BasicDataStatistics: + case Define.E_DisplayStore.BasicDataStatistics: this.labelTitleRoot.Text = "기본설정 > 데이터집계"; break; - case DataStore.DisplayStore.BasicHelp: + case Define.E_DisplayStore.BasicHelp: this.labelTitleRoot.Text = "기본설정 > 도움말"; break; - case DataStore.DisplayStore.BasicProduct: + case Define.E_DisplayStore.BasicProduct: this.labelTitleRoot.Text = "기본설정 > 품목설정"; break; - case DataStore.DisplayStore.BasicTime: + case Define.E_DisplayStore.BasicTime: this.labelTitleRoot.Text = "기본설정 > 시간설정"; break; - case DataStore.DisplayStore.ConfiCommunication: + case Define.E_DisplayStore.ConfiCommunication: this.labelTitleRoot.Text = "환경설정 > 시리얼통신"; break; - case DataStore.DisplayStore.ConfiHelp: + case Define.E_DisplayStore.ConfiHelp: this.labelTitleRoot.Text = "환경설정 > 도움말"; break; - case DataStore.DisplayStore.ConfiOptionBoard: + case Define.E_DisplayStore.ConfiOptionBoard: this.labelTitleRoot.Text = "환경설정 > 옵션보드설정"; break; - case DataStore.DisplayStore.EquipFuctionSetting: + case Define.E_DisplayStore.EquipFuctionSetting: this.labelTitleRoot.Text = "장비설정 > 기능설정"; break; - case DataStore.DisplayStore.EquipHelp: + case Define.E_DisplayStore.EquipHelp: this.labelTitleRoot.Text = "장비설정 > 도움말"; break; - case DataStore.DisplayStore.EquipInitialize: + case Define.E_DisplayStore.EquipInitialize: this.labelTitleRoot.Text = "장비설정 > 공장초기화"; break; - case DataStore.DisplayStore.EquipUpdate: + case Define.E_DisplayStore.EquipUpdate: this.labelTitleRoot.Text = "장비설정 > 업데이트"; break; - case DataStore.DisplayStore.EquipUser: + case Define.E_DisplayStore.EquipUser: this.labelTitleRoot.Text = "장비설정 > 유저설정"; break; - case DataStore.DisplayStore.EquipEngineer: + case Define.E_DisplayStore.EquipEngineer: this.labelTitleRoot.Text = "장비설정 > 엔지니어설정"; break; - case DataStore.DisplayStore.InforAS: + case Define.E_DisplayStore.InforAS: this.labelTitleRoot.Text = "정보 > A/S"; break; - case DataStore.DisplayStore.InforHelp: + case Define.E_DisplayStore.InforHelp: this.labelTitleRoot.Text = "정보 > 도움말"; break; - case DataStore.DisplayStore.InforSystem: + case Define.E_DisplayStore.InforSystem: this.labelTitleRoot.Text = "정보 > 시스템정보"; break; - case DataStore.DisplayStore.SystemAutoZero: + case Define.E_DisplayStore.SystemAutoZero: this.labelTitleRoot.Text = "시스템설정 > 자동영점"; break; - case DataStore.DisplayStore.SystemCalibration: + case Define.E_DisplayStore.SystemCalibration: this.labelTitleRoot.Text = "시스템설정 > 중량조정"; break; - case DataStore.DisplayStore.SystemHelp: + case Define.E_DisplayStore.SystemHelp: this.labelTitleRoot.Text = "시스템설정 > 도움말"; break; - case DataStore.DisplayStore.SystemIOTest: + case Define.E_DisplayStore.SystemIOTest: this.labelTitleRoot.Text = "시스템설정 > I/O테스트"; break; - case DataStore.DisplayStore.SystemJudgmentSetting: + case Define.E_DisplayStore.SystemJudgmentSetting: this.labelTitleRoot.Text = "시스템설정 > 판정설정"; break; - case DataStore.DisplayStore.SystemSorterSetting: + case Define.E_DisplayStore.SystemSorterSetting: this.labelTitleRoot.Text = "시스템설정 > 선별기설정"; break; default: @@ -1053,7 +1053,7 @@ namespace ITC81DB_2.Forms this.buttonEquipment.ButtonUp(); this.buttonInformation.ButtonUp(); - this.SelectedSideMenu = DataStore.MenuSide.Basic; + this.SelectedSideMenu = Define.E_MenuSide.Basic; this.DisplaySideMenu(this.SelectedSideMenu); } @@ -1069,27 +1069,27 @@ namespace ITC81DB_2.Forms #region Event Handler private void buttonBasic_Click(object sender, EventArgs e) { - this.SelectedSideMenu = DataStore.MenuSide.Basic; + this.SelectedSideMenu = Define.E_MenuSide.Basic; this.DisplaySideMenu(this.SelectedSideMenu); } private void buttonConfiguration_Click(object sender, EventArgs e) { - this.SelectedSideMenu = DataStore.MenuSide.Configuration; + this.SelectedSideMenu = Define.E_MenuSide.Configuration; this.DisplaySideMenu(this.SelectedSideMenu); } private void buttonSystem_Click(object sender, EventArgs e) { - this.SelectedSideMenu = DataStore.MenuSide.System; + this.SelectedSideMenu = Define.E_MenuSide.System; this.DisplaySideMenu(this.SelectedSideMenu); } private void buttonEquipment_Click(object sender, EventArgs e) { - this.SelectedSideMenu = DataStore.MenuSide.Equipment; + this.SelectedSideMenu = Define.E_MenuSide.Equipment; this.DisplaySideMenu(this.SelectedSideMenu); } private void buttonInformation_Click(object sender, EventArgs e) { - this.SelectedSideMenu = DataStore.MenuSide.Information; + this.SelectedSideMenu = Define.E_MenuSide.Information; this.DisplaySideMenu(this.SelectedSideMenu); } @@ -1103,7 +1103,7 @@ namespace ITC81DB_2.Forms private void buttonMain_Click(object sender, EventArgs e) { this.ParentForm.ChildFormMainDisplay.DisplayRefresh(this.ParentForm.CurrentSystemStatus); - ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormMainDisplay); + ((FormMain)(Owner)).smartForm.Show((int)Define.E_FormStore.FormMainDisplay); } private void pictureBoxStop_Click(object sender, EventArgs e) diff --git a/ITC81DB_2/Helper.cs b/ITC81DB_2/Helper.cs index 278224f..ac4379e 100644 --- a/ITC81DB_2/Helper.cs +++ b/ITC81DB_2/Helper.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Collections.Generic; using System.Text; +using System.IO; namespace ITC81DB_2 { @@ -119,47 +120,47 @@ namespace ITC81DB_2 return sValue; } - public static DataStore.JudgmentStatus StringToJudgmentStatus(string value) + public static Define.E_JudgmentStatus StringToJudgmentStatus(string value) { if (value.Length != 2) - return DataStore.JudgmentStatus.Empty; + return Define.E_JudgmentStatus.Empty; if (value == "su") - return DataStore.JudgmentStatus.Under; + return Define.E_JudgmentStatus.Under; else if (value == "so") - return DataStore.JudgmentStatus.Over; + return Define.E_JudgmentStatus.Over; else if (value == "sp") - return DataStore.JudgmentStatus.Pass; + return Define.E_JudgmentStatus.Pass; else if (value == "sd" || value == "sD") - return DataStore.JudgmentStatus.Double; + return Define.E_JudgmentStatus.Double; else if (value == "sm") - return DataStore.JudgmentStatus.Metal; + return Define.E_JudgmentStatus.Metal; else if (value == "se") - return DataStore.JudgmentStatus.ExNg; + return Define.E_JudgmentStatus.ExNg; else - return DataStore.JudgmentStatus.Empty; + return Define.E_JudgmentStatus.Empty; } - public static DataStore.WeightStatus StringToWeightStatus(string value) + public static Define.E_WeightStatus StringToWeightStatus(string value) { if (value.Length != 2) - return DataStore.WeightStatus.Empty; + return Define.E_WeightStatus.Empty; if (value == "sn") - return DataStore.WeightStatus.WeightChange; + return Define.E_WeightStatus.WeightChange; else if (value == "sz") - return DataStore.WeightStatus.WeightZero; + return Define.E_WeightStatus.WeightZero; else if (value == "cn") - return DataStore.WeightStatus.CalNomal; + return Define.E_WeightStatus.CalNomal; else if (value == "cB") - return DataStore.WeightStatus.CalBalans; + return Define.E_WeightStatus.CalBalans; else if (value == "cb") - return DataStore.WeightStatus.CalStandby; + return Define.E_WeightStatus.CalStandby; else if (value == "cF") - return DataStore.WeightStatus.CalFinish; + return Define.E_WeightStatus.CalFinish; else if (value == "ce") - return DataStore.WeightStatus.CalError; + return Define.E_WeightStatus.CalError; else - return DataStore.WeightStatus.Empty; + return Define.E_WeightStatus.Empty; } /// @@ -260,5 +261,246 @@ namespace ITC81DB_2 else return "0000000"; } + + + /// + /// 16진수를 10진수로 변환(String to String) + /// + /// + /// + public static string HexToDec(string value) + { + return Convert.ToInt64(value, 16).ToString(); + } + + /// + /// 16진수를 2진수로 변환(String to String) + /// + /// + /// + public static string HexToBin(string value) + { + return Convert.ToString(Convert.ToInt64(value, 16), 2); + } + + /// + /// 10진수를 2진수로 변환(String to String) + /// + /// + /// + public static string DecToBin(string value) + { + return Convert.ToString(Convert.ToInt64(value), 2); + } + + /// + /// 2진수를 10진수로 변환(String to String) + /// + /// + /// + public static string BinToDec(string value) + { + return Convert.ToInt64(value, 2).ToString(); + } + + /// + /// 2진수를 16진수로 변환(String to String) + /// + /// + /// + public static string BinToHex(string value) + { + return Convert.ToString(Convert.ToInt32(value, 2), 16); + } + + /// + /// string(255 이하의 숫자 string)을 16진수로 변환하는 방법 + /// + /// 1자리 string + /// + public static byte StringToHex(string value) + { + try + { + int iValue = int.Parse(value); + + if (0 <= iValue && iValue < 256) + { + string temp = iValue.ToString("X"); + return Convert.ToByte(temp, 16); + } + else + return 0x00; + } + catch + { + return 0x00; + } + } + public static string StringToHexString(string strData) + { + string resultHex = string.Empty; + byte[] arr_byteStr = Encoding.Default.GetBytes(strData); + + foreach (byte byteStr in arr_byteStr) + resultHex += string.Format("{0:X2}", byteStr); + + return resultHex; + } + public static string ByteToHexString(byte[] array) + { + string resultHex = ""; + + foreach (byte byteStr in array) + resultHex += string.Format("{0:X2}", byteStr); + + return resultHex; + } + + /// + /// Remove Folder로 이동 + /// + /// Remove Folder로 이동할 폴더 + public static void MoveToRemoveFolder(string directory) + { + bool removeFolderCheck = false; + string currentFolderPath = "", removeFolderPath = ""; + + currentFolderPath = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase) + "\\"; + if (currentFolderPath.StartsWith("\\F") == true) + removeFolderPath = "Flash Disk\\RemoveFile\\"; + else + removeFolderPath = "SD Card\\RemoveFile\\"; + + FileInfo[] oldFiles; + DirectoryInfo[] oldDirectory; + DirectoryInfo dirOldFolder = new DirectoryInfo(directory); + DirectoryInfo dirFolderRemove = new DirectoryInfo(removeFolderPath); + + removeFolderCheck = dirFolderRemove.Exists; + if (removeFolderCheck == false) + dirFolderRemove.Create(); + + oldDirectory = dirOldFolder.GetDirectories(); + + foreach (DirectoryInfo subDirectory in oldDirectory) + { + oldFiles = subDirectory.GetFiles(); + foreach (FileInfo subFile in oldFiles) + subFile.MoveTo(removeFolderPath + DateTime.Now.ToString("yyyyMMddHHmmss") + subFile.Name.ToString()); + } + } + /// + /// 폴더 복사 + /// + /// 복사 출발점 폴더 + /// 복사 도착점 폴더 + public static void CopyToFolder(string departure, string destination) + { + DirectoryInfo dirDestinationFolder = new DirectoryInfo(destination); + if (dirDestinationFolder.Exists == false) + dirDestinationFolder.Create(); + + DirectoryInfo dirDepartureFolder = new DirectoryInfo(departure); + if (dirDepartureFolder.Exists == false) + dirDepartureFolder.Create(); + + FileInfo[] newFiles = dirDepartureFolder.GetFiles(); + + foreach (FileInfo subFile in newFiles) + subFile.CopyTo(destination + subFile.Name.ToString(), true); + } + /// + /// 폴더 이동 + /// + /// 복사 출발점 폴더 + /// 복사 도착점 폴더 + public static void MoveToFolder(string departure, string destination) + { + DirectoryInfo dirDestinationFolder = new DirectoryInfo(destination); + if (dirDestinationFolder.Exists == false) + dirDestinationFolder.Create(); + else + { + dirDestinationFolder.Delete(true); + dirDestinationFolder.Create(); + } + + DirectoryInfo dirDepartureFolder = new DirectoryInfo(departure); + if (dirDepartureFolder.Exists == false) + dirDepartureFolder.Create(); + + FileInfo[] newFiles = dirDepartureFolder.GetFiles(); + + foreach (FileInfo subFile in newFiles) + subFile.MoveTo(destination + subFile.Name.ToString()); + } + + public static byte ChecksumCalculator(byte[] array) + { + byte checksum = 0x00; + + for (int i = 0; i < array.Length; i++) + { + checksum = (byte)(checksum ^ array[i]); + } + + return checksum; + } + } + + public static class FindByNameUtil + { + public static T FindByName(this object targetClass, string name) where T : class + { + System.Reflection.FieldInfo fi = targetClass.GetType().GetField(name, System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic); + return fi.GetValue(targetClass) as T; + } + public static T FindByName(this string name, object targetClass) where T : class + { + System.Reflection.FieldInfo fi = targetClass.GetType().GetField(name, System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic); + return fi.GetValue(targetClass) as T; + } + public static System.Windows.Forms.Label Is_Label_From(this string name, object targetClass) + { + return FindByName(targetClass, name); + } + public static System.Windows.Forms.TextBox Is_TextBox_From(this string name, object targetClass) + { + return FindByName(targetClass, name); + } + public static System.Windows.Forms.TextBox TextBox(string name, object targetClass) + { + return FindByName(targetClass, name); + } + public static System.Windows.Forms.Label Label(string name, object targetClass) + { + return FindByName(targetClass, name); + } + public static System.Windows.Forms.PictureBox PictureBox(string name, object targetClass) + { + return FindByName(targetClass, name); + } + + public static SmartX.SmartLabel SmartLabel(string name, object targetClass) + { + return FindByName(targetClass, name); + } + public static SmartX.SmartProgressBar SmartProgressBar(string name, object targetClass) + { + return FindByName(targetClass, name); + } + public static SmartX.SmartButton SmartButton(string name, object targetClass) + { + return FindByName(targetClass, name); + } + public static SmartX.SmartDraw SmartDraw(string name, object targetClass) + { + return FindByName(targetClass, name); + } + public static SmartX.SmartListBox SmartListBox(string name, object targetClass) + { + return FindByName(targetClass, name); + } } } diff --git a/ITC81DB_2/ITC81DB_2.csproj b/ITC81DB_2/ITC81DB_2.csproj index 90a98d7..543ed7d 100644 --- a/ITC81DB_2/ITC81DB_2.csproj +++ b/ITC81DB_2/ITC81DB_2.csproj @@ -574,6 +574,7 @@ Resources.resx True + diff --git a/ITC81DB_2/Version.txt b/ITC81DB_2/Version.txt index 43534f3..57853cd 100644 --- a/ITC81DB_2/Version.txt +++ b/ITC81DB_2/Version.txt @@ -13,6 +13,10 @@ 2 ⺻ 跮 */ +@ Ver 3.0.2 by CJY + - 2024.11.08 + - Ver 3.0.1 Modify + @ Ver 3.0.1 by CJY - 2024.5.17 - Ver 3.0.0 Modify @@ -23,7 +27,7 @@ - Ver 2.6.4 Modify - Board Program INT81M-2 : V3.0.1 ȣȯ - ǵ ߰ - - + - @ Ver 2.6.4 by CJY - 2023.9.7 diff --git a/ITC81DB_2/bin/Debug/ITC81DB_2.exe b/ITC81DB_2/bin/Debug/ITC81DB_2.exe index 29b601d..f7faeff 100644 Binary files a/ITC81DB_2/bin/Debug/ITC81DB_2.exe and b/ITC81DB_2/bin/Debug/ITC81DB_2.exe differ diff --git a/ITC81DB_2/bin/Debug/ITC81DB_2_ImageDll.dll b/ITC81DB_2/bin/Debug/ITC81DB_2_ImageDll.dll index 673f05b..83dcfec 100644 Binary files a/ITC81DB_2/bin/Debug/ITC81DB_2_ImageDll.dll and b/ITC81DB_2/bin/Debug/ITC81DB_2_ImageDll.dll differ diff --git a/ITC81DB_2/obj/Debug/ITC81DB_2.csproj.FileListAbsolute.txt b/ITC81DB_2/obj/Debug/ITC81DB_2.csproj.FileListAbsolute.txt index 5d61a91..f9b380e 100644 --- a/ITC81DB_2/obj/Debug/ITC81DB_2.csproj.FileListAbsolute.txt +++ b/ITC81DB_2/obj/Debug/ITC81DB_2.csproj.FileListAbsolute.txt @@ -185,7 +185,6 @@ D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Debug\ITC81DB_2.pdb D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Debug\ITC81DB_2_ImageDll.dll D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Debug\SmartX_IEC1000.dll D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Debug\SmartXCommon.dll -D:\Laboratory\ITC81DB_2\ITC81DB_2\bin\Debug\ITC81DB_2_ImageDll.pdb D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ResolveAssemblyReference.cache D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlBottomConfiguration.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlBottomEquipment.resources @@ -199,13 +198,11 @@ D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterBasi D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlBottomBasic.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterConfiCommunication.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterConfiHelp.resources -D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterConfiOption.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterConfiOptionBoard.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterEquipEngineer.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterEquipFunctionSetting.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterEquipHelp.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterEquipInitialize.resources -D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterEquipTest.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterEquipUpdate.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterEquipUser.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterEquipUserGroupEditor.resources @@ -214,18 +211,11 @@ D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterInfo D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterInforSystem.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterSystemCalibration.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterSystemAutoZero.resources -D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterSystemExternalOutput.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterSystemHelp.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterSystemIOTest.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterSystemJudgmentSetting.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlCenterSystemSorterSetting.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlUserGroupEditor.resources -D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainDisplayAlarm.resources -D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainDisplayDataStatistics.resources -D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainDisplayList.resources -D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainDisplayNormal.resources -D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainDisplayMenu.resources -D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainDisplayXYChart.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.DialogForms.DialogFormLogOn.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.DialogForms.DialogFormPasswordKeyPad1.resources D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.DialogForms.DialogFormMessage.resources @@ -240,3 +230,12 @@ D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Properties.Resources.resou D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.csproj.GenerateResource.Cache D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.exe D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.pdb +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlConfiOptionBoard1.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainAlarm.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainDataStatistics.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainFeedback.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainList.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainBarGraph.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainSubMenu.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainWeightScreen.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2\obj\Debug\ITC81DB_2.Controls.ControlMainLineGraph.resources diff --git a/ITC81DB_2/obj/Debug/ITC81DB_2.exe b/ITC81DB_2/obj/Debug/ITC81DB_2.exe index 29b601d..f7faeff 100644 Binary files a/ITC81DB_2/obj/Debug/ITC81DB_2.exe and b/ITC81DB_2/obj/Debug/ITC81DB_2.exe differ diff --git a/ITC81DB_2_ImageDll/bin/Debug/ITC81DB_2_ImageDll.dll b/ITC81DB_2_ImageDll/bin/Debug/ITC81DB_2_ImageDll.dll index 673f05b..beb9e13 100644 Binary files a/ITC81DB_2_ImageDll/bin/Debug/ITC81DB_2_ImageDll.dll and b/ITC81DB_2_ImageDll/bin/Debug/ITC81DB_2_ImageDll.dll differ diff --git a/ITC81DB_2_ImageDll/obj/Debug/ITC81DB_2_ImageDll.csproj.FileListAbsolute.txt b/ITC81DB_2_ImageDll/obj/Debug/ITC81DB_2_ImageDll.csproj.FileListAbsolute.txt index a8e45c6..be791e2 100644 --- a/ITC81DB_2_ImageDll/obj/Debug/ITC81DB_2_ImageDll.csproj.FileListAbsolute.txt +++ b/ITC81DB_2_ImageDll/obj/Debug/ITC81DB_2_ImageDll.csproj.FileListAbsolute.txt @@ -26,3 +26,10 @@ D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\ITC81DB_2_ImageDll\obj\Debug\ITC81DB_ D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\ITC81DB_2_ImageDll\obj\Debug\ITC81DB_2_ImageDll.csproj.GenerateResource.Cache D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\ITC81DB_2_ImageDll\obj\Debug\ITC81DB_2_ImageDll.dll D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\ITC81DB_2_ImageDll\obj\Debug\ITC81DB_2_ImageDll.pdb +D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\bin\Debug\ITC81DB_2_ImageDll.dll +D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\bin\Debug\ITC81DB_2_ImageDll.pdb +D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\obj\Debug\ResolveAssemblyReference.cache +D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\obj\Debug\ITC81DB_2_ImageDll.Resource1.resources +D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\obj\Debug\ITC81DB_2_ImageDll.csproj.GenerateResource.Cache +D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\obj\Debug\ITC81DB_2_ImageDll.dll +D:\Laboratory\ITC81DB_2\ITC81DB_2_ImageDll\obj\Debug\ITC81DB_2_ImageDll.pdb diff --git a/ITC81DB_2_ImageDll/obj/Debug/ITC81DB_2_ImageDll.dll b/ITC81DB_2_ImageDll/obj/Debug/ITC81DB_2_ImageDll.dll index 673f05b..beb9e13 100644 Binary files a/ITC81DB_2_ImageDll/obj/Debug/ITC81DB_2_ImageDll.dll and b/ITC81DB_2_ImageDll/obj/Debug/ITC81DB_2_ImageDll.dll differ