diff --git a/INT51DB/Controls/CenterSystem/ControlCenterSystemCalibration.Designer.cs b/INT51DB/Controls/CenterSystem/ControlCenterSystemCalibration.Designer.cs index 255a9c6..ad5df25 100644 --- a/INT51DB/Controls/CenterSystem/ControlCenterSystemCalibration.Designer.cs +++ b/INT51DB/Controls/CenterSystem/ControlCenterSystemCalibration.Designer.cs @@ -30,7 +30,6 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ControlCenterSystemCalibration)); this.smartGroupBox1 = new SmartX.SmartGroupBox(); - this.listBoxHelp = new SmartX.SmartListBox(); this.smartGroupBox4 = new SmartX.SmartGroupBox(); this.radioButtonUnitKg = new SmartX.SmartRadioButton(); this.radioButtonUnitG = new SmartX.SmartRadioButton(); @@ -57,6 +56,7 @@ this.labelWeightUnit = new SmartX.SmartLabel(); this.labelWeight = new SmartX.SmartLabel(); this.buttonStart = new SmartX.SmartButton(); + this.listBoxHelp = new SmartX.SmartListBox(); this.smartGroupBox1.SuspendLayout(); this.smartGroupBox4.SuspendLayout(); this.smartGroupBox3.SuspendLayout(); @@ -100,41 +100,6 @@ this.smartGroupBox1.TabIndex = 176; this.smartGroupBox1.TextColor = System.Drawing.Color.Black; // - // listBoxHelp - // - this.listBoxHelp.BackColor = System.Drawing.Color.White; - this.listBoxHelp.BackPictureBox = null; - this.listBoxHelp.BackPictureBox1 = null; - this.listBoxHelp.BackPictureBox2 = null; - this.listBoxHelp.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.LEFT; - this.listBoxHelp.ColumnDelimiter = '\0'; - this.listBoxHelp.ColumnOffsets = null; - this.listBoxHelp.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Bold); - this.listBoxHelp.FontColor = System.Drawing.Color.Black; - this.listBoxHelp.ForeColor = System.Drawing.Color.Black; - this.listBoxHelp.InitVisible = true; - this.listBoxHelp.ItemAddOrder = SmartX.SmartListBox.ITEMADDORDERS.BOTTOMADD; - this.listBoxHelp.ItemOffsetGap = 0; - this.listBoxHelp.ItemOffsetX = 0; - this.listBoxHelp.ItemOffsetY = 0; - this.listBoxHelp.Location = new System.Drawing.Point(447, 327); - this.listBoxHelp.MouseMoveEventSpace = 3; - this.listBoxHelp.MouseMoveSpace = 10; - this.listBoxHelp.Name = "listBoxHelp"; - this.listBoxHelp.OutLineColor = System.Drawing.Color.White; - this.listBoxHelp.SelectColor = System.Drawing.Color.Blue; - this.listBoxHelp.SelectFilled = true; - this.listBoxHelp.SelectFontColor = System.Drawing.Color.DarkBlue; - this.listBoxHelp.SelectItemIndex = -1; - this.listBoxHelp.SeparationlineColor1 = System.Drawing.Color.White; - this.listBoxHelp.SeparationlineColor2 = System.Drawing.Color.Black; - this.listBoxHelp.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle; - this.listBoxHelp.SeparationlineVisibleBottom = true; - this.listBoxHelp.SeparationlineVisibleTop = true; - this.listBoxHelp.Size = new System.Drawing.Size(230, 106); - this.listBoxHelp.TabIndex = 486; - this.listBoxHelp.Text = "smartListBox1"; - // // smartGroupBox4 // this.smartGroupBox4.BackColor = System.Drawing.Color.Black; @@ -762,6 +727,40 @@ this.buttonStart.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonStart.UpImage"))); this.buttonStart.Click += new System.EventHandler(this.buttonStart_Click); // + // listBoxHelp + // + this.listBoxHelp.BackColor = System.Drawing.Color.White; + this.listBoxHelp.BackPictureBox1 = null; + this.listBoxHelp.BackPictureBox2 = this.smartGroupBox1; + this.listBoxHelp.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.LEFT; + this.listBoxHelp.ColumnDelimiter = '\0'; + this.listBoxHelp.ColumnOffsets = null; + this.listBoxHelp.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Bold); + this.listBoxHelp.FontColor = System.Drawing.Color.White; + this.listBoxHelp.ForeColor = System.Drawing.Color.Black; + this.listBoxHelp.InitVisible = true; + this.listBoxHelp.ItemAddOrder = SmartX.SmartListBox.ITEMADDORDERS.BOTTOMADD; + this.listBoxHelp.ItemOffsetGap = 0; + this.listBoxHelp.ItemOffsetX = 0; + this.listBoxHelp.ItemOffsetY = 0; + this.listBoxHelp.Location = new System.Drawing.Point(447, 356); + this.listBoxHelp.MouseMoveEventSpace = 3; + this.listBoxHelp.MouseMoveSpace = 10; + this.listBoxHelp.Name = "listBoxHelp"; + this.listBoxHelp.OutLineColor = System.Drawing.Color.White; + this.listBoxHelp.SelectColor = System.Drawing.Color.Blue; + this.listBoxHelp.SelectFilled = true; + this.listBoxHelp.SelectFontColor = System.Drawing.Color.DarkBlue; + this.listBoxHelp.SelectItemIndex = -1; + this.listBoxHelp.SeparationlineColor1 = System.Drawing.Color.Black; + this.listBoxHelp.SeparationlineColor2 = System.Drawing.Color.Black; + this.listBoxHelp.SeparationLineStyle = SmartX.SmartListBox.SEPARATIONLINETYPES.FixedSingle; + this.listBoxHelp.SeparationlineVisibleBottom = true; + this.listBoxHelp.SeparationlineVisibleTop = true; + this.listBoxHelp.Size = new System.Drawing.Size(230, 50); + this.listBoxHelp.TabIndex = 486; + this.listBoxHelp.Text = "smartListBox1"; + // // ControlCenterSystemCalibration // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); diff --git a/INT51DB/Controls/CenterSystem/ControlCenterSystemCalibration.cs b/INT51DB/Controls/CenterSystem/ControlCenterSystemCalibration.cs index 600011c..b58d10d 100644 --- a/INT51DB/Controls/CenterSystem/ControlCenterSystemCalibration.cs +++ b/INT51DB/Controls/CenterSystem/ControlCenterSystemCalibration.cs @@ -111,21 +111,8 @@ namespace INT51DB.Controls private void UpdateControlsDisplay() { this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.English) - { - this.listBoxHelp.Items.Add("Push the start button."); - } - else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) - { - } - else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech) - { - } - else - { - this.listBoxHelp.Items.Add("중량조정을 하시려면"); - this.listBoxHelp.Items.Add("시작 버튼을 누르세요"); - } + this.listBoxHelp.AddItem("중량조정을 하시려면"); + this.listBoxHelp.AddItem("시작 버튼을 누르세요"); this.CalibrationButtonEnable(true, false, false); this.CalibrationPictureBoxVisible(true, false, false); @@ -228,21 +215,10 @@ namespace INT51DB.Controls this.labelWeight.Text = string.Format("-{0}", this.labelBalanceWeight.Text); this.labelWeight.ForeColor = this.NormalColor; this.labelADC.Text = data.ADCValue; + this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.English) - { - this.listBoxHelp.Items.Add("Put the balance weight."); - } - else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) - { - } - else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech) - { - } - else - { - this.listBoxHelp.Items.Add("분동을 올려주세요"); - } + this.listBoxHelp.AddItem("분동을 올려주세요"); + this.CalibrationButtonEnable(false, true, true); this.CalibrationPictureBoxVisible(false, true, false); break; @@ -256,20 +232,8 @@ namespace INT51DB.Controls break; case DataStore.WeightStatus.CalFinish: this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.English) - { - this.listBoxHelp.Items.Add("Finish the calibration"); - } - else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) - { - } - else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech) - { - } - else - { - this.listBoxHelp.Items.Add("중량조정이 완료 되었습니다"); - } + this.listBoxHelp.AddItem("중량조정이 완료 되었습니다"); + this.CalibrationButtonEnable(true, false, false); this.CalibrationPictureBoxVisible(true, false, false); this.labelWeight.Text = Helper.DoubleToString(data.Weight, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); @@ -283,22 +247,9 @@ namespace INT51DB.Controls break; case DataStore.WeightStatus.CalError: this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.English) - { - this.listBoxHelp.Items.Add("Calibration error"); - this.listBoxHelp.Items.Add("Please try again."); - } - else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) - { - } - else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech) - { - } - else - { - this.listBoxHelp.Items.Add("중량조정 에러"); - this.listBoxHelp.Items.Add("다시 시도해 주세요."); - } + this.listBoxHelp.AddItem("중량조정 에러"); + this.listBoxHelp.AddItem("다시 시도해 주세요."); + this.CalibrationButtonEnable(true, false, false); this.CalibrationPictureBoxVisible(true, false, false); this.labelWeight.Text = Helper.DoubleToString(data.Weight, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); @@ -316,6 +267,8 @@ namespace INT51DB.Controls this.ParentForm.ParentForm.SetDisplayMode(DataStore.DisplayMode.Calibration); this.ParentForm.DisplayTitleRoot(this.ParentForm.ParentForm.CurrentSystemStatus); + this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress.ParameterRead3901, ""); + this.IsCalibrationFinish = false; this.UpdateControlsDisplay(); @@ -361,7 +314,6 @@ namespace INT51DB.Controls } } } - private void labelBalanceWeight_Click(object sender, EventArgs e) { string value = ""; @@ -412,7 +364,6 @@ namespace INT51DB.Controls this.labelMaxWeightUnit.Text = this.labelBalanceWeightUnit.Text = this.labelWeightUnit.Text = this.ParentForm.ParentForm.SystemConfig.Unit; } - private void radioButtonDigit_Click(object sender, EventArgs e) { string value = ""; @@ -430,7 +381,6 @@ namespace INT51DB.Controls this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress.Digit, value); } - private void radioButtonDecimalPlaces_Click(object sender, EventArgs e) { if (this.radioButtonDecimalPlaces0.Checked == true) @@ -449,73 +399,29 @@ namespace INT51DB.Controls { this.ParentForm.ParentForm.TransferData(CommunicationCommand.Zero, CommunicationID.SubBoard1); } - private void buttonStart_Click(object sender, EventArgs e) { this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.English) - { - this.listBoxHelp.Items.Add("Calibration start"); - this.listBoxHelp.Items.Add("Wait a minute."); - } - else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) - { - } - else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech) - { - } - else - { - this.listBoxHelp.Items.Add("중량조정을 시작합니다"); - this.listBoxHelp.Items.Add("잠시만 기다리세요"); - } + this.listBoxHelp.AddItem("중량조정을 시작합니다"); + this.listBoxHelp.AddItem("잠시만 기다리세요"); this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, CommunicationID.SubBoard1); this.CalibrationButtonEnable(false, false, false); } - private void buttonBalance_Click(object sender, EventArgs e) { this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.English) - { - this.listBoxHelp.Items.Add("Caculating..."); - this.listBoxHelp.Items.Add("Wait a minute."); - } - else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) - { - } - else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech) - { - } - else - { - this.listBoxHelp.Items.Add("분동 계산중 입니다"); - this.listBoxHelp.Items.Add("잠시만 기다리세요"); - } + this.listBoxHelp.AddItem("분동 계산중 입니다"); + this.listBoxHelp.AddItem("잠시만 기다리세요"); this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, CommunicationID.SubBoard1); this.CalibrationButtonEnable(false, false, true); } - private void buttonCancel_Click(object sender, EventArgs e) { this.listBoxHelp.Items.Clear(); - if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.English) - { - this.listBoxHelp.Items.Add("Cancel the calibration"); - } - else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) - { - } - else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech) - { - } - else - { - this.listBoxHelp.Items.Add("중량조정을 취소합니다"); - } + this.listBoxHelp.AddItem("중량조정을 취소합니다"); this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, CommunicationID.SubBoard1); this.CalibrationButtonEnable(true, false, false); diff --git a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.Designer.cs b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.Designer.cs index ce33b59..7d0c522 100644 --- a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.Designer.cs +++ b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.Designer.cs @@ -34,6 +34,10 @@ this.buttonServoDown = new SmartX.SmartButton(); this.buttonServoSetup = new SmartX.SmartButton(); this.smartGroupBox1 = new SmartX.SmartGroupBox(); + this.smartLabel4 = new SmartX.SmartLabel(); + this.smartLabel3 = new SmartX.SmartLabel(); + this.labelDownDelayTime = new SmartX.SmartLabel(); + this.labelUpDelayTime = new SmartX.SmartLabel(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -49,11 +53,13 @@ this.buttonServoUp2.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonServoUp2.DownImage"))); this.buttonServoUp2.GroupID = 0; this.buttonServoUp2.InitVisible = true; - this.buttonServoUp2.Location = new System.Drawing.Point(202, 67); + this.buttonServoUp2.Location = new System.Drawing.Point(34, 55); this.buttonServoUp2.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonServoUp2.Name = "buttonServoUp2"; this.buttonServoUp2.NestedClickEventPrevent = false; + this.buttonServoUp2.OutlinePixel = 1; this.buttonServoUp2.RepeatInterval = 200; + this.buttonServoUp2.RepeatIntervalAccelerate = null; this.buttonServoUp2.SafeInterval = 200; this.buttonServoUp2.Size = new System.Drawing.Size(100, 100); this.buttonServoUp2.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -78,11 +84,13 @@ this.buttonServoUp1.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonServoUp1.DownImage"))); this.buttonServoUp1.GroupID = 0; this.buttonServoUp1.InitVisible = true; - this.buttonServoUp1.Location = new System.Drawing.Point(308, 67); + this.buttonServoUp1.Location = new System.Drawing.Point(140, 55); this.buttonServoUp1.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonServoUp1.Name = "buttonServoUp1"; this.buttonServoUp1.NestedClickEventPrevent = false; + this.buttonServoUp1.OutlinePixel = 1; this.buttonServoUp1.RepeatInterval = 200; + this.buttonServoUp1.RepeatIntervalAccelerate = null; this.buttonServoUp1.SafeInterval = 200; this.buttonServoUp1.Size = new System.Drawing.Size(100, 100); this.buttonServoUp1.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -93,7 +101,6 @@ this.buttonServoUp1.TextLocation = new System.Drawing.Point(0, 0); this.buttonServoUp1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonServoUp1.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonServoUp1.UpImage"))); - this.buttonServoUp1.Visible = false; this.buttonServoUp1.Click += new System.EventHandler(this.buttonServoUp1_Click); // // buttonServoDown @@ -108,11 +115,13 @@ this.buttonServoDown.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonServoDown.DownImage"))); this.buttonServoDown.GroupID = 0; this.buttonServoDown.InitVisible = true; - this.buttonServoDown.Location = new System.Drawing.Point(414, 67); + this.buttonServoDown.Location = new System.Drawing.Point(246, 55); this.buttonServoDown.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonServoDown.Name = "buttonServoDown"; this.buttonServoDown.NestedClickEventPrevent = false; + this.buttonServoDown.OutlinePixel = 1; this.buttonServoDown.RepeatInterval = 200; + this.buttonServoDown.RepeatIntervalAccelerate = null; this.buttonServoDown.SafeInterval = 200; this.buttonServoDown.Size = new System.Drawing.Size(100, 100); this.buttonServoDown.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -137,11 +146,13 @@ this.buttonServoSetup.DownImage = null; this.buttonServoSetup.GroupID = 0; this.buttonServoSetup.InitVisible = true; - this.buttonServoSetup.Location = new System.Drawing.Point(599, 168); + this.buttonServoSetup.Location = new System.Drawing.Point(34, 174); this.buttonServoSetup.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonServoSetup.Name = "buttonServoSetup"; this.buttonServoSetup.NestedClickEventPrevent = false; + this.buttonServoSetup.OutlinePixel = 1; this.buttonServoSetup.RepeatInterval = 200; + this.buttonServoSetup.RepeatIntervalAccelerate = null; this.buttonServoSetup.SafeInterval = 200; this.buttonServoSetup.Size = new System.Drawing.Size(80, 25); this.buttonServoSetup.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -159,6 +170,10 @@ // this.smartGroupBox1.BackPictureBox = null; this.smartGroupBox1.BackPictureBox1 = null; + this.smartGroupBox1.Controls.Add(this.smartLabel4); + this.smartGroupBox1.Controls.Add(this.smartLabel3); + this.smartGroupBox1.Controls.Add(this.labelDownDelayTime); + this.smartGroupBox1.Controls.Add(this.labelUpDelayTime); this.smartGroupBox1.Controls.Add(this.buttonServoSetup); this.smartGroupBox1.Controls.Add(this.buttonServoDown); this.smartGroupBox1.Controls.Add(this.buttonServoUp1); @@ -177,6 +192,90 @@ this.smartGroupBox1.Text = "smartGroupBox1"; this.smartGroupBox1.TextColor = System.Drawing.Color.Black; // + // smartLabel4 + // + this.smartLabel4.BackColor = System.Drawing.Color.Black; + this.smartLabel4.BackPictureBox = null; + this.smartLabel4.BackPictureBox1 = null; + this.smartLabel4.BackPictureBox2 = null; + this.smartLabel4.BorderColor = System.Drawing.Color.Black; + this.smartLabel4.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel4.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel4.ForeColor = System.Drawing.Color.White; + this.smartLabel4.InitVisible = true; + this.smartLabel4.LineSpacing = 0F; + this.smartLabel4.Location = new System.Drawing.Point(460, 119); + this.smartLabel4.Name = "smartLabel4"; + this.smartLabel4.Size = new System.Drawing.Size(100, 30); + this.smartLabel4.TabIndex = 463; + this.smartLabel4.Text = "하강지연"; + this.smartLabel4.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.smartLabel4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel4.Wordwrap = false; + // + // smartLabel3 + // + this.smartLabel3.BackColor = System.Drawing.Color.Black; + this.smartLabel3.BackPictureBox = null; + this.smartLabel3.BackPictureBox1 = null; + this.smartLabel3.BackPictureBox2 = null; + this.smartLabel3.BorderColor = System.Drawing.Color.Black; + this.smartLabel3.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel3.ForeColor = System.Drawing.Color.White; + this.smartLabel3.InitVisible = true; + this.smartLabel3.LineSpacing = 0F; + this.smartLabel3.Location = new System.Drawing.Point(460, 83); + this.smartLabel3.Name = "smartLabel3"; + this.smartLabel3.Size = new System.Drawing.Size(100, 30); + this.smartLabel3.TabIndex = 462; + this.smartLabel3.Text = "상승지연"; + this.smartLabel3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.smartLabel3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel3.Wordwrap = false; + // + // labelDownDelayTime + // + this.labelDownDelayTime.BackColor = System.Drawing.Color.White; + this.labelDownDelayTime.BackPictureBox = null; + this.labelDownDelayTime.BackPictureBox1 = null; + this.labelDownDelayTime.BackPictureBox2 = null; + this.labelDownDelayTime.BorderColor = System.Drawing.Color.Black; + this.labelDownDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelDownDelayTime.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); + this.labelDownDelayTime.InitVisible = true; + this.labelDownDelayTime.LineSpacing = 0F; + this.labelDownDelayTime.Location = new System.Drawing.Point(566, 119); + this.labelDownDelayTime.Name = "labelDownDelayTime"; + this.labelDownDelayTime.Size = new System.Drawing.Size(100, 30); + this.labelDownDelayTime.TabIndex = 461; + this.labelDownDelayTime.Text = "1000"; + this.labelDownDelayTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelDownDelayTime.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelDownDelayTime.Wordwrap = false; + this.labelDownDelayTime.Click += new System.EventHandler(this.labelDownDelayTime_Click); + // + // labelUpDelayTime + // + this.labelUpDelayTime.BackColor = System.Drawing.Color.White; + this.labelUpDelayTime.BackPictureBox = null; + this.labelUpDelayTime.BackPictureBox1 = null; + this.labelUpDelayTime.BackPictureBox2 = null; + this.labelUpDelayTime.BorderColor = System.Drawing.Color.Black; + this.labelUpDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.labelUpDelayTime.Font = new System.Drawing.Font("Arial", 20F, System.Drawing.FontStyle.Bold); + this.labelUpDelayTime.InitVisible = true; + this.labelUpDelayTime.LineSpacing = 0F; + this.labelUpDelayTime.Location = new System.Drawing.Point(566, 83); + this.labelUpDelayTime.Name = "labelUpDelayTime"; + this.labelUpDelayTime.Size = new System.Drawing.Size(100, 30); + this.labelUpDelayTime.TabIndex = 460; + this.labelUpDelayTime.Text = "1000"; + this.labelUpDelayTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelUpDelayTime.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelUpDelayTime.Wordwrap = false; + this.labelUpDelayTime.Click += new System.EventHandler(this.labelUpDelayTime_Click); + // // ControlMainDisplayFunction1 // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -196,5 +295,9 @@ private SmartX.SmartButton buttonServoDown; private SmartX.SmartButton buttonServoSetup; private SmartX.SmartGroupBox smartGroupBox1; + private SmartX.SmartLabel smartLabel4; + private SmartX.SmartLabel smartLabel3; + public SmartX.SmartLabel labelDownDelayTime; + public SmartX.SmartLabel labelUpDelayTime; } } diff --git a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.cs b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.cs index 4f30e16..ab487e4 100644 --- a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.cs +++ b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.cs @@ -62,6 +62,21 @@ namespace INT51DB.Controls } + private void UpdateControl(JudgmentSetItem item) + { + string value = ""; + + #region Judgment + value = item.UpDelayTime.ToString(); + if (this.labelUpDelayTime.Text != value) + this.labelUpDelayTime.Text = value; + + value = item.DownDelayTime.ToString(); + if (this.labelDownDelayTime.Text != value) + this.labelDownDelayTime.Text = value; + #endregion + } + public void DisplayRefresh(SystemStatus status) { if (status.Equipment == DataStore.EquipmentStatus.Start) @@ -76,6 +91,8 @@ namespace INT51DB.Controls this.buttonServoUp1.Enabled = true; this.buttonServoUp2.Enabled = true; } + + this.UpdateControl(this.ParentForm.ParentForm.CurrentJudgmentSetItem); } #endregion @@ -89,7 +106,6 @@ namespace INT51DB.Controls this.ParentForm.VisibleMenuButton(true); } } - private void buttonServoUp2_Click(object sender, EventArgs e) { DialogFormYesNo msg = new DialogFormYesNo(this.ParentForm.ParentForm.SystemConfig.Language, 15); @@ -99,7 +115,6 @@ namespace INT51DB.Controls this.ParentForm.VisibleMenuButton(false); } } - private void buttonServoDown_Click(object sender, EventArgs e) { DialogFormYesNo msg = new DialogFormYesNo(this.ParentForm.ParentForm.SystemConfig.Language, 13); @@ -109,7 +124,6 @@ namespace INT51DB.Controls this.ParentForm.VisibleMenuButton(true); } } - private void buttonServoSetup_Click(object sender, EventArgs e) { DataStore.UserGroup group = DataStore.UserGroup.LogOff; @@ -127,6 +141,61 @@ namespace INT51DB.Controls } } } + + private void labelUpDelayTime_Click(object sender, EventArgs e) + { + string value = "", message = ""; + + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelUpDelayTime.Text, 4, 0, false, this.ParentForm.ParentForm.SystemConfig.Language); + + if (myKeyPad.ShowDialog() == DialogResult.OK) + { + if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 9999) + { + // 입력범위를 확인하세요 + message = "0~9999"; + DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.ParentForm.SystemConfig.Language, message); + myMsg.ShowDialog(); + } + else + { + this.labelUpDelayTime.Text = myKeyPad.StringValue; + this.ParentForm.ParentForm.CurrentJudgmentSetItem.UpDelayTime = myKeyPad.IntValue; + + value = Helper.StringZeroFillDigits4(myKeyPad.StringValue); + this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.UpDelayTime, value); + + this.ParentForm.ParentForm.SaveJudgmentSetFile(this.ParentForm.ParentForm.CurrentJudgmentSetItem, this.ParentForm.ParentForm.SystemConfig.ProductNumber - 1); + } + } + } + private void labelDownDelayTime_Click(object sender, EventArgs e) + { + string value = "", message = ""; + + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelDownDelayTime.Text, 4, 0, false, this.ParentForm.ParentForm.SystemConfig.Language); + + if (myKeyPad.ShowDialog() == DialogResult.OK) + { + if (myKeyPad.doubleValue < 0 || myKeyPad.doubleValue > 9999) + { + // 입력범위를 확인하세요 + message = "0~9999"; + DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.ParentForm.SystemConfig.Language, message); + myMsg.ShowDialog(); + } + else + { + this.labelDownDelayTime.Text = myKeyPad.StringValue; + this.ParentForm.ParentForm.CurrentJudgmentSetItem.DownDelayTime = myKeyPad.IntValue; + + value = Helper.StringZeroFillDigits4(myKeyPad.StringValue); + this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.DownDelayTime, value); + + this.ParentForm.ParentForm.SaveJudgmentSetFile(this.ParentForm.ParentForm.CurrentJudgmentSetItem, this.ParentForm.ParentForm.SystemConfig.ProductNumber - 1); + } + } + } #endregion } } diff --git a/INT51DB/DataStore.cs b/INT51DB/DataStore.cs index 7225724..8287045 100644 --- a/INT51DB/DataStore.cs +++ b/INT51DB/DataStore.cs @@ -645,15 +645,15 @@ namespace INT51DB // 중량설정값 쓰기 public static readonly string ParameterWeightSetting = "9003"; // 품목 설정 모두 쓰기 - public static readonly string ParameterProduct = "9013"; + public static readonly string _9013_ParameterProduct = "9013"; // 시스템파라미터 읽기1 - public static readonly string SystemParameterRead1 = "9501"; + public static readonly string _9501_SystemParameterRead1 = "9501"; // 시스템파라미터 읽기2 - public static readonly string SystemParameterRead2 = "9502"; + public static readonly string _9502_SystemParameterRead2 = "9502"; // 시스템파라미터 읽기3 - public static readonly string SystemParameterRead3 = "9503"; + public static readonly string _9503_SystemParameterRead3 = "9503"; // 시스템파라미터 읽기4 - public static readonly string SystemParameterRead4 = "9504"; + public static readonly string _9504_SystemParameterRead4 = "9504"; } #endregion diff --git a/INT51DB/Forms/FormMain.cs b/INT51DB/Forms/FormMain.cs index 9bc6416..a722d87 100644 --- a/INT51DB/Forms/FormMain.cs +++ b/INT51DB/Forms/FormMain.cs @@ -193,7 +193,7 @@ namespace INT51DB.Forms sb.Append(Helper.StringZeroFillDigits4("0000")); sb.Append(Helper.StringZeroFillDigits4(pItem.Number.ToString())); - this.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.ParameterProduct, sb.ToString()); + this.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._9013_ParameterProduct, sb.ToString()); } private void ConverterAlarm(ref WeightData data, string alarm) @@ -328,8 +328,8 @@ namespace INT51DB.Forms #region Test 용 통신 로그 fullPath = this.PathDataBackupFolder + "Communicationlog.txt"; this.smartFileCommunicationLog.FilePathName = fullPath; - //this.smartFileCommunicationLog.Open(); - //this.IsCommunicationLogOpen = true; + this.smartFileCommunicationLog.Open(); + this.IsCommunicationLogOpen = true; #endregion #region Error Check 용 통신 로그 @@ -360,11 +360,11 @@ namespace INT51DB.Forms try { if (cmd == "P") - dataSize = strTemp.Substring(12, strTemp.Length - 14); + dataSize = strTemp.Substring(14, strTemp.Length - 16); else // "S" - dataSize = strTemp.Substring(8, strTemp.Length - 10); + dataSize = strTemp.Substring(10, strTemp.Length - 12); - size = int.Parse(strTemp.Substring(4, 4).Trim()); + size = int.Parse(strTemp.Substring(6, 4).Trim()); } catch { @@ -565,7 +565,7 @@ namespace INT51DB.Forms this.ChildFormMainDisplay.UpdateEquipmentStatusDisplay(this.CurrentSystemStatus.Equipment); } // Read SystemParameter1 - this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress.SystemParameterRead1, ""); + this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._9501_SystemParameterRead1, ""); #endregion break; case "CBI": @@ -744,9 +744,9 @@ namespace INT51DB.Forms this.smartFileCommunicationLog.WriteString(string.Format("Receive ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, strTemp)); cmd = strTemp.Substring(0, 3); - lane = strTemp.Substring(3, 1); - address = strTemp.Substring(8, 4); - receiveData = strTemp.Substring(12, strTemp.Length - 14); + lane = strTemp.Substring(5, 1); + address = strTemp.Substring(10, 4); + receiveData = strTemp.Substring(14, strTemp.Length - 16); switch (cmd) { @@ -771,7 +771,7 @@ namespace INT51DB.Forms private int ReceiveCommandS(string strTemp) { int ret = 0; - string cmd = "", lane = "", receiveData = ""; + string cmd = "", lane = "", receiveData = "", transferCount = ""; // SIZE 확인 if (this.SizeCheck("S", strTemp) == false) @@ -795,8 +795,9 @@ namespace INT51DB.Forms this.smartFileCommunicationLog.WriteString(string.Format("Receive ({0:yyyy-MM-dd HH:mm:ss}): {1}", DateTime.Now, strTemp)); cmd = strTemp.Substring(0, 3); - lane = strTemp.Substring(3, 1); - receiveData = strTemp.Substring(8, strTemp.Length - 10); + transferCount = strTemp.Substring(3, 2); + lane = strTemp.Substring(5, 1); + receiveData = strTemp.Substring(10, strTemp.Length - 12); switch (cmd) { @@ -975,7 +976,7 @@ namespace INT51DB.Forms this.CurrentSystemParameter1.Dummy6 = receiveData.Substring(76, 4).Trim(); #endregion // Read SystemParameter2 - this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress.SystemParameterRead2, ""); + this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._9502_SystemParameterRead2, ""); break; case "9502": #region Value Assign @@ -998,7 +999,7 @@ namespace INT51DB.Forms this.CurrentSystemParameter2.Dummy6 = receiveData.Substring(76, 4).Trim(); #endregion // Read SystemParameter3 - this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress.SystemParameterRead3, ""); + this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._9503_SystemParameterRead3, ""); break; case "9503": #region Value Assign @@ -1030,7 +1031,7 @@ namespace INT51DB.Forms this.CurrentSystemParameter3.Dummy2 = receiveData.Substring(76, 4).Trim(); #endregion // Read SystemParameter4 - this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress.SystemParameterRead4, ""); + this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._9504_SystemParameterRead4, ""); break; case "9504": #region Value Assign @@ -1091,7 +1092,7 @@ namespace INT51DB.Forms if (response == DataStore.ResponseData.ACK) this.TransferProductParameter(this.SystemConfig.ProductNumber); break; - case "9007": + case "9013": if (response == DataStore.ResponseData.ACK) this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress.ProductNumber, ""); break; @@ -2597,7 +2598,7 @@ namespace INT51DB.Forms #endregion // Read SystemParameter1 - this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress.SystemParameterRead1, ""); + this.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress._9501_SystemParameterRead1, ""); // Mouse On //this.smartForm.Mode = SmartForm.RUNMODE.DEVELOPER; diff --git a/INT51DB/Forms/FormMainDisplay.Designer.cs b/INT51DB/Forms/FormMainDisplay.Designer.cs index 7bc1c9d..3296046 100644 --- a/INT51DB/Forms/FormMainDisplay.Designer.cs +++ b/INT51DB/Forms/FormMainDisplay.Designer.cs @@ -670,6 +670,7 @@ this.pictureBoxIconAlarm.Location = new System.Drawing.Point(524, 0); this.pictureBoxIconAlarm.Name = "pictureBoxIconAlarm"; this.pictureBoxIconAlarm.Size = new System.Drawing.Size(60, 60); + this.pictureBoxIconAlarm.Click += new System.EventHandler(this.pictureBoxIconAlarm_Click); // // labelIconNET // diff --git a/INT51DB/obj/Release/INT51DB.exe b/INT51DB/obj/Release/INT51DB.exe index f15c956..b18946d 100644 Binary files a/INT51DB/obj/Release/INT51DB.exe and b/INT51DB/obj/Release/INT51DB.exe differ