diff --git a/ITC81DB_2H/Controls/CenterEquipment/ControlCenterEquipUserGroupEditor.cs b/ITC81DB_2H/Controls/CenterEquipment/ControlCenterEquipUserGroupEditor.cs index 99e60ac..c2c2003 100644 --- a/ITC81DB_2H/Controls/CenterEquipment/ControlCenterEquipUserGroupEditor.cs +++ b/ITC81DB_2H/Controls/CenterEquipment/ControlCenterEquipUserGroupEditor.cs @@ -387,12 +387,12 @@ namespace ITC81DB_2H.Controls this.checkBoxNotLoginSystemAutoZero.Visible = bValue; this.checkBoxNotLoginSystemCalibration.Visible = bValue; - this.checkBoxNotLoginSystemExternalOutput.Visible = bValue; + //this.checkBoxNotLoginSystemExternalOutput.Visible = bValue; this.checkBoxNotLoginSystemIOTest.Visible = bValue; this.checkBoxNotLoginSystemJudgment.Visible = bValue; this.checkBoxNotLoginSystemSorter.Visible = bValue; - this.checkBoxNotLoginEquipmentEngineer.Visible = bValue; + //this.checkBoxNotLoginEquipmentEngineer.Visible = bValue; this.checkBoxNotLoginEquipmentFunction.Visible = bValue; this.checkBoxNotLoginEquipmentInitialization.Visible = bValue; this.checkBoxNotLoginEquipmentUpdate.Visible = bValue; diff --git a/ITC81DB_2H/Controls/CenterSystem/ControlCenterSystemIOTest.Designer.cs b/ITC81DB_2H/Controls/CenterSystem/ControlCenterSystemIOTest.Designer.cs index 5f08a1b..03deb9b 100644 --- a/ITC81DB_2H/Controls/CenterSystem/ControlCenterSystemIOTest.Designer.cs +++ b/ITC81DB_2H/Controls/CenterSystem/ControlCenterSystemIOTest.Designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlCenterSystemBLDCMotorSetting)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlCenterSystemIOTest)); this.smartGroupBox1 = new SmartX.SmartGroupBox(); this.groupBoxInput = new SmartX.SmartGroupBox(); this.buttonInputRead = new SmartX.SmartButton(); @@ -119,7 +119,7 @@ this.groupBoxInput.InitVisible = true; this.groupBoxInput.Location = new System.Drawing.Point(3, 9); this.groupBoxInput.Name = "groupBoxInput"; - this.groupBoxInput.RoundRadius = 0; + this.groupBoxInput.RoundRadius = 5; this.groupBoxInput.Size = new System.Drawing.Size(350, 450); this.groupBoxInput.TabIndex = 177; this.groupBoxInput.Text = "INPUT"; @@ -163,7 +163,7 @@ this.labelInput1.BackColor = System.Drawing.Color.DimGray; this.labelInput1.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular); this.labelInput1.ForeColor = System.Drawing.SystemColors.ControlDark; - this.labelInput1.Location = new System.Drawing.Point(113, 83); + this.labelInput1.Location = new System.Drawing.Point(93, 83); this.labelInput1.Name = "labelInput1"; this.labelInput1.Size = new System.Drawing.Size(25, 25); // @@ -172,7 +172,7 @@ this.labelInput2.BackColor = System.Drawing.Color.DimGray; this.labelInput2.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular); this.labelInput2.ForeColor = System.Drawing.SystemColors.ControlDark; - this.labelInput2.Location = new System.Drawing.Point(113, 120); + this.labelInput2.Location = new System.Drawing.Point(93, 120); this.labelInput2.Name = "labelInput2"; this.labelInput2.Size = new System.Drawing.Size(25, 25); // @@ -181,7 +181,7 @@ this.labelInput3.BackColor = System.Drawing.Color.DimGray; this.labelInput3.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular); this.labelInput3.ForeColor = System.Drawing.SystemColors.ControlDark; - this.labelInput3.Location = new System.Drawing.Point(113, 157); + this.labelInput3.Location = new System.Drawing.Point(93, 157); this.labelInput3.Name = "labelInput3"; this.labelInput3.Size = new System.Drawing.Size(25, 25); // @@ -190,7 +190,7 @@ this.labelInput4.BackColor = System.Drawing.Color.DimGray; this.labelInput4.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular); this.labelInput4.ForeColor = System.Drawing.SystemColors.ControlDark; - this.labelInput4.Location = new System.Drawing.Point(113, 194); + this.labelInput4.Location = new System.Drawing.Point(93, 194); this.labelInput4.Name = "labelInput4"; this.labelInput4.Size = new System.Drawing.Size(25, 25); // @@ -199,7 +199,7 @@ this.labelInput8.BackColor = System.Drawing.Color.DimGray; this.labelInput8.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular); this.labelInput8.ForeColor = System.Drawing.SystemColors.ControlDark; - this.labelInput8.Location = new System.Drawing.Point(113, 342); + this.labelInput8.Location = new System.Drawing.Point(93, 342); this.labelInput8.Name = "labelInput8"; this.labelInput8.Size = new System.Drawing.Size(25, 25); // @@ -208,7 +208,7 @@ this.labelInput5.BackColor = System.Drawing.Color.DimGray; this.labelInput5.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular); this.labelInput5.ForeColor = System.Drawing.SystemColors.ControlDark; - this.labelInput5.Location = new System.Drawing.Point(113, 231); + this.labelInput5.Location = new System.Drawing.Point(93, 231); this.labelInput5.Name = "labelInput5"; this.labelInput5.Size = new System.Drawing.Size(25, 25); // @@ -217,7 +217,7 @@ this.labelInput7.BackColor = System.Drawing.Color.DimGray; this.labelInput7.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular); this.labelInput7.ForeColor = System.Drawing.SystemColors.ControlDark; - this.labelInput7.Location = new System.Drawing.Point(113, 305); + this.labelInput7.Location = new System.Drawing.Point(93, 305); this.labelInput7.Name = "labelInput7"; this.labelInput7.Size = new System.Drawing.Size(25, 25); // @@ -226,7 +226,7 @@ this.labelInput6.BackColor = System.Drawing.Color.DimGray; this.labelInput6.Font = new System.Drawing.Font("굴림", 10F, System.Drawing.FontStyle.Regular); this.labelInput6.ForeColor = System.Drawing.SystemColors.ControlDark; - this.labelInput6.Location = new System.Drawing.Point(113, 268); + this.labelInput6.Location = new System.Drawing.Point(93, 268); this.labelInput6.Name = "labelInput6"; this.labelInput6.Size = new System.Drawing.Size(25, 25); // @@ -242,11 +242,11 @@ this.labelInputName1.ForeColor = System.Drawing.Color.White; this.labelInputName1.InitVisible = true; this.labelInputName1.LineSpacing = 0F; - this.labelInputName1.Location = new System.Drawing.Point(144, 83); + this.labelInputName1.Location = new System.Drawing.Point(124, 83); this.labelInputName1.Name = "labelInputName1"; - this.labelInputName1.Size = new System.Drawing.Size(69, 25); + this.labelInputName1.Size = new System.Drawing.Size(152, 25); this.labelInputName1.TabIndex = 229; - this.labelInputName1.Text = "OPER.SW"; + this.labelInputName1.Text = "Start/Stop S/W"; this.labelInputName1.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelInputName1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelInputName1.Wordwrap = false; @@ -263,11 +263,11 @@ this.labelInputName2.ForeColor = System.Drawing.Color.White; this.labelInputName2.InitVisible = true; this.labelInputName2.LineSpacing = 0F; - this.labelInputName2.Location = new System.Drawing.Point(144, 120); + this.labelInputName2.Location = new System.Drawing.Point(124, 120); this.labelInputName2.Name = "labelInputName2"; - this.labelInputName2.Size = new System.Drawing.Size(69, 25); + this.labelInputName2.Size = new System.Drawing.Size(152, 25); this.labelInputName2.TabIndex = 231; - this.labelInputName2.Text = "EM.STOP"; + this.labelInputName2.Text = "Emergency Stop S/W"; this.labelInputName2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelInputName2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelInputName2.Wordwrap = false; @@ -284,11 +284,11 @@ this.labelInputName3.ForeColor = System.Drawing.Color.White; this.labelInputName3.InitVisible = true; this.labelInputName3.LineSpacing = 0F; - this.labelInputName3.Location = new System.Drawing.Point(144, 157); + this.labelInputName3.Location = new System.Drawing.Point(124, 157); this.labelInputName3.Name = "labelInputName3"; - this.labelInputName3.Size = new System.Drawing.Size(69, 25); + this.labelInputName3.Size = new System.Drawing.Size(152, 25); this.labelInputName3.TabIndex = 232; - this.labelInputName3.Text = "ENT.SIG"; + this.labelInputName3.Text = "Entry Sensor"; this.labelInputName3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelInputName3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelInputName3.Wordwrap = false; @@ -305,9 +305,9 @@ this.labelInputName8.ForeColor = System.Drawing.Color.White; this.labelInputName8.InitVisible = true; this.labelInputName8.LineSpacing = 0F; - this.labelInputName8.Location = new System.Drawing.Point(144, 342); + this.labelInputName8.Location = new System.Drawing.Point(124, 342); this.labelInputName8.Name = "labelInputName8"; - this.labelInputName8.Size = new System.Drawing.Size(69, 25); + this.labelInputName8.Size = new System.Drawing.Size(152, 25); this.labelInputName8.TabIndex = 242; this.labelInputName8.Text = "OPT2"; this.labelInputName8.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -326,9 +326,9 @@ this.labelInputName4.ForeColor = System.Drawing.Color.White; this.labelInputName4.InitVisible = true; this.labelInputName4.LineSpacing = 0F; - this.labelInputName4.Location = new System.Drawing.Point(144, 194); + this.labelInputName4.Location = new System.Drawing.Point(124, 194); this.labelInputName4.Name = "labelInputName4"; - this.labelInputName4.Size = new System.Drawing.Size(69, 25); + this.labelInputName4.Size = new System.Drawing.Size(152, 25); this.labelInputName4.TabIndex = 235; this.labelInputName4.Text = "NG"; this.labelInputName4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -347,9 +347,9 @@ this.labelInputName7.ForeColor = System.Drawing.Color.White; this.labelInputName7.InitVisible = true; this.labelInputName7.LineSpacing = 0F; - this.labelInputName7.Location = new System.Drawing.Point(144, 305); + this.labelInputName7.Location = new System.Drawing.Point(124, 305); this.labelInputName7.Name = "labelInputName7"; - this.labelInputName7.Size = new System.Drawing.Size(69, 25); + this.labelInputName7.Size = new System.Drawing.Size(152, 25); this.labelInputName7.TabIndex = 241; this.labelInputName7.Text = "OPT1"; this.labelInputName7.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -368,11 +368,11 @@ this.labelInputName5.ForeColor = System.Drawing.Color.White; this.labelInputName5.InitVisible = true; this.labelInputName5.LineSpacing = 0F; - this.labelInputName5.Location = new System.Drawing.Point(144, 231); + this.labelInputName5.Location = new System.Drawing.Point(124, 231); this.labelInputName5.Name = "labelInputName5"; - this.labelInputName5.Size = new System.Drawing.Size(69, 25); + this.labelInputName5.Size = new System.Drawing.Size(152, 25); this.labelInputName5.TabIndex = 236; - this.labelInputName5.Text = "EXT.STOP"; + this.labelInputName5.Text = "External SIG - STOP"; this.labelInputName5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelInputName5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelInputName5.Wordwrap = false; @@ -389,11 +389,11 @@ this.labelInputName6.ForeColor = System.Drawing.Color.White; this.labelInputName6.InitVisible = true; this.labelInputName6.LineSpacing = 0F; - this.labelInputName6.Location = new System.Drawing.Point(144, 268); + this.labelInputName6.Location = new System.Drawing.Point(124, 268); this.labelInputName6.Name = "labelInputName6"; - this.labelInputName6.Size = new System.Drawing.Size(69, 25); + this.labelInputName6.Size = new System.Drawing.Size(152, 25); this.labelInputName6.TabIndex = 238; - this.labelInputName6.Text = "EXT.OPER"; + this.labelInputName6.Text = "External SIG - Start"; this.labelInputName6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.labelInputName6.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelInputName6.Wordwrap = false; @@ -425,7 +425,7 @@ this.groupBoxOutput.InitVisible = true; this.groupBoxOutput.Location = new System.Drawing.Point(354, 9); this.groupBoxOutput.Name = "groupBoxOutput"; - this.groupBoxOutput.RoundRadius = 0; + this.groupBoxOutput.RoundRadius = 5; this.groupBoxOutput.Size = new System.Drawing.Size(350, 450); this.groupBoxOutput.TabIndex = 176; this.groupBoxOutput.Text = "OUTPUT"; diff --git a/ITC81DB_2H/Forms/FormMenu.cs b/ITC81DB_2H/Forms/FormMenu.cs index c4f80e6..a10ef58 100644 --- a/ITC81DB_2H/Forms/FormMenu.cs +++ b/ITC81DB_2H/Forms/FormMenu.cs @@ -1473,7 +1473,11 @@ namespace ITC81DB_2H.Forms } public void DisplayBottomEquipment(Define.E_MenuBottomEquipment menu) { - this.BottomEquipment.DisplayHiddenMenu(false); + if (this.ParentForm.CurrentSystemStatus.CurrentUser.Group == Define.E_UserGroup.Developer + && this.ParentForm.SystemConfig1.IsLogin == true) + this.BottomEquipment.DisplayHiddenMenu(true); + else + this.BottomEquipment.DisplayHiddenMenu(false); switch (menu) { diff --git a/ITC81DB_2H/Version.txt b/ITC81DB_2H/Version.txt index 45877c2..c1c9c75 100644 --- a/ITC81DB_2H/Version.txt +++ b/ITC81DB_2H/Version.txt @@ -16,6 +16,7 @@ @ Ver 3.4.0 by CJY - 2025.05.30 - Ver 3.3.7 Modify + - (¹ö±×¼öÁ¤) Developer µî±ÞÀÏ ¶§ ¿£Áö´Ï¾î ¼³Á¤ ÇÏ´Ü ¹öÆ° ¾ø¾îÁö´Â ¹ö±× ¼öÁ¤ - ÆÇÁ¤¼³Á¤ ±×·¡ÇÁ Ãß°¡ - ¿ÜºÎÃâ·Â ¸Þ´º ´Ý¾Æ³õ±â - ±â´É¼³Á¤ : ½ºÀ§Ä¡ äÅ͸µ Ãß°¡ diff --git a/ITC81DB_2H/bin/Release/ITC81DB_2H.exe b/ITC81DB_2H/bin/Release/ITC81DB_2H.exe index a04dd61..6948363 100644 Binary files a/ITC81DB_2H/bin/Release/ITC81DB_2H.exe and b/ITC81DB_2H/bin/Release/ITC81DB_2H.exe differ diff --git a/ITC81DB_2H/obj/Release/ITC81DB_2H.exe b/ITC81DB_2H/obj/Release/ITC81DB_2H.exe index a04dd61..6948363 100644 Binary files a/ITC81DB_2H/obj/Release/ITC81DB_2H.exe and b/ITC81DB_2H/obj/Release/ITC81DB_2H.exe differ