diff --git a/INT_LKD_2.suo b/INT_LKD_2.suo index 1c6ed8e..fc606d0 100644 Binary files a/INT_LKD_2.suo and b/INT_LKD_2.suo differ diff --git a/INT_LKD_2/Controls/Manual/ControlMenuManualIoTest.Designer.cs b/INT_LKD_2/Controls/Manual/ControlMenuManualIoTest.Designer.cs index eb51125..f46051a 100644 --- a/INT_LKD_2/Controls/Manual/ControlMenuManualIoTest.Designer.cs +++ b/INT_LKD_2/Controls/Manual/ControlMenuManualIoTest.Designer.cs @@ -107,7 +107,7 @@ this.smartGroupBox1.Controls.Add(this.groupBoxOutput); this.smartGroupBox1.Controls.Add(this.groupBoxStatus); this.smartGroupBox1.Controls.Add(this.groupBoxInput); - this.smartGroupBox1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartGroupBox1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65))))); this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.smartGroupBox1.FrameLineThickness = 2; @@ -147,7 +147,7 @@ this.groupBoxServo.Controls.Add(this.buttonMotor1Origin); this.groupBoxServo.Controls.Add(this.buttonMotorChamber2); this.groupBoxServo.Controls.Add(this.buttonMotorChamber1); - this.groupBoxServo.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.groupBoxServo.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.groupBoxServo.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(92)))), ((int)(((byte)(118))))); this.groupBoxServo.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(92)))), ((int)(((byte)(118))))); this.groupBoxServo.FrameLineThickness = 2; @@ -195,7 +195,7 @@ this.buttonMotorReady.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonMotorReady.ButtonText = "Ready"; this.buttonMotorReady.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonMotorReady.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonMotorReady.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonMotorReady.GroupID = 0; this.buttonMotorReady.ImageDisable = null; this.buttonMotorReady.ImageDown = null; @@ -231,7 +231,7 @@ this.buttonJogCCW.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonJogCCW.ButtonText = "JOG CCW"; this.buttonJogCCW.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonJogCCW.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonJogCCW.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonJogCCW.GroupID = 0; this.buttonJogCCW.ImageDisable = null; this.buttonJogCCW.ImageDown = null; @@ -255,6 +255,7 @@ this.buttonJogCCW.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); this.buttonJogCCW.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonJogCCW.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonJogCCW.Visible = false; this.buttonJogCCW.MouseMove += new System.Windows.Forms.MouseEventHandler(this.buttonJogCCW_MouseMove); this.buttonJogCCW.MouseDown += new System.Windows.Forms.MouseEventHandler(this.buttonJogCCW_MouseDown); // @@ -268,7 +269,7 @@ this.buttonJogCW.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonJogCW.ButtonText = "JOG CW"; this.buttonJogCW.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonJogCW.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonJogCW.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonJogCW.GroupID = 0; this.buttonJogCW.ImageDisable = null; this.buttonJogCW.ImageDown = null; @@ -292,6 +293,7 @@ this.buttonJogCW.TextDownColor = System.Drawing.Color.FromArgb(((int)(((byte)(233)))), ((int)(((byte)(238)))), ((int)(((byte)(255))))); this.buttonJogCW.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonJogCW.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonJogCW.Visible = false; this.buttonJogCW.MouseMove += new System.Windows.Forms.MouseEventHandler(this.buttonJogCW_MouseMove); this.buttonJogCW.MouseDown += new System.Windows.Forms.MouseEventHandler(this.buttonJogCW_MouseDown); // @@ -353,7 +355,7 @@ this.buttonMotorDischarge.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonMotorDischarge.ButtonText = "Discharge"; this.buttonMotorDischarge.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonMotorDischarge.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonMotorDischarge.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonMotorDischarge.GroupID = 0; this.buttonMotorDischarge.ImageDisable = null; this.buttonMotorDischarge.ImageDown = null; @@ -389,7 +391,7 @@ this.buttonMotorChamber6.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonMotorChamber6.ButtonText = "Chamber 6"; this.buttonMotorChamber6.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonMotorChamber6.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonMotorChamber6.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonMotorChamber6.GroupID = 0; this.buttonMotorChamber6.ImageDisable = null; this.buttonMotorChamber6.ImageDown = null; @@ -449,7 +451,7 @@ this.buttonMotorChamber5.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonMotorChamber5.ButtonText = "Chamber 5"; this.buttonMotorChamber5.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonMotorChamber5.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonMotorChamber5.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonMotorChamber5.GroupID = 0; this.buttonMotorChamber5.ImageDisable = null; this.buttonMotorChamber5.ImageDown = null; @@ -533,7 +535,7 @@ this.buttonMotorChamber4.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonMotorChamber4.ButtonText = "Chamber 4"; this.buttonMotorChamber4.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonMotorChamber4.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonMotorChamber4.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonMotorChamber4.GroupID = 0; this.buttonMotorChamber4.ImageDisable = null; this.buttonMotorChamber4.ImageDown = null; @@ -569,7 +571,7 @@ this.buttonMotorChamber3.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonMotorChamber3.ButtonText = "Chamber 3"; this.buttonMotorChamber3.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonMotorChamber3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonMotorChamber3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonMotorChamber3.GroupID = 0; this.buttonMotorChamber3.ImageDisable = null; this.buttonMotorChamber3.ImageDown = null; @@ -605,7 +607,7 @@ this.buttonMotor1AlarmClear.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonMotor1AlarmClear.ButtonText = "Alarm Clear"; this.buttonMotor1AlarmClear.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonMotor1AlarmClear.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonMotor1AlarmClear.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonMotor1AlarmClear.GroupID = 0; this.buttonMotor1AlarmClear.ImageDisable = null; this.buttonMotor1AlarmClear.ImageDown = null; @@ -713,7 +715,7 @@ this.buttonMotor1Origin.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonMotor1Origin.ButtonText = "ORIGIN"; this.buttonMotor1Origin.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonMotor1Origin.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonMotor1Origin.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonMotor1Origin.GroupID = 0; this.buttonMotor1Origin.ImageDisable = null; this.buttonMotor1Origin.ImageDown = null; @@ -749,7 +751,7 @@ this.buttonMotorChamber2.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonMotorChamber2.ButtonText = "Chamber 2"; this.buttonMotorChamber2.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonMotorChamber2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonMotorChamber2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonMotorChamber2.GroupID = 0; this.buttonMotorChamber2.ImageDisable = null; this.buttonMotorChamber2.ImageDown = null; @@ -785,7 +787,7 @@ this.buttonMotorChamber1.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonMotorChamber1.ButtonText = "Chamber 1"; this.buttonMotorChamber1.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonMotorChamber1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonMotorChamber1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonMotorChamber1.GroupID = 0; this.buttonMotorChamber1.ImageDisable = null; this.buttonMotorChamber1.ImageDown = null; @@ -830,7 +832,7 @@ this.groupBoxOutput.Controls.Add(this.buttonOut5); this.groupBoxOutput.Controls.Add(this.buttonOut6); this.groupBoxOutput.Controls.Add(this.buttonOut7); - this.groupBoxOutput.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.groupBoxOutput.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.groupBoxOutput.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(92)))), ((int)(((byte)(118))))); this.groupBoxOutput.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(92)))), ((int)(((byte)(118))))); this.groupBoxOutput.FrameLineThickness = 2; @@ -850,7 +852,7 @@ this.labelTitleDiscriptionPD.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelTitleDiscriptionPD.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTitleDiscriptionPD.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleDiscriptionPD.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelTitleDiscriptionPD.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelTitleDiscriptionPD.LineSpacing = 0F; this.labelTitleDiscriptionPD.Location = new System.Drawing.Point(31, 410); this.labelTitleDiscriptionPD.Name = "labelTitleDiscriptionPD"; @@ -874,7 +876,7 @@ this.labelTitleDiscriptionCD.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelTitleDiscriptionCD.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTitleDiscriptionCD.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleDiscriptionCD.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelTitleDiscriptionCD.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelTitleDiscriptionCD.LineSpacing = 0F; this.labelTitleDiscriptionCD.Location = new System.Drawing.Point(31, 390); this.labelTitleDiscriptionCD.Name = "labelTitleDiscriptionCD"; @@ -901,7 +903,7 @@ this.buttonOut11.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonOut11.ButtonText = "None"; this.buttonOut11.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonOut11.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonOut11.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonOut11.GroupID = 0; this.buttonOut11.ImageDisable = null; this.buttonOut11.ImageDown = null; @@ -937,7 +939,7 @@ this.buttonOut12.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonOut12.ButtonText = "None"; this.buttonOut12.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonOut12.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonOut12.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonOut12.GroupID = 0; this.buttonOut12.ImageDisable = null; this.buttonOut12.ImageDown = null; @@ -973,7 +975,7 @@ this.buttonOut10.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonOut10.ButtonText = "None"; this.buttonOut10.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonOut10.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonOut10.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonOut10.GroupID = 0; this.buttonOut10.ImageDisable = null; this.buttonOut10.ImageDown = null; @@ -1009,7 +1011,7 @@ this.buttonOut1.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonOut1.ButtonText = "Red"; this.buttonOut1.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonOut1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonOut1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonOut1.GroupID = 0; this.buttonOut1.ImageDisable = null; this.buttonOut1.ImageDown = null; @@ -1045,7 +1047,7 @@ this.buttonOut2.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonOut2.ButtonText = "Green"; this.buttonOut2.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonOut2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonOut2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonOut2.GroupID = 0; this.buttonOut2.ImageDisable = null; this.buttonOut2.ImageDown = null; @@ -1081,7 +1083,7 @@ this.buttonOut9.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonOut9.ButtonText = "None"; this.buttonOut9.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonOut9.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonOut9.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonOut9.GroupID = 0; this.buttonOut9.ImageDisable = null; this.buttonOut9.ImageDown = null; @@ -1117,7 +1119,7 @@ this.buttonOut3.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonOut3.ButtonText = "Buzzer"; this.buttonOut3.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonOut3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonOut3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonOut3.GroupID = 0; this.buttonOut3.ImageDisable = null; this.buttonOut3.ImageDown = null; @@ -1153,7 +1155,7 @@ this.buttonOut4.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonOut4.ButtonText = "Valve relief"; this.buttonOut4.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonOut4.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonOut4.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonOut4.GroupID = 0; this.buttonOut4.ImageDisable = null; this.buttonOut4.ImageDown = null; @@ -1189,7 +1191,7 @@ this.buttonOut8.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonOut8.ButtonText = "None"; this.buttonOut8.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonOut8.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonOut8.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonOut8.GroupID = 0; this.buttonOut8.ImageDisable = null; this.buttonOut8.ImageDown = null; @@ -1225,7 +1227,7 @@ this.buttonOut5.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonOut5.ButtonText = "Valve hold 1"; this.buttonOut5.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonOut5.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonOut5.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonOut5.GroupID = 0; this.buttonOut5.ImageDisable = null; this.buttonOut5.ImageDown = null; @@ -1261,7 +1263,7 @@ this.buttonOut6.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonOut6.ButtonText = "Valve hold 2"; this.buttonOut6.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonOut6.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonOut6.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonOut6.GroupID = 0; this.buttonOut6.ImageDisable = null; this.buttonOut6.ImageDown = null; @@ -1297,7 +1299,7 @@ this.buttonOut7.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonOut7.ButtonText = "CD Sol Valve"; this.buttonOut7.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonOut7.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonOut7.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonOut7.GroupID = 0; this.buttonOut7.ImageDisable = null; this.buttonOut7.ImageDown = null; @@ -1339,7 +1341,7 @@ this.groupBoxStatus.Controls.Add(this.labelTitleDisp); this.groupBoxStatus.Controls.Add(this.labelSbAlarm1); this.groupBoxStatus.Controls.Add(this.labelLane); - this.groupBoxStatus.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.groupBoxStatus.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.groupBoxStatus.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(92)))), ((int)(((byte)(118))))); this.groupBoxStatus.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(92)))), ((int)(((byte)(118))))); this.groupBoxStatus.FrameLineThickness = 2; @@ -1382,7 +1384,7 @@ this.labelTitlePressureW.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelTitlePressureW.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTitlePressureW.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitlePressureW.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelTitlePressureW.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelTitlePressureW.LineSpacing = 0F; this.labelTitlePressureW.Location = new System.Drawing.Point(115, 102); this.labelTitlePressureW.Name = "labelTitlePressureW"; @@ -1449,7 +1451,7 @@ this.labelTitlePressureM.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelTitlePressureM.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTitlePressureM.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitlePressureM.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelTitlePressureM.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelTitlePressureM.LineSpacing = 0F; this.labelTitlePressureM.Location = new System.Drawing.Point(115, 129); this.labelTitlePressureM.Name = "labelTitlePressureM"; @@ -1495,7 +1497,7 @@ this.labelTitleDiff.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelTitleDiff.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTitleDiff.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleDiff.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleDiff.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelTitleDiff.LineSpacing = 0F; this.labelTitleDiff.Location = new System.Drawing.Point(115, 75); this.labelTitleDiff.Name = "labelTitleDiff"; @@ -1541,7 +1543,7 @@ this.labelTitleDisp.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelTitleDisp.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTitleDisp.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleDisp.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleDisp.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelTitleDisp.LineSpacing = 0F; this.labelTitleDisp.Location = new System.Drawing.Point(115, 48); this.labelTitleDisp.Name = "labelTitleDisp"; @@ -1617,7 +1619,7 @@ this.groupBoxInput.Controls.Add(this.labelTitleInput1); this.groupBoxInput.Controls.Add(this.labelInput3); this.groupBoxInput.Controls.Add(this.labelInput1); - this.groupBoxInput.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.groupBoxInput.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.groupBoxInput.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(92)))), ((int)(((byte)(118))))); this.groupBoxInput.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(92)))), ((int)(((byte)(118))))); this.groupBoxInput.FrameLineThickness = 2; @@ -1637,7 +1639,7 @@ this.labelTitleInput5.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelTitleInput5.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTitleInput5.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleInput5.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelTitleInput5.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelTitleInput5.LineSpacing = 0F; this.labelTitleInput5.Location = new System.Drawing.Point(51, 125); this.labelTitleInput5.Name = "labelTitleInput5"; @@ -1681,7 +1683,7 @@ this.labelTitleInput4.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelTitleInput4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTitleInput4.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleInput4.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelTitleInput4.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelTitleInput4.LineSpacing = 0F; this.labelTitleInput4.Location = new System.Drawing.Point(207, 89); this.labelTitleInput4.Name = "labelTitleInput4"; @@ -1704,7 +1706,7 @@ this.labelTitleInput2.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelTitleInput2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTitleInput2.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleInput2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelTitleInput2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelTitleInput2.LineSpacing = 0F; this.labelTitleInput2.Location = new System.Drawing.Point(207, 53); this.labelTitleInput2.Name = "labelTitleInput2"; @@ -1769,7 +1771,7 @@ this.labelTitleInput3.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelTitleInput3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTitleInput3.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleInput3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelTitleInput3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelTitleInput3.LineSpacing = 0F; this.labelTitleInput3.Location = new System.Drawing.Point(51, 89); this.labelTitleInput3.Name = "labelTitleInput3"; @@ -1792,7 +1794,7 @@ this.labelTitleInput1.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(24)))), ((int)(((byte)(32))))); this.labelTitleInput1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTitleInput1.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleInput1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelTitleInput1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelTitleInput1.LineSpacing = 0F; this.labelTitleInput1.Location = new System.Drawing.Point(51, 53); this.labelTitleInput1.Name = "labelTitleInput1"; diff --git a/INT_LKD_2/Controls/Recipe/ControlMenuRecipeSetting.cs b/INT_LKD_2/Controls/Recipe/ControlMenuRecipeSetting.cs index 1f8bac8..6f7cf08 100644 --- a/INT_LKD_2/Controls/Recipe/ControlMenuRecipeSetting.cs +++ b/INT_LKD_2/Controls/Recipe/ControlMenuRecipeSetting.cs @@ -1116,6 +1116,9 @@ namespace INT_LKD_2.Controls } private void radioButton1_Click(object sender, EventArgs e) { + this.buttonSlave.ButtonText = "1"; + this.buttonMaster.ButtonText = "12"; + this.radioButton1.RadioBackColor = Define.ColorSelected; this.radioButton2.RadioBackColor = Define.ColorNoneSelected; this.radioButton3.RadioBackColor = Define.ColorNoneSelected; @@ -1132,6 +1135,9 @@ namespace INT_LKD_2.Controls } private void radioButton2_Click(object sender, EventArgs e) { + this.buttonSlave.ButtonText = "2"; + this.buttonMaster.ButtonText = "11"; + this.radioButton1.RadioBackColor = Define.ColorNoneSelected; this.radioButton2.RadioBackColor = Define.ColorSelected; this.radioButton3.RadioBackColor = Define.ColorNoneSelected; @@ -1148,6 +1154,9 @@ namespace INT_LKD_2.Controls } private void radioButton3_Click(object sender, EventArgs e) { + this.buttonSlave.ButtonText = "3"; + this.buttonMaster.ButtonText = "10"; + this.radioButton1.RadioBackColor = Define.ColorNoneSelected; this.radioButton2.RadioBackColor = Define.ColorNoneSelected; this.radioButton3.RadioBackColor = Define.ColorSelected; @@ -1164,6 +1173,9 @@ namespace INT_LKD_2.Controls } private void radioButton4_Click(object sender, EventArgs e) { + this.buttonSlave.ButtonText = "4"; + this.buttonMaster.ButtonText = "9"; + this.radioButton1.RadioBackColor = Define.ColorNoneSelected; this.radioButton2.RadioBackColor = Define.ColorNoneSelected; this.radioButton3.RadioBackColor = Define.ColorNoneSelected; @@ -1180,6 +1192,9 @@ namespace INT_LKD_2.Controls } private void radioButton5_Click(object sender, EventArgs e) { + this.buttonSlave.ButtonText = "5"; + this.buttonMaster.ButtonText = "8"; + this.radioButton1.RadioBackColor = Define.ColorNoneSelected; this.radioButton2.RadioBackColor = Define.ColorNoneSelected; this.radioButton3.RadioBackColor = Define.ColorNoneSelected; @@ -1196,6 +1211,9 @@ namespace INT_LKD_2.Controls } private void radioButton6_Click(object sender, EventArgs e) { + this.buttonSlave.ButtonText = "6"; + this.buttonMaster.ButtonText = "7"; + this.radioButton1.RadioBackColor = Define.ColorNoneSelected; this.radioButton2.RadioBackColor = Define.ColorNoneSelected; this.radioButton3.RadioBackColor = Define.ColorNoneSelected; diff --git a/INT_LKD_2/Controls/User/ControlMenuUserMyPage.Designer.cs b/INT_LKD_2/Controls/User/ControlMenuUserMyPage.Designer.cs index 884fcbc..6edd72a 100644 --- a/INT_LKD_2/Controls/User/ControlMenuUserMyPage.Designer.cs +++ b/INT_LKD_2/Controls/User/ControlMenuUserMyPage.Designer.cs @@ -58,7 +58,7 @@ this.smartGroupBox1.Controls.Add(this.labelID); this.smartGroupBox1.Controls.Add(this.labelTitleID); this.smartGroupBox1.Controls.Add(this.buttonChange); - this.smartGroupBox1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartGroupBox1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartGroupBox1.FrameLineColor1 = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65))))); this.smartGroupBox1.FrameLineColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65))))); this.smartGroupBox1.FrameLineThickness = 2; @@ -190,6 +190,7 @@ this.labelTitleVerify.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.labelTitleVerify.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTitleVerify.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.labelTitleVerify.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelTitleVerify.LineSpacing = 0F; this.labelTitleVerify.Location = new System.Drawing.Point(102, 216); this.labelTitleVerify.Name = "labelTitleVerify"; @@ -212,6 +213,7 @@ this.labelTitleNew.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.labelTitleNew.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTitleNew.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.labelTitleNew.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelTitleNew.LineSpacing = 0F; this.labelTitleNew.Location = new System.Drawing.Point(102, 173); this.labelTitleNew.Name = "labelTitleNew"; @@ -234,7 +236,7 @@ this.labelID.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(51)))), ((int)(((byte)(65))))); this.labelID.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelID.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelID.Font = new System.Drawing.Font("Arial", 15F, System.Drawing.FontStyle.Regular); + this.labelID.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); this.labelID.LineSpacing = 0F; this.labelID.Location = new System.Drawing.Point(266, 131); this.labelID.Name = "labelID"; @@ -257,6 +259,7 @@ this.labelTitleID.BackGroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(58)))), ((int)(((byte)(110)))), ((int)(((byte)(165))))); this.labelTitleID.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); this.labelTitleID.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.labelTitleID.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelTitleID.LineSpacing = 0F; this.labelTitleID.Location = new System.Drawing.Point(102, 130); this.labelTitleID.Name = "labelTitleID"; @@ -283,6 +286,7 @@ this.buttonChange.ButtonStyle = SmartX.SmartButton.ButtonStyles.FlatRound; this.buttonChange.ButtonText = "Change"; this.buttonChange.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonChange.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonChange.GroupID = 0; this.buttonChange.ImageDisable = null; this.buttonChange.ImageDown = null; diff --git a/INT_LKD_2/Controls/User/ControlMenuUserUserEditor.cs b/INT_LKD_2/Controls/User/ControlMenuUserUserEditor.cs index d271d31..9bc56d6 100644 --- a/INT_LKD_2/Controls/User/ControlMenuUserUserEditor.cs +++ b/INT_LKD_2/Controls/User/ControlMenuUserUserEditor.cs @@ -158,6 +158,8 @@ namespace INT_LKD_2.Controls this.checkBoxMenuEthernet.Text = "Ethernet"; break; case Define.E_LanguageID.Korean: + this.smartGroupBox1.Text = "User > UserEditor"; + this.labelTitleID.Text = "ID"; this.labelTitlePassword.Text = "비밀번호"; @@ -201,6 +203,8 @@ namespace INT_LKD_2.Controls this.checkBoxMenuEthernet.Text = "Ethernet"; break; default: + this.smartGroupBox1.Text = "User > UserEditor"; + this.labelTitleID.Text = "ID"; this.labelTitlePassword.Text = "Password"; diff --git a/INT_LKD_2/DataStore/AlarmList.cs b/INT_LKD_2/DataStore/AlarmList.cs index b08a9b4..78c6e2b 100644 --- a/INT_LKD_2/DataStore/AlarmList.cs +++ b/INT_LKD_2/DataStore/AlarmList.cs @@ -130,7 +130,298 @@ namespace INT_LKD_2.DataStore this.A18_DispSensorError2 = false; } - public void SetAlarm(string alarm) + public void SetAlarmMaster(string alarm) + { + string sValue1 = "", sValue2 = "", sValue3 = "", sValue4 = "", sValue5 = "", sValue6 = "", sValue7 = "", sValue8 = ""; + + if (alarm.Length != 8) + return; + + sValue1 = Convert.ToString(Convert.ToInt16(alarm.Substring(0, 1), 16), 2).PadLeft((4 <= 1) ? 1 : 4, '0'); + sValue2 = Convert.ToString(Convert.ToInt16(alarm.Substring(1, 1), 16), 2).PadLeft((4 <= 1) ? 1 : 4, '0'); + sValue3 = Convert.ToString(Convert.ToInt16(alarm.Substring(2, 1), 16), 2).PadLeft((4 <= 1) ? 1 : 4, '0'); + sValue4 = Convert.ToString(Convert.ToInt16(alarm.Substring(3, 1), 16), 2).PadLeft((4 <= 1) ? 1 : 4, '0'); + sValue5 = Convert.ToString(Convert.ToInt16(alarm.Substring(4, 1), 16), 2).PadLeft((4 <= 1) ? 1 : 4, '0'); + sValue6 = Convert.ToString(Convert.ToInt16(alarm.Substring(5, 1), 16), 2).PadLeft((4 <= 1) ? 1 : 4, '0'); + sValue7 = Convert.ToString(Convert.ToInt16(alarm.Substring(6, 1), 16), 2).PadLeft((4 <= 1) ? 1 : 4, '0'); + sValue8 = Convert.ToString(Convert.ToInt16(alarm.Substring(7, 1), 16), 2).PadLeft((4 <= 1) ? 1 : 4, '0'); + + // 알람 20- + if (sValue5[0] == '0') + { + } + else + { + } + // 알람 19- + if (sValue5[1] == '0') + { + } + else + { + } + // 알람 18-변위센서에러2 + if (sValue5[2] == '0') + { + //if (this.A18_DispSensorError2 != false) + //{ + // this.A18_DispSensorError2 = false; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a18_DispSensorError2, "OFF"); + //} + } + else + { + //if (this.A18_DispSensorError2 != true) + //{ + // this.A18_DispSensorError2 = true; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a18_DispSensorError2, "ON"); + //} + } + // 알람 17-변위센서에러1 + if (sValue5[3] == '0') + { + if (this.A17_DispSensorError1 != false) + { + this.A17_DispSensorError1 = false; + this.EventAlarmStateChange(Define.E_TrackingAlarm.a17_DispSensorError1, "OFF"); + } + } + else + { + if (this.A17_DispSensorError1 != true) + { + this.A17_DispSensorError1 = true; + this.EventAlarmStateChange(Define.E_TrackingAlarm.a17_DispSensorError1, "ON"); + } + } + + // 알람 16- + if (sValue4[0] == '0') + { + } + else + { + } + // 알람 15- + if (sValue4[1] == '0') + { + } + else + { + } + // 알람 14-차압센서에러2 + if (sValue4[2] == '0') + { + //if (this.A14_DiffSensorError2 != false) + //{ + // this.A14_DiffSensorError2 = false; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a14_DiffSensorError2, "OFF"); + //} + } + else + { + //if (this.A14_DiffSensorError2 != true) + //{ + // this.A14_DiffSensorError2 = true; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a14_DiffSensorError2, "ON"); + //} + } + // 알람 13-차압센서에러1 + if (sValue4[3] == '0') + { + if (this.A13_DiffSensorError1 != false) + { + this.A13_DiffSensorError1 = false; + this.EventAlarmStateChange(Define.E_TrackingAlarm.a13_DiffSensorError1, "OFF"); + } + } + else + { + if (this.A13_DiffSensorError1 != true) + { + this.A13_DiffSensorError1 = true; + this.EventAlarmStateChange(Define.E_TrackingAlarm.a13_DiffSensorError1, "ON"); + } + } + + // 알람 12- + if (sValue3[0] == '0') + { + } + else + { + } + // 알람 11- + if (sValue3[1] == '0') + { + } + else + { + } + // 알람 10-압력센서에러2 + if (sValue3[2] == '0') + { + //if (this.A10_PressureSensorError2 != false) + //{ + // this.A10_PressureSensorError2 = false; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a10_PressureSensorError2, "OFF"); + //} + } + else + { + //if (this.A10_PressureSensorError2 != true) + //{ + // this.A10_PressureSensorError2 = true; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a10_PressureSensorError2, "ON"); + //} + } + // 알람 9-압력센서에러1 + if (sValue3[3] == '0') + { + if (this.A9_PressureSensorError1 != false) + { + this.A9_PressureSensorError1 = false; + this.EventAlarmStateChange(Define.E_TrackingAlarm.a9_PressureSensorError1, "OFF"); + } + } + else + { + if (this.A9_PressureSensorError1 != true) + { + this.A9_PressureSensorError1 = true; + this.EventAlarmStateChange(Define.E_TrackingAlarm.a9_PressureSensorError1, "ON"); + } + } + + // 알람 8-서보토크알람2 + if (sValue2[0] == '0') + { + //if (this.A8_ServoTorqueAlarm2 != false) + //{ + // this.A8_ServoTorqueAlarm2 = false; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a8_ServoTorqueAlarm2, "OFF"); + //} + } + else + { + //if (this.A8_ServoTorqueAlarm2 != true) + //{ + // this.A8_ServoTorqueAlarm2 = true; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a8_ServoTorqueAlarm2, "ON"); + //} + } + // 알람 7-서보알람2 + if (sValue2[1] == '0') + { + //if (this.A7_ServoAlarm2 != false) + //{ + // this.A7_ServoAlarm2 = false; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a7_ServoAlarm2, "OFF"); + //} + } + else + { + //if (this.A7_ServoAlarm2 != true) + //{ + // this.A7_ServoAlarm2 = true; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a7_ServoAlarm2, "ON"); + //} + } + // 알람 6-서보토크알람1 + if (sValue2[2] == '0') + { + if (this.A6_ServoTorqueAlarm1 != false) + { + this.A6_ServoTorqueAlarm1 = false; + this.EventAlarmStateChange(Define.E_TrackingAlarm.a6_ServoToruqeAlarm1, "OFF"); + } + } + else + { + if (this.A6_ServoTorqueAlarm1 != true) + { + this.A6_ServoTorqueAlarm1 = true; + this.EventAlarmStateChange(Define.E_TrackingAlarm.a6_ServoToruqeAlarm1, "ON"); + } + } + // 알람 5-서보알람1 + if (sValue2[3] == '0') + { + if (this.A5_ServoAlarm1 != false) + { + this.A5_ServoAlarm1 = false; + this.EventAlarmStateChange(Define.E_TrackingAlarm.a5_ServoAlarm1, "OFF"); + } + } + else + { + if (this.A5_ServoAlarm1 != true) + { + this.A5_ServoAlarm1 = true; + this.EventAlarmStateChange(Define.E_TrackingAlarm.a5_ServoAlarm1, "ON"); + } + } + + // 알람 4- + if (sValue1[0] == '0') + { + } + else + { + } + // 알람 3-MasterSlave Comm 연결 + if (sValue1[1] == '0') + { + //if (this.A3_BoardStatusCOM != false) + //{ + // this.A3_BoardStatusCOM = false; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a3_BoardStatusCOM, "OFF"); + //} + } + else + { + //if (this.A3_BoardStatusCOM != true) + //{ + // this.A3_BoardStatusCOM = true; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a3_BoardStatusCOM, "ON"); + //} + } + // 알람 2-공압 에러 + if (sValue1[2] == '0') + { + if (this.A2_PressureError != false) + { + this.A2_PressureError = false; + this.EventAlarmStateChange(Define.E_TrackingAlarm.a2_PressureError, "OFF"); + } + } + else + { + if (this.A2_PressureError != true) + { + this.A2_PressureError = true; + this.EventAlarmStateChange(Define.E_TrackingAlarm.a2_PressureError, "ON"); + } + } + // 알람 1-서보OFF + if (sValue1[3] == '0') + { + if (this.A1_ServoEmergencyStop != false) + { + this.A1_ServoEmergencyStop = false; + this.EventAlarmStateChange(Define.E_TrackingAlarm.a1_ServoEmergencyStop, "OFF"); + } + } + else + { + if (this.A1_ServoEmergencyStop != true) + { + this.A1_ServoEmergencyStop = true; + this.EventAlarmStateChange(Define.E_TrackingAlarm.a1_ServoEmergencyStop, "ON"); + } + } + } + public void SetAlarmSlave(string alarm) { string sValue1 = "", sValue2 = "", sValue3 = "", sValue4 = "", sValue5 = "", sValue6 = "", sValue7 = "", sValue8 = ""; @@ -180,19 +471,19 @@ namespace INT_LKD_2.DataStore // 알람 17-변위센서에러1 if (sValue5[3] == '0') { - if (this.A17_DispSensorError1 != false) - { - this.A17_DispSensorError1 = false; - this.EventAlarmStateChange(Define.E_TrackingAlarm.a17_DispSensorError1, "OFF"); - } + //if (this.A17_DispSensorError1 != false) + //{ + // this.A17_DispSensorError1 = false; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a17_DispSensorError1, "OFF"); + //} } else { - if (this.A17_DispSensorError1 != true) - { - this.A17_DispSensorError1 = true; - this.EventAlarmStateChange(Define.E_TrackingAlarm.a17_DispSensorError1, "ON"); - } + //if (this.A17_DispSensorError1 != true) + //{ + // this.A17_DispSensorError1 = true; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a17_DispSensorError1, "ON"); + //} } // 알람 16- @@ -229,19 +520,19 @@ namespace INT_LKD_2.DataStore // 알람 13-차압센서에러1 if (sValue4[3] == '0') { - if (this.A13_DiffSensorError1 != false) - { - this.A13_DiffSensorError1 = false; - this.EventAlarmStateChange(Define.E_TrackingAlarm.a13_DiffSensorError1, "OFF"); - } + //if (this.A13_DiffSensorError1 != false) + //{ + // this.A13_DiffSensorError1 = false; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a13_DiffSensorError1, "OFF"); + //} } else { - if (this.A13_DiffSensorError1 != true) - { - this.A13_DiffSensorError1 = true; - this.EventAlarmStateChange(Define.E_TrackingAlarm.a13_DiffSensorError1, "ON"); - } + //if (this.A13_DiffSensorError1 != true) + //{ + // this.A13_DiffSensorError1 = true; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a13_DiffSensorError1, "ON"); + //} } // 알람 12- @@ -278,19 +569,19 @@ namespace INT_LKD_2.DataStore // 알람 9-압력센서에러1 if (sValue3[3] == '0') { - if (this.A9_PressureSensorError1 != false) - { - this.A9_PressureSensorError1 = false; - this.EventAlarmStateChange(Define.E_TrackingAlarm.a9_PressureSensorError1, "OFF"); - } + //if (this.A9_PressureSensorError1 != false) + //{ + // this.A9_PressureSensorError1 = false; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a9_PressureSensorError1, "OFF"); + //} } else { - if (this.A9_PressureSensorError1 != true) - { - this.A9_PressureSensorError1 = true; - this.EventAlarmStateChange(Define.E_TrackingAlarm.a9_PressureSensorError1, "ON"); - } + //if (this.A9_PressureSensorError1 != true) + //{ + // this.A9_PressureSensorError1 = true; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a9_PressureSensorError1, "ON"); + //} } // 알람 8-서보토크알람2 @@ -330,36 +621,36 @@ namespace INT_LKD_2.DataStore // 알람 6-서보토크알람1 if (sValue2[2] == '0') { - if (this.A6_ServoTorqueAlarm1 != false) - { - this.A6_ServoTorqueAlarm1 = false; - this.EventAlarmStateChange(Define.E_TrackingAlarm.a6_ServoToruqeAlarm1, "OFF"); - } + //if (this.A6_ServoTorqueAlarm1 != false) + //{ + // this.A6_ServoTorqueAlarm1 = false; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a6_ServoToruqeAlarm1, "OFF"); + //} } else { - if (this.A6_ServoTorqueAlarm1 != true) - { - this.A6_ServoTorqueAlarm1 = true; - this.EventAlarmStateChange(Define.E_TrackingAlarm.a6_ServoToruqeAlarm1, "ON"); - } + //if (this.A6_ServoTorqueAlarm1 != true) + //{ + // this.A6_ServoTorqueAlarm1 = true; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a6_ServoToruqeAlarm1, "ON"); + //} } // 알람 5-서보알람1 if (sValue2[3] == '0') { - if (this.A5_ServoAlarm1 != false) - { - this.A5_ServoAlarm1 = false; - this.EventAlarmStateChange(Define.E_TrackingAlarm.a5_ServoAlarm1, "OFF"); - } + //if (this.A5_ServoAlarm1 != false) + //{ + // this.A5_ServoAlarm1 = false; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a5_ServoAlarm1, "OFF"); + //} } else { - if (this.A5_ServoAlarm1 != true) - { - this.A5_ServoAlarm1 = true; - this.EventAlarmStateChange(Define.E_TrackingAlarm.a5_ServoAlarm1, "ON"); - } + //if (this.A5_ServoAlarm1 != true) + //{ + // this.A5_ServoAlarm1 = true; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a5_ServoAlarm1, "ON"); + //} } // 알람 4- @@ -372,53 +663,53 @@ namespace INT_LKD_2.DataStore // 알람 3-MasterSlave Comm 연결 if (sValue1[1] == '0') { - if (this.A3_BoardStatusCOM != false) - { - this.A3_BoardStatusCOM = false; - this.EventAlarmStateChange(Define.E_TrackingAlarm.a3_BoardStatusCOM, "OFF"); - } + //if (this.A3_BoardStatusCOM != false) + //{ + // this.A3_BoardStatusCOM = false; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a3_BoardStatusCOM, "OFF"); + //} } else { - if (this.A3_BoardStatusCOM != true) - { - this.A3_BoardStatusCOM = true; - this.EventAlarmStateChange(Define.E_TrackingAlarm.a3_BoardStatusCOM, "ON"); - } + //if (this.A3_BoardStatusCOM != true) + //{ + // this.A3_BoardStatusCOM = true; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a3_BoardStatusCOM, "ON"); + //} } // 알람 2-공압 에러 if (sValue1[2] == '0') { - if (this.A2_PressureError != false) - { - this.A2_PressureError = false; - this.EventAlarmStateChange(Define.E_TrackingAlarm.a2_PressureError, "OFF"); - } + //if (this.A2_PressureError != false) + //{ + // this.A2_PressureError = false; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a2_PressureError, "OFF"); + //} } else { - if (this.A2_PressureError != true) - { - this.A2_PressureError = true; - this.EventAlarmStateChange(Define.E_TrackingAlarm.a2_PressureError, "ON"); - } + //if (this.A2_PressureError != true) + //{ + // this.A2_PressureError = true; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a2_PressureError, "ON"); + //} } // 알람 1-서보OFF if (sValue1[3] == '0') { - if (this.A1_ServoEmergencyStop != false) - { - this.A1_ServoEmergencyStop = false; - this.EventAlarmStateChange(Define.E_TrackingAlarm.a1_ServoEmergencyStop, "OFF"); - } + //if (this.A1_ServoEmergencyStop != false) + //{ + // this.A1_ServoEmergencyStop = false; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a1_ServoEmergencyStop, "OFF"); + //} } else { - if (this.A1_ServoEmergencyStop != true) - { - this.A1_ServoEmergencyStop = true; - this.EventAlarmStateChange(Define.E_TrackingAlarm.a1_ServoEmergencyStop, "ON"); - } + //if (this.A1_ServoEmergencyStop != true) + //{ + // this.A1_ServoEmergencyStop = true; + // this.EventAlarmStateChange(Define.E_TrackingAlarm.a1_ServoEmergencyStop, "ON"); + //} } } #endregion diff --git a/INT_LKD_2/DialogForms/DialogFormMessage.cs b/INT_LKD_2/DialogForms/DialogFormMessage.cs index 9282852..a15928c 100644 --- a/INT_LKD_2/DialogForms/DialogFormMessage.cs +++ b/INT_LKD_2/DialogForms/DialogFormMessage.cs @@ -88,7 +88,7 @@ namespace INT_LKD_2.DialogForms if (language == Define.E_LanguageID.Korean) { - this.buttonOK.Text = "OK"; + this.buttonOK.ButtonText = "OK"; #region 한글 switch (code) @@ -282,7 +282,7 @@ namespace INT_LKD_2.DialogForms } else if (language == Define.E_LanguageID.English) { - this.buttonOK.Text = "OK"; + this.buttonOK.ButtonText = "OK"; #region 영문 switch (code) @@ -475,7 +475,7 @@ namespace INT_LKD_2.DialogForms } else if (language == Define.E_LanguageID.Chinese) { - this.buttonOK.Text = "确认"; + this.buttonOK.ButtonText = "确认"; #region 중문 switch (code) @@ -687,7 +687,7 @@ namespace INT_LKD_2.DialogForms switch (code) { case 1: - this.buttonOK.Text = "OK"; + this.buttonOK.ButtonText = "OK"; this.smartGroupBox1.Text = "Error 03_01"; this.labelMessage1.Text = "입력범위를 확인하세요."; this.labelMessage2.Text = message; @@ -702,7 +702,7 @@ namespace INT_LKD_2.DialogForms switch (code) { case 1: - this.buttonOK.Text = "OK"; + this.buttonOK.ButtonText = "OK"; this.smartGroupBox1.Text = "Error 03_01"; this.labelMessage1.Text = "Confirm input range"; this.labelMessage2.Text = message; @@ -717,7 +717,7 @@ namespace INT_LKD_2.DialogForms switch (code) { case 1: - this.buttonOK.Text = "确认"; + this.buttonOK.ButtonText = "确认"; this.smartGroupBox1.Text = "错误 01"; this.labelMessage1.Text = "确认输入范围"; this.labelMessage2.Text = message; @@ -776,7 +776,7 @@ namespace INT_LKD_2.DialogForms break; case Define.E_LanguageID.Chinese: #region 중문 - this.buttonOK.Text = "确认"; + this.buttonOK.ButtonText = "确认"; switch (code) { @@ -992,7 +992,7 @@ namespace INT_LKD_2.DialogForms break; case Define.E_LanguageID.Chinese: #region 중문 - this.buttonOK.Text = "确认"; + this.buttonOK.ButtonText = "确认"; switch (code) { diff --git a/INT_LKD_2/DialogForms/DialogFormProgressBar.cs b/INT_LKD_2/DialogForms/DialogFormProgressBar.cs index fed2006..8b687b5 100644 --- a/INT_LKD_2/DialogForms/DialogFormProgressBar.cs +++ b/INT_LKD_2/DialogForms/DialogFormProgressBar.cs @@ -34,7 +34,7 @@ namespace INT_LKD_2.DialogForms private Define.E_LanguageID m_Language; private Define.E_BoardMode m_BoardMode; - + private FormMain m_ParentForm; #endregion @@ -230,13 +230,13 @@ namespace INT_LKD_2.DialogForms { case Define.E_LanguageID.Chinese: this.smartGroupBox1.Text = "更新"; - this.buttonCancel.Text = "取消"; + this.buttonCancel.ButtonText = "取消"; break; case Define.E_LanguageID.English: - this.buttonCancel.Text = "ESC"; + this.buttonCancel.ButtonText = "ESC"; break; case Define.E_LanguageID.Korean: - this.buttonCancel.Text = "ESC"; + this.buttonCancel.ButtonText = "ESC"; break; default: break; @@ -244,7 +244,7 @@ namespace INT_LKD_2.DialogForms } private void DefaultSetting() { - if(this.Code == 2) + if (this.Code == 2) this.OpenSerialPort(); if (Directory.Exists("Hard Disk\\") == true) @@ -373,7 +373,7 @@ namespace INT_LKD_2.DialogForms return ret; } - + private string Checksumcalculator(string strTemp) { string chkSum = ""; @@ -864,7 +864,7 @@ namespace INT_LKD_2.DialogForms { this.DialogResult = DialogResult.Cancel; this.CloseSerialPort(); - this.Close(); + this.Close(); } #endregion } diff --git a/INT_LKD_2/Forms/FormMain.cs b/INT_LKD_2/Forms/FormMain.cs index 9b932cc..5d08559 100644 --- a/INT_LKD_2/Forms/FormMain.cs +++ b/INT_LKD_2/Forms/FormMain.cs @@ -2540,7 +2540,7 @@ namespace INT_LKD_2.Forms { case "Z": #region Value Assign - this.CurrentAlarmList.SetAlarm(receiveData.Substring(0, 8)); + this.CurrentAlarmList.SetAlarmMaster(receiveData.Substring(0, 8)); #endregion this.ChildFormMainDisplay.UpdateDisplayAlarmView(this.CurrentAlarmList); @@ -4042,7 +4042,7 @@ namespace INT_LKD_2.Forms { case "Z": #region Value Assign - this.CurrentAlarmList.SetAlarm(receiveData.Substring(0, 8)); + this.CurrentAlarmList.SetAlarmSlave(receiveData.Substring(0, 8)); #endregion this.ChildFormMainDisplay.UpdateDisplayAlarmView(this.CurrentAlarmList); diff --git a/INT_LKD_2/Forms/FormMainDisplay.Designer.cs b/INT_LKD_2/Forms/FormMainDisplay.Designer.cs index c4bf68a..b772280 100644 --- a/INT_LKD_2/Forms/FormMainDisplay.Designer.cs +++ b/INT_LKD_2/Forms/FormMainDisplay.Designer.cs @@ -30,6 +30,7 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMainDisplay)); this.smartForm1 = new SmartX.SmartForm(); + this.labelTitleLeakDetetor = new SmartX.SmartLabel(); this.labelTitleTime = new SmartX.SmartLabel(); this.labelTitleProcess = new SmartX.SmartLabel(); this.labelTitleStatusResult = new SmartX.SmartLabel(); @@ -162,7 +163,6 @@ this.smartTimerProgressBar = new SmartX.SmartTimer(); this.timerServer = new SmartX.SmartTimer(); this.smartTimerTest = new SmartX.SmartTimer(); - this.labelTitleLeakDetetor = new SmartX.SmartLabel(); this.smartForm1.SuspendLayout(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); @@ -314,6 +314,29 @@ this.smartForm1.SpecialFunctionClickPointSize = 100; this.smartForm1.UseMainMenu = false; // + // labelTitleLeakDetetor + // + this.labelTitleLeakDetetor.BackGround = null; + this.labelTitleLeakDetetor.BackGroundColor = System.Drawing.Color.Black; + this.labelTitleLeakDetetor.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); + this.labelTitleLeakDetetor.BorderStyle = SmartX.SmartLabel.BorderStyles.None; + this.labelTitleLeakDetetor.Font = new System.Drawing.Font("New Gulim", 35F, System.Drawing.FontStyle.Bold); + this.labelTitleLeakDetetor.LineSpacing = 0F; + this.labelTitleLeakDetetor.Location = new System.Drawing.Point(245, 13); + this.labelTitleLeakDetetor.Name = "labelTitleLeakDetetor"; + this.labelTitleLeakDetetor.OverlapOptimize = true; + this.labelTitleLeakDetetor.PasswordChar = '\0'; + this.labelTitleLeakDetetor.Radius = 3; + this.labelTitleLeakDetetor.RoundRectFillColor = System.Drawing.Color.LightBlue; + this.labelTitleLeakDetetor.Size = new System.Drawing.Size(500, 60); + this.labelTitleLeakDetetor.TabIndex = 622; + this.labelTitleLeakDetetor.Text = "LEAK DETETOR"; + this.labelTitleLeakDetetor.TextColor = System.Drawing.Color.White; + this.labelTitleLeakDetetor.TextColorDisable = System.Drawing.Color.Gray; + this.labelTitleLeakDetetor.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleLeakDetetor.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleLeakDetetor.Wordwrap = false; + // // labelTitleTime // this.labelTitleTime.BackGround = null; @@ -769,7 +792,7 @@ this.buttonDisplay.ImageDisable = null; this.buttonDisplay.ImageDown = null; this.buttonDisplay.ImageUp = null; - this.buttonDisplay.Location = new System.Drawing.Point(917, 286); + this.buttonDisplay.Location = new System.Drawing.Point(917, 418); this.buttonDisplay.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonDisplay.Name = "buttonDisplay"; this.buttonDisplay.NestedClickEventPrevent = false; @@ -788,6 +811,7 @@ this.buttonDisplay.TextDownColor = System.Drawing.Color.Chartreuse; this.buttonDisplay.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonDisplay.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonDisplay.Visible = false; this.buttonDisplay.Click += new System.EventHandler(this.buttonDisplay_Click); // // labeldispAlarm9 @@ -1543,7 +1567,7 @@ this.buttonModbus.ImageDisable = null; this.buttonModbus.ImageDown = null; this.buttonModbus.ImageUp = null; - this.buttonModbus.Location = new System.Drawing.Point(917, 418); + this.buttonModbus.Location = new System.Drawing.Point(917, 352); this.buttonModbus.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonModbus.Name = "buttonModbus"; this.buttonModbus.NestedClickEventPrevent = false; @@ -2555,7 +2579,7 @@ this.smartButton5.ImageDisable = null; this.smartButton5.ImageDown = null; this.smartButton5.ImageUp = null; - this.smartButton5.Location = new System.Drawing.Point(917, 609); + this.smartButton5.Location = new System.Drawing.Point(977, 611); this.smartButton5.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.smartButton5.Name = "smartButton5"; this.smartButton5.NestedClickEventPrevent = false; @@ -2565,7 +2589,7 @@ this.smartButton5.RepeatIntervalAccelerate = null; this.smartButton5.RoundSize = 10; this.smartButton5.SafeInterval = 200; - this.smartButton5.Size = new System.Drawing.Size(100, 43); + this.smartButton5.Size = new System.Drawing.Size(40, 43); this.smartButton5.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.smartButton5.TabIndex = 310; this.smartButton5.Text = null; @@ -2763,7 +2787,7 @@ this.smartButton1.ImageDisable = null; this.smartButton1.ImageDown = null; this.smartButton1.ImageUp = null; - this.smartButton1.Location = new System.Drawing.Point(917, 560); + this.smartButton1.Location = new System.Drawing.Point(917, 611); this.smartButton1.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.smartButton1.Name = "smartButton1"; this.smartButton1.NestedClickEventPrevent = false; @@ -2773,7 +2797,7 @@ this.smartButton1.RepeatIntervalAccelerate = null; this.smartButton1.RoundSize = 10; this.smartButton1.SafeInterval = 200; - this.smartButton1.Size = new System.Drawing.Size(100, 43); + this.smartButton1.Size = new System.Drawing.Size(40, 43); this.smartButton1.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; this.smartButton1.TabIndex = 74; this.smartButton1.Text = null; @@ -2835,7 +2859,7 @@ this.labelAlarm.ForeColor = System.Drawing.Color.White; this.labelAlarm.Location = new System.Drawing.Point(3, 31); this.labelAlarm.Name = "labelAlarm"; - this.labelAlarm.Size = new System.Drawing.Size(366, 20); + this.labelAlarm.Size = new System.Drawing.Size(399, 20); // // buttonUser // @@ -2852,7 +2876,7 @@ this.buttonUser.ImageDisable = null; this.buttonUser.ImageDown = null; this.buttonUser.ImageUp = null; - this.buttonUser.Location = new System.Drawing.Point(917, 352); + this.buttonUser.Location = new System.Drawing.Point(917, 286); this.buttonUser.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; this.buttonUser.Name = "buttonUser"; this.buttonUser.NestedClickEventPrevent = false; @@ -3081,7 +3105,7 @@ this.buttonTest.ImageDisable = null; this.buttonTest.ImageDown = null; this.buttonTest.ImageUp = null; - this.buttonTest.Location = new System.Drawing.Point(917, 484); + this.buttonTest.Location = new System.Drawing.Point(917, 545); this.buttonTest.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; this.buttonTest.Name = "buttonTest"; this.buttonTest.NestedClickEventPrevent = false; @@ -3157,29 +3181,6 @@ this.smartTimerTest.TimeFormStringSeparator = ":"; this.smartTimerTest.Tick += new System.EventHandler(this.smartTimerTest_Tick); // - // labelTitleLeakDetetor - // - this.labelTitleLeakDetetor.BackGround = null; - this.labelTitleLeakDetetor.BackGroundColor = System.Drawing.Color.Black; - this.labelTitleLeakDetetor.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(42)))), ((int)(((byte)(82))))); - this.labelTitleLeakDetetor.BorderStyle = SmartX.SmartLabel.BorderStyles.None; - this.labelTitleLeakDetetor.Font = new System.Drawing.Font("New Gulim", 35F, System.Drawing.FontStyle.Bold); - this.labelTitleLeakDetetor.LineSpacing = 0F; - this.labelTitleLeakDetetor.Location = new System.Drawing.Point(245, 13); - this.labelTitleLeakDetetor.Name = "labelTitleLeakDetetor"; - this.labelTitleLeakDetetor.OverlapOptimize = true; - this.labelTitleLeakDetetor.PasswordChar = '\0'; - this.labelTitleLeakDetetor.Radius = 3; - this.labelTitleLeakDetetor.RoundRectFillColor = System.Drawing.Color.LightBlue; - this.labelTitleLeakDetetor.Size = new System.Drawing.Size(500, 60); - this.labelTitleLeakDetetor.TabIndex = 622; - this.labelTitleLeakDetetor.Text = "LEAK DETETOR"; - this.labelTitleLeakDetetor.TextColor = System.Drawing.Color.White; - this.labelTitleLeakDetetor.TextColorDisable = System.Drawing.Color.Gray; - this.labelTitleLeakDetetor.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelTitleLeakDetetor.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleLeakDetetor.Wordwrap = false; - // // FormMainDisplay // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); diff --git a/INT_LKD_2/Forms/FormMainDisplay.cs b/INT_LKD_2/Forms/FormMainDisplay.cs index de5bfaa..0b2fcbe 100644 --- a/INT_LKD_2/Forms/FormMainDisplay.cs +++ b/INT_LKD_2/Forms/FormMainDisplay.cs @@ -408,7 +408,9 @@ namespace INT_LKD_2.Forms this.buttonRecipeNo.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMainDisplayProductChange; this.buttonClear.Enabled = this.ParentForm.CurrentUserGroup.Level1.IsMainDisplayClear; this.buttonInspection.Enabled = true; + this.buttonDischarge.Enabled = true; this.buttonMenu.Enabled = true; + this.buttonDisplay.Visible = false; break; case Define.E_UserGroup.Level2: id = user.ID; @@ -423,7 +425,9 @@ namespace INT_LKD_2.Forms this.buttonRecipeNo.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMainDisplayProductChange; this.buttonClear.Enabled = this.ParentForm.CurrentUserGroup.Level2.IsMainDisplayClear; this.buttonInspection.Enabled = true; + this.buttonDischarge.Enabled = true; this.buttonMenu.Enabled = true; + this.buttonDisplay.Visible = false; break; case Define.E_UserGroup.Level3: id = user.ID; @@ -438,7 +442,9 @@ namespace INT_LKD_2.Forms this.buttonRecipeNo.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMainDisplayProductChange; this.buttonClear.Enabled = this.ParentForm.CurrentUserGroup.Level3.IsMainDisplayClear; this.buttonInspection.Enabled = true; + this.buttonDischarge.Enabled = true; this.buttonMenu.Enabled = true; + this.buttonDisplay.Visible = false; break; case Define.E_UserGroup.Admin: id = user.ID; @@ -453,7 +459,9 @@ namespace INT_LKD_2.Forms this.buttonRecipeNo.Enabled = true; this.buttonClear.Enabled = true; this.buttonInspection.Enabled = true; + this.buttonDischarge.Enabled = true; this.buttonMenu.Enabled = true; + this.buttonDisplay.Visible = false; break; case Define.E_UserGroup.Developer: id = user.ID; @@ -468,7 +476,9 @@ namespace INT_LKD_2.Forms this.buttonRecipeNo.Enabled = true; this.buttonClear.Enabled = true; this.buttonInspection.Enabled = true; + this.buttonDischarge.Enabled = true; this.buttonMenu.Enabled = true; + this.buttonDisplay.Visible = true; break; case Define.E_UserGroup.NotLogin: id = ""; @@ -479,7 +489,9 @@ namespace INT_LKD_2.Forms this.buttonRecipeNo.Enabled = true; this.buttonClear.Enabled = true; this.buttonInspection.Enabled = true; + this.buttonDischarge.Enabled = true; this.buttonMenu.Enabled = true; + this.buttonDisplay.Visible = false; break; case Define.E_UserGroup.LogOut: id = "Log Off"; @@ -494,7 +506,9 @@ namespace INT_LKD_2.Forms this.buttonRecipeNo.Enabled = false; this.buttonClear.Enabled = false; this.buttonInspection.Enabled = false; + this.buttonDischarge.Enabled = false; this.buttonMenu.Enabled = false; + this.buttonDisplay.Visible = false; break; default: break; @@ -504,11 +518,16 @@ namespace INT_LKD_2.Forms this.buttonRecipeNo.ButtonColor = this.ParentForm.ButtonColorChange(this.buttonRecipeNo.Enabled); this.buttonClear.ButtonColor = this.ParentForm.ButtonColorChange(this.buttonClear.Enabled); this.buttonMenu.ButtonColor = this.ParentForm.ButtonColorChange(this.buttonMenu.Enabled); - + // button Inspection Color if (this.buttonInspection.Enabled == true) this.buttonInspection.ButtonColor = Color.DarkGreen; else - this.buttonInspection.ButtonColor = this.ParentForm.ButtonColorChange(this.buttonInspection.Enabled); + this.buttonInspection.ButtonColor = this.ParentForm.ButtonColorChange(false); + // button Discharge Color + if (this.buttonDischarge.Enabled == true) + this.buttonDischarge.ButtonColor = Color.DarkGreen; + else + this.buttonDischarge.ButtonColor = this.ParentForm.ButtonColorChange(false); expireDate = this.DisplayExpireOfPassword(user.Group); if (expireDate != "-") @@ -918,19 +937,19 @@ namespace INT_LKD_2.Forms value += "a18_Disp Sensor2 "; value = value.Trim(); - this.labelAlarm.Size = new Size(value.Length * 9, 30); + //this.labelAlarm.Size = new Size(value.Length * 9, 30); this.labelAlarm.Text = value; - if (this.labelAlarm.Width > 400) - { - if (this.labelAlarm.Text != "") - this.smartTimerAlarm.Start(); - } - else - { - this.smartTimerAlarm.Stop(); - this.labelAlarm.Location = new Point(3, 26); - } + //if (this.labelAlarm.Width > 400) + //{ + // if (this.labelAlarm.Text != "") + // this.smartTimerAlarm.Start(); + //} + //else + //{ + // this.smartTimerAlarm.Stop(); + // this.labelAlarm.Location = new Point(3, 26); + //} } private void ProcessStatusPicturBox(Define.E_ProcessStatus status) diff --git a/INT_LKD_2/Forms/FormMenu.cs b/INT_LKD_2/Forms/FormMenu.cs index a6cb057..543db5e 100644 --- a/INT_LKD_2/Forms/FormMenu.cs +++ b/INT_LKD_2/Forms/FormMenu.cs @@ -253,19 +253,19 @@ namespace INT_LKD_2.Forms value += "a18_Disp Sensor2 "; value = value.Trim(); - this.labelAlarm.Size = new Size(value.Length * 9, 20); + //this.labelAlarm.Size = new Size(value.Length * 9, 20); this.labelAlarm.Text = value; - if (this.labelAlarm.Width > 465) - { - if (this.labelAlarm.Text != "") - this.smartTimerAlarm.Start(); - } - else - { - this.smartTimerAlarm.Stop(); - this.labelAlarm.Location = new Point(0, 10); - } + //if (this.labelAlarm.Width > 465) + //{ + // if (this.labelAlarm.Text != "") + // this.smartTimerAlarm.Start(); + //} + //else + //{ + // this.smartTimerAlarm.Stop(); + // this.labelAlarm.Location = new Point(0, 10); + //} } public void UpdateDisplayTime(DateTime time) {