From b031d92edbaffe9657d6ff48ffbf796111b45896 Mon Sep 17 00:00:00 2001 From: Seonjae Date: Mon, 3 Apr 2023 11:52:58 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EB=B0=8F=20?= =?UTF-8?q?=EC=95=8C=EB=9E=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DialogForms/DialogFormLogOn.Designer.cs | 2 +- INT_PT002/DialogForms/DialogFormLogOn.cs | 1 + INT_PT002/Forms/FormMain.cs | 2 - INT_PT002/Forms/FormMainDisplay2.Designer.cs | 249 ++++++++++++------ INT_PT002/Forms/FormMainDisplay2.cs | 118 +++++++-- INT_PT002/Forms/FormMainDisplay2.resx | 3 + 6 files changed, 265 insertions(+), 110 deletions(-) diff --git a/INT_PT002/DialogForms/DialogFormLogOn.Designer.cs b/INT_PT002/DialogForms/DialogFormLogOn.Designer.cs index 840210c..0be444e 100644 --- a/INT_PT002/DialogForms/DialogFormLogOn.Designer.cs +++ b/INT_PT002/DialogForms/DialogFormLogOn.Designer.cs @@ -203,7 +203,7 @@ // // smartKeyboard // - this.smartKeyboard.BackGround = this.smartGroupBox1; + this.smartKeyboard.BackGround = null; this.smartKeyboard.BackGroundColor = System.Drawing.Color.LightCoral; this.smartKeyboard.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); this.smartKeyboard.BorderStyle = SmartX.SmartKeyboard.BorderStyles.RoundRectFill; diff --git a/INT_PT002/DialogForms/DialogFormLogOn.cs b/INT_PT002/DialogForms/DialogFormLogOn.cs index 2a4f401..706caed 100644 --- a/INT_PT002/DialogForms/DialogFormLogOn.cs +++ b/INT_PT002/DialogForms/DialogFormLogOn.cs @@ -49,6 +49,7 @@ namespace INT_PT002.Forms { this.textBoxID.Text = ""; this.textBoxPassword.Text = ""; + this.textBoxID.Focus(); this.Location = new Point(157, 150); diff --git a/INT_PT002/Forms/FormMain.cs b/INT_PT002/Forms/FormMain.cs index 344b61a..ecbd70c 100644 --- a/INT_PT002/Forms/FormMain.cs +++ b/INT_PT002/Forms/FormMain.cs @@ -2431,8 +2431,6 @@ namespace INT_PT002.Forms // 초기 파라미터 전송 this.TransferSystemParameter9039(); - //DialogFormLogOn loginForm = new DialogFormLogOn( - // timer1 Get user List Name //UserManager.UserManager_GetUserListName(); this.timer1.Enabled = true; diff --git a/INT_PT002/Forms/FormMainDisplay2.Designer.cs b/INT_PT002/Forms/FormMainDisplay2.Designer.cs index 8229dc2..64781bb 100644 --- a/INT_PT002/Forms/FormMainDisplay2.Designer.cs +++ b/INT_PT002/Forms/FormMainDisplay2.Designer.cs @@ -30,6 +30,11 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMainDisplay2)); this.smartForm1 = new SmartX.SmartForm(); + this.smartButton4 = new SmartX.SmartButton(); + this.smartButton3 = new SmartX.SmartButton(); + this.labelCommunicationStatus = new SmartX.SmartLabel(); + this.labelUserLevel = new SmartX.SmartLabel(); + this.labelUserID = new SmartX.SmartLabel(); this.smartLabel32 = new SmartX.SmartLabel(); this.smartLabel33 = new SmartX.SmartLabel(); this.smartLabel34 = new SmartX.SmartLabel(); @@ -120,7 +125,6 @@ this.labelResult2 = new SmartX.SmartLabel(); this.labelResult1 = new SmartX.SmartLabel(); this.buttonUser = new SmartX.SmartButton(); - this.labelCommunicationStatus = new SmartX.SmartLabel(); this.labelStop = new SmartX.SmartLabel(); this.labelStart = new SmartX.SmartLabel(); this.buttonExit = new SmartX.SmartButton(); @@ -130,8 +134,7 @@ this.buttonDisplay = new SmartX.SmartButton(); this.smartTimerAlarm = new SmartX.SmartTimer(); this.smartTimerMessageShow = new SmartX.SmartTimer(); - this.labelUserID = new SmartX.SmartLabel(); - this.labelUserLevel = new SmartX.SmartLabel(); + this.smartTimerLogin = new SmartX.SmartTimer(); this.smartForm1.SuspendLayout(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); @@ -142,6 +145,8 @@ this.smartForm1.BackGroundFillStyle = SmartXUIBase.SmartUIControlFormBase.BackGroundFillStyles.UseBackImage; this.smartForm1.BackImage = ((System.Drawing.Image)(resources.GetObject("smartForm1.BackImage"))); this.smartForm1.CenterLocation = false; + this.smartForm1.Controls.Add(this.smartButton4); + this.smartForm1.Controls.Add(this.smartButton3); this.smartForm1.Controls.Add(this.labelCommunicationStatus); this.smartForm1.Controls.Add(this.labelUserLevel); this.smartForm1.Controls.Add(this.labelUserID); @@ -254,6 +259,143 @@ this.smartForm1.SpecialFunctionClickPointSize = 100; this.smartForm1.UseMainMenu = false; // + // smartButton4 + // + this.smartButton4.BackGround = this.smartForm1; + this.smartButton4.BackGroundColor = System.Drawing.Color.LightBlue; + this.smartButton4.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); + this.smartButton4.ButtonDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(76)))), ((int)(((byte)(129))))); + this.smartButton4.ButtonImageAutoSize = true; + this.smartButton4.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; + this.smartButton4.ButtonText = "smartButton1"; + this.smartButton4.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.smartButton4.GroupID = 0; + this.smartButton4.ImageDisable = null; + this.smartButton4.ImageDown = null; + this.smartButton4.ImageUp = null; + this.smartButton4.Location = new System.Drawing.Point(917, 489); + this.smartButton4.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.smartButton4.Name = "smartButton4"; + this.smartButton4.NestedClickEventPrevent = false; + this.smartButton4.OutlinePixel = 2; + this.smartButton4.OverlapOptimize = true; + this.smartButton4.RepeatInterval = 200; + this.smartButton4.RepeatIntervalAccelerate = null; + this.smartButton4.RoundSize = 10; + this.smartButton4.SafeInterval = 200; + this.smartButton4.Size = new System.Drawing.Size(100, 43); + this.smartButton4.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.smartButton4.TabIndex = 286; + this.smartButton4.Text = null; + this.smartButton4.TextColor = System.Drawing.Color.White; + this.smartButton4.TextColorDisable = System.Drawing.Color.Gray; + this.smartButton4.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); + this.smartButton4.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.smartButton4.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.smartButton4.Click += new System.EventHandler(this.smartButton4_Click); + // + // smartButton3 + // + this.smartButton3.BackGround = this.smartForm1; + this.smartButton3.BackGroundColor = System.Drawing.Color.LightBlue; + this.smartButton3.ButtonColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); + this.smartButton3.ButtonDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(76)))), ((int)(((byte)(129))))); + this.smartButton3.ButtonImageAutoSize = true; + this.smartButton3.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; + this.smartButton3.ButtonText = "smartButton1"; + this.smartButton3.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.smartButton3.GroupID = 0; + this.smartButton3.ImageDisable = null; + this.smartButton3.ImageDown = null; + this.smartButton3.ImageUp = null; + this.smartButton3.Location = new System.Drawing.Point(917, 440); + this.smartButton3.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.smartButton3.Name = "smartButton3"; + this.smartButton3.NestedClickEventPrevent = false; + this.smartButton3.OutlinePixel = 2; + this.smartButton3.OverlapOptimize = true; + this.smartButton3.RepeatInterval = 200; + this.smartButton3.RepeatIntervalAccelerate = null; + this.smartButton3.RoundSize = 10; + this.smartButton3.SafeInterval = 200; + this.smartButton3.Size = new System.Drawing.Size(100, 43); + this.smartButton3.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.smartButton3.TabIndex = 285; + this.smartButton3.Text = null; + this.smartButton3.TextColor = System.Drawing.Color.White; + this.smartButton3.TextColorDisable = System.Drawing.Color.Gray; + this.smartButton3.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); + this.smartButton3.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.smartButton3.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.smartButton3.Click += new System.EventHandler(this.smartButton3_Click); + // + // labelCommunicationStatus + // + this.labelCommunicationStatus.BackGround = null; + this.labelCommunicationStatus.BackGroundColor = System.Drawing.Color.Lime; + this.labelCommunicationStatus.BorderColor = System.Drawing.Color.Lime; + this.labelCommunicationStatus.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; + this.labelCommunicationStatus.LineSpacing = 0F; + this.labelCommunicationStatus.Location = new System.Drawing.Point(891, 58); + this.labelCommunicationStatus.Name = "labelCommunicationStatus"; + this.labelCommunicationStatus.OverlapOptimize = true; + this.labelCommunicationStatus.PasswordChar = '\0'; + this.labelCommunicationStatus.Radius = 20; + this.labelCommunicationStatus.RoundRectFillColor = System.Drawing.Color.Lime; + this.labelCommunicationStatus.Size = new System.Drawing.Size(10, 10); + this.labelCommunicationStatus.TabIndex = 69; + this.labelCommunicationStatus.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelCommunicationStatus.TextColorDisable = System.Drawing.Color.Gray; + this.labelCommunicationStatus.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelCommunicationStatus.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; + this.labelCommunicationStatus.Wordwrap = false; + // + // labelUserLevel + // + this.labelUserLevel.BackGround = this.smartForm1; + this.labelUserLevel.BackGroundColor = System.Drawing.Color.SkyBlue; + this.labelUserLevel.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelUserLevel.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.labelUserLevel.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelUserLevel.LineSpacing = 0F; + this.labelUserLevel.Location = new System.Drawing.Point(782, 44); + this.labelUserLevel.Name = "labelUserLevel"; + this.labelUserLevel.OverlapOptimize = true; + this.labelUserLevel.PasswordChar = '\0'; + this.labelUserLevel.Radius = 3; + this.labelUserLevel.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.labelUserLevel.Size = new System.Drawing.Size(119, 20); + this.labelUserLevel.TabIndex = 268; + this.labelUserLevel.Text = "ABCDEFG"; + this.labelUserLevel.TextColor = System.Drawing.Color.White; + this.labelUserLevel.TextColorDisable = System.Drawing.Color.Gray; + this.labelUserLevel.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelUserLevel.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelUserLevel.Wordwrap = false; + // + // labelUserID + // + this.labelUserID.BackGround = this.smartForm1; + this.labelUserID.BackGroundColor = System.Drawing.Color.SkyBlue; + this.labelUserID.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelUserID.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.labelUserID.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelUserID.LineSpacing = 0F; + this.labelUserID.Location = new System.Drawing.Point(782, 18); + this.labelUserID.Name = "labelUserID"; + this.labelUserID.OverlapOptimize = true; + this.labelUserID.PasswordChar = '\0'; + this.labelUserID.Radius = 3; + this.labelUserID.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.labelUserID.Size = new System.Drawing.Size(119, 20); + this.labelUserID.TabIndex = 267; + this.labelUserID.Text = "ABCDEFG"; + this.labelUserID.TextColor = System.Drawing.Color.White; + this.labelUserID.TextColorDisable = System.Drawing.Color.Gray; + this.labelUserID.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelUserID.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelUserID.Wordwrap = false; + // // smartLabel32 // this.smartLabel32.BackGround = this.smartForm1; @@ -481,7 +623,7 @@ this.labelSbAlarm10.BorderColor = System.Drawing.Color.Red; this.labelSbAlarm10.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; this.labelSbAlarm10.LineSpacing = 0F; - this.labelSbAlarm10.Location = new System.Drawing.Point(749, 733); + this.labelSbAlarm10.Location = new System.Drawing.Point(748, 734); this.labelSbAlarm10.Name = "labelSbAlarm10"; this.labelSbAlarm10.OverlapOptimize = true; this.labelSbAlarm10.PasswordChar = '\0'; @@ -502,7 +644,7 @@ this.labelSbAlarm5.BorderColor = System.Drawing.Color.Red; this.labelSbAlarm5.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; this.labelSbAlarm5.LineSpacing = 0F; - this.labelSbAlarm5.Location = new System.Drawing.Point(749, 666); + this.labelSbAlarm5.Location = new System.Drawing.Point(748, 664); this.labelSbAlarm5.Name = "labelSbAlarm5"; this.labelSbAlarm5.OverlapOptimize = true; this.labelSbAlarm5.PasswordChar = '\0'; @@ -523,7 +665,7 @@ this.labelSbAlarm9.BorderColor = System.Drawing.Color.Red; this.labelSbAlarm9.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; this.labelSbAlarm9.LineSpacing = 0F; - this.labelSbAlarm9.Location = new System.Drawing.Point(578, 733); + this.labelSbAlarm9.Location = new System.Drawing.Point(579, 734); this.labelSbAlarm9.Name = "labelSbAlarm9"; this.labelSbAlarm9.OverlapOptimize = true; this.labelSbAlarm9.PasswordChar = '\0'; @@ -544,7 +686,7 @@ this.labelSbAlarm4.BorderColor = System.Drawing.Color.Red; this.labelSbAlarm4.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; this.labelSbAlarm4.LineSpacing = 0F; - this.labelSbAlarm4.Location = new System.Drawing.Point(578, 666); + this.labelSbAlarm4.Location = new System.Drawing.Point(579, 664); this.labelSbAlarm4.Name = "labelSbAlarm4"; this.labelSbAlarm4.OverlapOptimize = true; this.labelSbAlarm4.PasswordChar = '\0'; @@ -565,7 +707,7 @@ this.labelSbAlarm8.BorderColor = System.Drawing.Color.Red; this.labelSbAlarm8.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; this.labelSbAlarm8.LineSpacing = 0F; - this.labelSbAlarm8.Location = new System.Drawing.Point(408, 733); + this.labelSbAlarm8.Location = new System.Drawing.Point(409, 734); this.labelSbAlarm8.Name = "labelSbAlarm8"; this.labelSbAlarm8.OverlapOptimize = true; this.labelSbAlarm8.PasswordChar = '\0'; @@ -586,7 +728,7 @@ this.labelSbAlarm3.BorderColor = System.Drawing.Color.Red; this.labelSbAlarm3.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; this.labelSbAlarm3.LineSpacing = 0F; - this.labelSbAlarm3.Location = new System.Drawing.Point(408, 666); + this.labelSbAlarm3.Location = new System.Drawing.Point(409, 664); this.labelSbAlarm3.Name = "labelSbAlarm3"; this.labelSbAlarm3.OverlapOptimize = true; this.labelSbAlarm3.PasswordChar = '\0'; @@ -607,7 +749,7 @@ this.labelSbAlarm7.BorderColor = System.Drawing.Color.Red; this.labelSbAlarm7.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; this.labelSbAlarm7.LineSpacing = 0F; - this.labelSbAlarm7.Location = new System.Drawing.Point(238, 733); + this.labelSbAlarm7.Location = new System.Drawing.Point(239, 734); this.labelSbAlarm7.Name = "labelSbAlarm7"; this.labelSbAlarm7.OverlapOptimize = true; this.labelSbAlarm7.PasswordChar = '\0'; @@ -628,7 +770,7 @@ this.labelSbAlarm2.BorderColor = System.Drawing.Color.Red; this.labelSbAlarm2.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; this.labelSbAlarm2.LineSpacing = 0F; - this.labelSbAlarm2.Location = new System.Drawing.Point(238, 666); + this.labelSbAlarm2.Location = new System.Drawing.Point(239, 664); this.labelSbAlarm2.Name = "labelSbAlarm2"; this.labelSbAlarm2.OverlapOptimize = true; this.labelSbAlarm2.PasswordChar = '\0'; @@ -649,7 +791,7 @@ this.labelSbAlarm6.BorderColor = System.Drawing.Color.Red; this.labelSbAlarm6.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; this.labelSbAlarm6.LineSpacing = 0F; - this.labelSbAlarm6.Location = new System.Drawing.Point(67, 731); + this.labelSbAlarm6.Location = new System.Drawing.Point(69, 734); this.labelSbAlarm6.Name = "labelSbAlarm6"; this.labelSbAlarm6.OverlapOptimize = true; this.labelSbAlarm6.PasswordChar = '\0'; @@ -670,7 +812,7 @@ this.labelSbAlarm1.BorderColor = System.Drawing.Color.Red; this.labelSbAlarm1.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; this.labelSbAlarm1.LineSpacing = 0F; - this.labelSbAlarm1.Location = new System.Drawing.Point(67, 664); + this.labelSbAlarm1.Location = new System.Drawing.Point(69, 664); this.labelSbAlarm1.Name = "labelSbAlarm1"; this.labelSbAlarm1.OverlapOptimize = true; this.labelSbAlarm1.PasswordChar = '\0'; @@ -951,7 +1093,7 @@ this.smartButton2.ImageDisable = null; this.smartButton2.ImageDown = null; this.smartButton2.ImageUp = null; - this.smartButton2.Location = new System.Drawing.Point(917, 409); + this.smartButton2.Location = new System.Drawing.Point(917, 391); this.smartButton2.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.smartButton2.Name = "smartButton2"; this.smartButton2.NestedClickEventPrevent = false; @@ -1013,7 +1155,7 @@ this.labelTime.BackGroundColor = System.Drawing.Color.SkyBlue; this.labelTime.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTime.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelTime.LineSpacing = 0F; this.labelTime.Location = new System.Drawing.Point(147, 119); this.labelTime.Name = "labelTime"; @@ -1715,7 +1857,7 @@ // // labelAlarm // - this.labelAlarm.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(51)))), ((int)(((byte)(53))))); + this.labelAlarm.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65))))); this.labelAlarm.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular); this.labelAlarm.ForeColor = System.Drawing.Color.White; this.labelAlarm.Location = new System.Drawing.Point(3, 27); @@ -2206,27 +2348,6 @@ this.buttonUser.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonUser.Click += new System.EventHandler(this.buttonUser_Click); // - // labelCommunicationStatus - // - this.labelCommunicationStatus.BackGround = null; - this.labelCommunicationStatus.BackGroundColor = System.Drawing.Color.Lime; - this.labelCommunicationStatus.BorderColor = System.Drawing.Color.Lime; - this.labelCommunicationStatus.BorderStyle = SmartX.SmartLabel.BorderStyles.RoundRect; - this.labelCommunicationStatus.LineSpacing = 0F; - this.labelCommunicationStatus.Location = new System.Drawing.Point(891, 58); - this.labelCommunicationStatus.Name = "labelCommunicationStatus"; - this.labelCommunicationStatus.OverlapOptimize = true; - this.labelCommunicationStatus.PasswordChar = '\0'; - this.labelCommunicationStatus.Radius = 20; - this.labelCommunicationStatus.RoundRectFillColor = System.Drawing.Color.Lime; - this.labelCommunicationStatus.Size = new System.Drawing.Size(10, 10); - this.labelCommunicationStatus.TabIndex = 69; - this.labelCommunicationStatus.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelCommunicationStatus.TextColorDisable = System.Drawing.Color.Gray; - this.labelCommunicationStatus.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; - this.labelCommunicationStatus.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; - this.labelCommunicationStatus.Wordwrap = false; - // // labelStop // this.labelStop.BackGround = this.smartForm1; @@ -2474,52 +2595,15 @@ this.smartTimerMessageShow.TimeFormStringSeparator = ":"; this.smartTimerMessageShow.Tick += new System.EventHandler(this.smartTimerMessageShow_Tick); // - // labelUserID + // smartTimerLogin // - this.labelUserID.BackGround = this.smartForm1; - this.labelUserID.BackGroundColor = System.Drawing.Color.SkyBlue; - this.labelUserID.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelUserID.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelUserID.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); - this.labelUserID.LineSpacing = 0F; - this.labelUserID.Location = new System.Drawing.Point(782, 18); - this.labelUserID.Name = "labelUserID"; - this.labelUserID.OverlapOptimize = true; - this.labelUserID.PasswordChar = '\0'; - this.labelUserID.Radius = 3; - this.labelUserID.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelUserID.Size = new System.Drawing.Size(119, 20); - this.labelUserID.TabIndex = 267; - this.labelUserID.Text = "ABCDEFG"; - this.labelUserID.TextColor = System.Drawing.Color.White; - this.labelUserID.TextColorDisable = System.Drawing.Color.Gray; - this.labelUserID.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelUserID.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelUserID.Wordwrap = false; + this.smartTimerLogin.CounterMode = SmartX.SmartTimer.CounterModes.Up_Counter; + this.smartTimerLogin.Interval = 3000; + this.smartTimerLogin.IntervalSeries = null; + this.smartTimerLogin.TimeCount = ((long)(1000000)); + this.smartTimerLogin.TimeFormStringSeparator = ":"; + this.smartTimerLogin.Tick += new System.EventHandler(this.smartTimerLogin_Tick); // - // labelUserLevel - // - this.labelUserLevel.BackGround = this.smartForm1; - this.labelUserLevel.BackGroundColor = System.Drawing.Color.SkyBlue; - this.labelUserLevel.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelUserLevel.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelUserLevel.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); - this.labelUserLevel.LineSpacing = 0F; - this.labelUserLevel.Location = new System.Drawing.Point(782, 44); - this.labelUserLevel.Name = "labelUserLevel"; - this.labelUserLevel.OverlapOptimize = true; - this.labelUserLevel.PasswordChar = '\0'; - this.labelUserLevel.Radius = 3; - this.labelUserLevel.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelUserLevel.Size = new System.Drawing.Size(119, 20); - this.labelUserLevel.TabIndex = 268; - this.labelUserLevel.Text = "ABCDEFG"; - this.labelUserLevel.TextColor = System.Drawing.Color.White; - this.labelUserLevel.TextColorDisable = System.Drawing.Color.Gray; - this.labelUserLevel.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelUserLevel.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelUserLevel.Wordwrap = false; - // // FormMainDisplay2 // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -2642,5 +2726,8 @@ private SmartX.SmartLabel smartLabel21; private SmartX.SmartLabel smartLabel20; private SmartX.SmartLabel smartLabel19; + private SmartX.SmartButton smartButton3; + private SmartX.SmartButton smartButton4; + private SmartX.SmartTimer smartTimerLogin; } } \ No newline at end of file diff --git a/INT_PT002/Forms/FormMainDisplay2.cs b/INT_PT002/Forms/FormMainDisplay2.cs index db0704d..27ef697 100644 --- a/INT_PT002/Forms/FormMainDisplay2.cs +++ b/INT_PT002/Forms/FormMainDisplay2.cs @@ -278,6 +278,7 @@ namespace INT_PT002.Forms this.buttonRecipeNo.Enabled = true; this.buttonClear.Enabled = true; this.buttonInspection.Enabled = true; + this.buttonMenu.Enabled = true; } else if (user.Status == Define.E_UserStatus.LogOff) { @@ -291,6 +292,7 @@ namespace INT_PT002.Forms this.buttonRecipeNo.Enabled = false; this.buttonClear.Enabled = false; this.buttonInspection.Enabled = false; + this.buttonMenu.Enabled = false; } else { @@ -304,6 +306,7 @@ namespace INT_PT002.Forms this.buttonRecipeNo.Enabled = user.IsMainRecipeChange; this.buttonClear.Enabled = user.IsMainClear; this.buttonInspection.Enabled = true; + this.buttonMenu.Enabled = true; } if (this.labelUserLevel.Text != group) @@ -597,15 +600,19 @@ namespace INT_PT002.Forms this.CollectionLabelSbAlarm[9].Visible = alarm.CollectionIsSensorBoardError[9]; value = value.Trim(); - this.labelAlarm.Size = new Size(value.Length * 8, 20); + this.labelAlarm.Size = new Size(value.Length * 9, 20); this.labelAlarm.Text = value; - this.labelAlarm.Location = new Point(6, 22); if (this.labelAlarm.Width > 548) { if (this.labelAlarm.Text != "") this.smartTimerAlarm.Start(); } + else + { + this.smartTimerAlarm.Stop(); + this.labelAlarm.Location = new Point(3, 27); + } } public void UpdateDisplayDiffData(Collection datas) { @@ -653,6 +660,15 @@ namespace INT_PT002.Forms } #endregion + #region Override Member + protected override void OnLoad(EventArgs e) + { + base.OnLoad(e); + + this.smartTimerLogin.Start(); + } + #endregion + #region Event Handler private void labelStop_Click(object sender, EventArgs e) { @@ -796,6 +812,12 @@ namespace INT_PT002.Forms DialogFormMessage msg = new DialogFormMessage(1, this.ParentForm.SystemConfig.LANGUAGE, this.MessageBoxRange); msg.ShowDialog(); } + private void smartTimerLogin_Tick(object sender, EventArgs e) + { + this.smartTimerLogin.Stop(); + + this.Login(); + } #endregion private void smartButton1_Click(object sender, EventArgs e) @@ -812,7 +834,7 @@ namespace INT_PT002.Forms //value += "a6_Pressure "; value = value.Trim(); - this.labelAlarm.Size = new Size(value.Length * 8, 20); + this.labelAlarm.Size = new Size(value.Length * 9, 20); this.labelAlarm.Text = value; if (this.labelAlarm.Width > 548) @@ -820,6 +842,11 @@ namespace INT_PT002.Forms if (this.labelAlarm.Text != "") this.smartTimerAlarm.Start(); } + else + { + this.smartTimerAlarm.Stop(); + this.labelAlarm.Location = new Point(3, 27); + } } private void smartButton2_Click(object sender, EventArgs e) @@ -828,6 +855,64 @@ namespace INT_PT002.Forms this.smartTimerAlarm.Stop(); + value = "a1_Servo emergency stop "; + value += "a2_Servo1 "; + //value += "a3_Servo2 "; + //value += "a4_Servo1 Torque "; + //value += "a5_Servo2 Torque "; + //value += "a6_Pressure "; + + value = value.Trim(); + this.labelAlarm.Size = new Size(value.Length * 9, 20); + this.labelAlarm.Text = value; + + if (this.labelAlarm.Width > 548) + { + if (this.labelAlarm.Text != "") + this.smartTimerAlarm.Start(); + } + else + { + this.smartTimerAlarm.Stop(); + this.labelAlarm.Location = new Point(3, 27); + } + } + + private void smartButton3_Click(object sender, EventArgs e) + { + string value = ""; + + this.smartTimerAlarm.Stop(); + + value = "a1_Servo emergency stop "; + value += "a2_Servo1 "; + value += "a3_Servo2 "; + //value += "a4_Servo1 Torque "; + //value += "a5_Servo2 Torque "; + //value += "a6_Pressure "; + + value = value.Trim(); + this.labelAlarm.Size = new Size(value.Length * 9, 20); + this.labelAlarm.Text = value; + + if (this.labelAlarm.Width > 548) + { + if (this.labelAlarm.Text != "") + this.smartTimerAlarm.Start(); + } + else + { + this.smartTimerAlarm.Stop(); + this.labelAlarm.Location = new Point(3, 27); + } + } + + private void smartButton4_Click(object sender, EventArgs e) + { + string value = ""; + + this.smartTimerAlarm.Stop(); + value = "a1_Servo emergency stop "; value += "a2_Servo1 "; value += "a3_Servo2 "; @@ -836,7 +921,7 @@ namespace INT_PT002.Forms //value += "a6_Pressure "; value = value.Trim(); - this.labelAlarm.Size = new Size(value.Length * 8, 20); + this.labelAlarm.Size = new Size(value.Length * 9, 20); this.labelAlarm.Text = value; if (this.labelAlarm.Width > 548) @@ -844,29 +929,10 @@ namespace INT_PT002.Forms if (this.labelAlarm.Text != "") this.smartTimerAlarm.Start(); } - } - - private void smartButton3_Click(object sender, EventArgs e) - { - string value = ""; - - this.smartTimerAlarm.Stop(); - - value = "a1_Servo emergency stop "; - value += "a2_Servo1 "; - value += "a3_Servo2 "; - value += "a4_Servo1 Torque "; - value += "a5_Servo2 Torque "; - value += "a6_Pressure "; - - value = value.Trim(); - this.labelAlarm.Size = new Size(value.Length * 8, 20); - this.labelAlarm.Text = value; - - if (this.labelAlarm.Width > 548) + else { - if (this.labelAlarm.Text != "") - this.smartTimerAlarm.Start(); + this.smartTimerAlarm.Stop(); + this.labelAlarm.Location = new Point(3, 27); } } } diff --git a/INT_PT002/Forms/FormMainDisplay2.resx b/INT_PT002/Forms/FormMainDisplay2.resx index 27b6b55..4aaaa73 100644 --- a/INT_PT002/Forms/FormMainDisplay2.resx +++ b/INT_PT002/Forms/FormMainDisplay2.resx @@ -3239,6 +3239,9 @@ 164, 11 + + 358, 11 + WEBPAD