From 9b1014d17e1f53ced601ff2a457b40f133b1966d Mon Sep 17 00:00:00 2001 From: Seonjae Date: Thu, 6 Apr 2023 11:25:48 +0900 Subject: [PATCH] =?UTF-8?q?dialog=20form=20=EC=82=AC=EC=9D=B4=EC=A6=88=20?= =?UTF-8?q?=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs | 5 +++-- INT_PT002/DialogForms/DialogFormLogOn.cs | 9 +++++++++ INT_PT002/DialogForms/DialogFormMessage.cs | 2 ++ INT_PT002/DialogForms/DialogFormNumKeyPad.Designer.cs | 2 +- INT_PT002/DialogForms/DialogFormNumKeyPad.cs | 2 +- INT_PT002/DialogForms/DialogFormPasswordKeyPad.cs | 2 ++ 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs b/INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs index 355554c..936917d 100644 --- a/INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs +++ b/INT_PT002/Controls/Manual/ControlMenuManualIoTest.cs @@ -137,8 +137,6 @@ namespace INT_PT002.Controls { SmartSplash.Start(SmartSplash.BuiltInLoadingImages.PROCESSING1, 200); - this.ParentForm.Enabled = false; - // ServoMotor 1 this.labelMotor1Origin.Text = this.ParentForm.ParentForm.ServoMotorRead2(1, ServoMotorAddress.CMD21); this.labelMotor1Front1.Text = this.ParentForm.ParentForm.ServoMotorRead2(1, ServoMotorAddress.CMD16); @@ -198,6 +196,9 @@ namespace INT_PT002.Controls public void DisplayRefresh() { + // 서보설정 읽는동안 Enable = false + this.ParentForm.Enabled = false; + this.ParentForm.ParentForm.CurrentSystemStatus.CurrentDisplayMode = Define.E_DisplayModeStore.IOTest; this.ParentForm.ParentForm.SetDisplayMode(Define.E_EquipmentMode.IOTest); diff --git a/INT_PT002/DialogForms/DialogFormLogOn.cs b/INT_PT002/DialogForms/DialogFormLogOn.cs index 706caed..6e1f83c 100644 --- a/INT_PT002/DialogForms/DialogFormLogOn.cs +++ b/INT_PT002/DialogForms/DialogFormLogOn.cs @@ -69,6 +69,15 @@ namespace INT_PT002.Forms } #endregion + #region Override Member + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + + this.Size = new Size(600, 379); + } + #endregion + #region Event Handler private void buttonLogOn_Click(object sender, EventArgs e) { diff --git a/INT_PT002/DialogForms/DialogFormMessage.cs b/INT_PT002/DialogForms/DialogFormMessage.cs index 3854a00..83a1a56 100644 --- a/INT_PT002/DialogForms/DialogFormMessage.cs +++ b/INT_PT002/DialogForms/DialogFormMessage.cs @@ -723,6 +723,8 @@ namespace INT_PT002.DialogForms y = Screen.PrimaryScreen.Bounds.Height / 2 - this.Size.Height / 2; this.Location = new Point(x, y); + + this.Size = new Size(450, 155); } private void PictureBoxVisible(bool bValue) diff --git a/INT_PT002/DialogForms/DialogFormNumKeyPad.Designer.cs b/INT_PT002/DialogForms/DialogFormNumKeyPad.Designer.cs index fd9308e..4f7c746 100644 --- a/INT_PT002/DialogForms/DialogFormNumKeyPad.Designer.cs +++ b/INT_PT002/DialogForms/DialogFormNumKeyPad.Designer.cs @@ -257,7 +257,7 @@ this.Controls.Add(this.labelCaption); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Name = "DialogFormNumKeyPad"; - this.Text = "DialogFormNumKeyPad1"; + this.Text = "KeyPad"; this.ResumeLayout(false); } diff --git a/INT_PT002/DialogForms/DialogFormNumKeyPad.cs b/INT_PT002/DialogForms/DialogFormNumKeyPad.cs index d12c0d7..2251c4b 100644 --- a/INT_PT002/DialogForms/DialogFormNumKeyPad.cs +++ b/INT_PT002/DialogForms/DialogFormNumKeyPad.cs @@ -101,7 +101,7 @@ namespace INT_PT002.DialogForms this.Location = new Point(x, y); - this.Size = new Size(250, 443); + this.Size = new Size(250, 415); } private void InputNumber(string key) diff --git a/INT_PT002/DialogForms/DialogFormPasswordKeyPad.cs b/INT_PT002/DialogForms/DialogFormPasswordKeyPad.cs index 2ada65b..6f89966 100644 --- a/INT_PT002/DialogForms/DialogFormPasswordKeyPad.cs +++ b/INT_PT002/DialogForms/DialogFormPasswordKeyPad.cs @@ -101,6 +101,8 @@ namespace INT_PT002.DialogForms this.Location = new Point(x, y); + this.Size = new Size(250, 356); + this.InputKey = ""; this.labelScreen.Text = ""; }