diff --git a/INT51DB/Controls/CenterBasic/ControlCenterBasicProduct.cs b/INT51DB/Controls/CenterBasic/ControlCenterBasicProduct.cs index cf24693..bcce995 100644 --- a/INT51DB/Controls/CenterBasic/ControlCenterBasicProduct.cs +++ b/INT51DB/Controls/CenterBasic/ControlCenterBasicProduct.cs @@ -290,18 +290,7 @@ namespace INT51DB.Controls private void labelOverRange_Click(object sender, EventArgs e) { - int digit = 0; - - if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 0) - digit = 4; - else if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 1) - digit = 5; - else if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 2) - digit = 6; - else - digit = 5; - - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelOverRange.Text, digit, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces, + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelOverRange.Text, 5, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -316,9 +305,7 @@ namespace INT51DB.Controls { this.labelOverRange.Text = myKeyPad.StringValue; this.SelectedProductItem.OverRange = myKeyPad.StringValue.Replace(".", ""); - this.ParentForm.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductNo - 1); - this.DisplayControls(this.SelectedProductItem); } } @@ -326,53 +313,57 @@ namespace INT51DB.Controls private void labelPassRange_Click(object sender, EventArgs e) { - int digit = 0; + int temp = 0, range = 0; + string value = ""; + int oldUnderRangeDeviation = this.SelectedProductItem.UnderRangeDeviation; + int oldOverRangeDeviation = this.SelectedProductItem.OverRangeDeviation; - if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 0) - digit = 4; - else if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 1) - digit = 5; - else if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 2) - digit = 6; - else - digit = 5; - - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelPassRange.Text, digit, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces, + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelPassRange.Text, 5, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.ParentForm.SystemConfig.Language); - if (myKeyPad.ShowDialog() == DialogResult.OK) - { - if ((myKeyPad.doubleValue > Helper.StringToWeight(this.SelectedProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) || - (myKeyPad.doubleValue < Helper.StringToWeight(this.SelectedProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces))) - { - // 입력범위를 확인하세요 - DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.ParentForm.SystemConfig.Language); - myMsg.ShowDialog(); - } - else - { - this.labelPassRange.Text = myKeyPad.StringValue; - this.SelectedProductItem.PassRange = myKeyPad.StringValue.Replace(".", ""); + if (myKeyPad.ShowDialog() != DialogResult.OK) + return; - this.ParentForm.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductNo - 1); - } - } + this.SelectedProductItem.PassRange = myKeyPad.StringValue.Replace(".", ""); + + #region UnderRange + temp = this.SelectedProductItem.PassRangeInt + oldUnderRangeDeviation; + if (temp < 0) + value = "0"; + else + value = temp.ToString(); + + this.SelectedProductItem.UnderRange = value; + #endregion + + #region OverRange + if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 0) + range = 9999; + else + range = 99999; + // V6.2.0 + //if (this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces == 2) + // range = 1000000; + //else if (this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces == 1) + // range = 100000; + //else + // range = 10000; + temp = this.SelectedProductItem.PassRangeInt + oldOverRangeDeviation; + if (temp >= range) + value = myKeyPad.StringValue.Replace(".", ""); + else + value = temp.ToString(); + + this.SelectedProductItem.OverRange = value; + #endregion + + this.ParentForm.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductNo - 1); + this.DisplayControls(this.SelectedProductItem); } private void labelUnderRange_Click(object sender, EventArgs e) { - int digit = 0; - - if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 0) - digit = 4; - else if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 1) - digit = 5; - else if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 2) - digit = 6; - else - digit = 5; - - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelUnderRange.Text, digit, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces, + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelUnderRange.Text, 5, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -389,7 +380,6 @@ namespace INT51DB.Controls this.SelectedProductItem.UnderRange = myKeyPad.StringValue.Replace(".", ""); this.ParentForm.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductNo - 1); - this.DisplayControls(this.SelectedProductItem); } } @@ -397,20 +387,10 @@ namespace INT51DB.Controls private void labelDeviationOver_Click(object sender, EventArgs e) { - int digit = 0; string sValue = ""; double dValue = 0.0; - if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 0) - digit = 4; - else if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 1) - digit = 5; - else if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 2) - digit = 6; - else - digit = 5; - - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelDeviationOver.Text, digit, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces, + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelDeviationOver.Text, 5, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -439,20 +419,10 @@ namespace INT51DB.Controls private void labelDeviationUnder_Click(object sender, EventArgs e) { - int digit = 0; string sValue = ""; double dValue = 0.0; - if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 0) - digit = 4; - else if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 1) - digit = 5; - else if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 2) - digit = 6; - else - digit = 5; - - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelDeviationUnder.Text, digit, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces, + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelDeviationUnder.Text, 5, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) diff --git a/INT51DB/Controls/CenterInformation/ControlCenterInforSystem.cs b/INT51DB/Controls/CenterInformation/ControlCenterInforSystem.cs index 49972c9..92d5a96 100644 --- a/INT51DB/Controls/CenterInformation/ControlCenterInforSystem.cs +++ b/INT51DB/Controls/CenterInformation/ControlCenterInforSystem.cs @@ -60,7 +60,7 @@ namespace INT51DB.Controls } private void DefaultSetting() { - this.labelDisplayVer.Text = "5.1.0"; + this.labelDisplayVer.Text = "1.0.1"; this.labelSerialNo.Text = this.ParentForm.ParentForm.SystemConfig.SerialNumber; } diff --git a/INT51DB/Controls/MainDisplay/ControlMainDisplayBarGraph.cs b/INT51DB/Controls/MainDisplay/ControlMainDisplayBarGraph.cs index 19e6d81..cf44c3a 100644 --- a/INT51DB/Controls/MainDisplay/ControlMainDisplayBarGraph.cs +++ b/INT51DB/Controls/MainDisplay/ControlMainDisplayBarGraph.cs @@ -65,15 +65,15 @@ namespace INT51DB.Controls } - public void RescaleProgressBar() + public void RescaleProgressBar(ProductItem item) { int value = 0; - value = this.ParentForm.ParentForm.CurrentProductItem.ProgressBarMaximum; + value = item.ProgressBarMaximum; if (this.progressBar.Maximum != value) this.progressBar.Maximum = value; - value = this.ParentForm.ParentForm.CurrentProductItem.ProgressBarMinimum; + value = item.ProgressBarMinimum; if (this.progressBar.Minimum != value) this.progressBar.Minimum = value; @@ -92,7 +92,10 @@ namespace INT51DB.Controls tareValue = Helper.StringToDecimalPlaces(item.TareRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); break; case DataStore.WeightInputMode.Deviation: - underValue = Helper.StringToDecimalPlaces(item.UnderRangDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); + if (item.UnderRangeDeviation == 0) + underValue = string.Format("-{0}", Helper.DoubleToString(0, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)); + else + underValue = Helper.StringToDecimalPlaces(item.UnderRangeDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); passValue = Helper.StringToDecimalPlaces(item.PassRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); overValue = Helper.StringToDecimalPlaces(item.OverRangeDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); overValue = string.Format("+{0}", overValue); @@ -215,7 +218,7 @@ namespace INT51DB.Controls this.SetProduct(pItem); this.SetCount(wData); - this.RescaleProgressBar(); + this.RescaleProgressBar(pItem); } public void UpdateUpdateStartWeightDisplay(DataStore.EquipmentStatus status, WeightData data) { @@ -251,18 +254,8 @@ namespace INT51DB.Controls { string value = "", sValue = ""; double dValue = 0.0; - int digit = 0; - if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 0) - digit = 4; - else if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 1) - digit = 5; - else if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 2) - digit = 6; - else - digit = 5; - - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonUnderRange.Text, digit, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces, + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonUnderRange.Text, 5, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() != DialogResult.OK) @@ -294,10 +287,26 @@ namespace INT51DB.Controls else { this.ParentForm.ParentForm.CurrentProductItem.UnderRange = sValue.Replace(".", ""); - this.buttonUnderRange.Text = myKeyPad.StringValue; - this.ParentForm.RescaleControl(); + switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) + { + case DataStore.WeightInputMode.Weight: + value = myKeyPad.StringValue; + break; + case DataStore.WeightInputMode.Deviation: + if (myKeyPad.doubleValue == 0) + value = string.Format("-{0}", Helper.DoubleToString(0, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)); + else + value = myKeyPad.StringValue; + break; + default: + value = myKeyPad.StringValue; + break; + } + this.buttonUnderRange.Text = value; + + this.ParentForm.RescaleControl(this.ParentForm.ParentForm.CurrentProductItem); this.ParentForm.ParentForm.SaveProductFile(this.ParentForm.ParentForm.CurrentProductItem, this.ParentForm.ParentForm.SystemConfig.ProductNumber - 1); value = Helper.StringZeroFillDigits7(this.ParentForm.ParentForm.CurrentProductItem.UnderRange); @@ -306,101 +315,87 @@ namespace INT51DB.Controls } private void buttonPassRange_Click(object sender, EventArgs e) { - string value = ""; + string value = "", underRange = "", overRange = "", viewValue = ""; int digit = 0, temp = 0; StringBuilder sb = new StringBuilder(); + int oldUnderRangeDeviation = this.ParentForm.ParentForm.CurrentProductItem.UnderRangeDeviation; + int oldOverRangeDeviation = this.ParentForm.ParentForm.CurrentProductItem.OverRangeDeviation; - if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 0) - digit = 4; - else if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 1) - digit = 5; - else if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 2) - digit = 6; + if (this.ParentForm.ParentForm.CurrentWeightData.Weight < 1) + viewValue = this.buttonPassRange.Text; else - digit = 5; + viewValue = Helper.DoubleToString(this.ParentForm.ParentForm.CurrentWeightData.Weight, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonPassRange.Text, digit, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces, + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(viewValue, 5, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() != DialogResult.OK) return; + this.ParentForm.ParentForm.CurrentProductItem.PassRange = myKeyPad.StringValue.Replace(".", ""); + + #region UnderRange + temp = this.ParentForm.ParentForm.CurrentProductItem.PassRangeInt + oldUnderRangeDeviation; + if (temp < 0) + value = "0"; + else + value = temp.ToString(); + + this.ParentForm.ParentForm.CurrentProductItem.UnderRange = value; + #endregion + + #region OverRange + temp = this.ParentForm.ParentForm.CurrentProductItem.PassRangeInt + oldOverRangeDeviation; + if (temp > 99999) + value = "99999"; + else + value = temp.ToString(); + + this.ParentForm.ParentForm.CurrentProductItem.OverRange = value; + #endregion + + this.ParentForm.RescaleControl(this.ParentForm.ParentForm.CurrentProductItem); + this.ParentForm.ParentForm.SaveProductFile(this.ParentForm.ParentForm.CurrentProductItem, this.ParentForm.ParentForm.SystemConfig.ProductNumber - 1); + + value = Helper.StringZeroFillDigits7(this.ParentForm.ParentForm.CurrentProductItem.UnderRange); + this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.UnderRange, value); + value = Helper.StringZeroFillDigits7(this.ParentForm.ParentForm.CurrentProductItem.PassRange); + this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.PassRange, value); + value = Helper.StringZeroFillDigits7(this.ParentForm.ParentForm.CurrentProductItem.OverRange); + this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.OverRange, value); + switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) { case DataStore.WeightInputMode.Weight: #region WeightMode - if ((myKeyPad.doubleValue > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - || (myKeyPad.doubleValue < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces))) - { - // 입력범위를 확인하세요 - DialogFormMessage myMsg = new DialogFormMessage(1, this.ParentForm.ParentForm.SystemConfig.Language); - myMsg.ShowDialog(); - } - else - { - this.ParentForm.ParentForm.CurrentProductItem.PassRange = myKeyPad.StringValue.Replace(".", ""); - this.buttonPassRange.Text = myKeyPad.StringValue; - - this.ParentForm.RescaleControl(); - - this.ParentForm.ParentForm.SaveProductFile(this.ParentForm.ParentForm.CurrentProductItem, this.ParentForm.ParentForm.SystemConfig.ProductNumber - 1); - - value = Helper.StringZeroFillDigits7(this.ParentForm.ParentForm.CurrentProductItem.PassRange); - this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.PassRange, value); - } + underRange = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem.UnderRange.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); + overRange = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem.OverRange.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); #endregion break; case DataStore.WeightInputMode.Deviation: #region DeviationMode - this.ParentForm.ParentForm.CurrentProductItem.PassRange = myKeyPad.StringValue.Replace(".", ""); - - temp = this.ParentForm.ParentForm.CurrentProductItem.PassRangeInt + this.ParentForm.ParentForm.CurrentProductItem.UnderRangDeviation; - if (temp < 0) - this.ParentForm.ParentForm.CurrentProductItem.UnderRange = "0"; + if (this.ParentForm.ParentForm.CurrentProductItem.UnderRangeDeviation == 0) + underRange = string.Format("-{0}", Helper.DoubleToString(0, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)); else - this.ParentForm.ParentForm.CurrentProductItem.UnderRange = temp.ToString(); - - temp = this.ParentForm.ParentForm.CurrentProductItem.PassRangeInt + this.ParentForm.ParentForm.CurrentProductItem.OverRangeDeviation; - if (temp > 10000) - this.ParentForm.ParentForm.CurrentProductItem.OverRange = this.ParentForm.ParentForm.CurrentProductItem.PassRange; - else - this.ParentForm.ParentForm.CurrentProductItem.OverRange = temp.ToString(); - - this.ParentForm.RescaleControl(); - - this.ParentForm.ParentForm.SaveProductFile(this.ParentForm.ParentForm.CurrentProductItem, this.ParentForm.ParentForm.SystemConfig.ProductNumber - 1); - - this.buttonPassRange.Text = myKeyPad.StringValue; - this.buttonUnderRange.Text = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem.UnderRangDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); - this.buttonOverRange.Text = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem.OverRangeDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); - - sb.Append(Helper.StringZeroFillDigits7(this.ParentForm.ParentForm.CurrentProductItem.UnderRange)); - sb.Append(Helper.StringZeroFillDigits7(this.ParentForm.ParentForm.CurrentProductItem.OverRange)); - sb.Append(Helper.StringZeroFillDigits7(this.ParentForm.ParentForm.CurrentProductItem.TareRange)); - sb.Append(Helper.StringZeroFillDigits4(this.ParentForm.ParentForm.SystemConfig.ProductNumber.ToString())); - this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress.ParameterWeightSetting, sb.ToString()); + underRange = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem.UnderRangeDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); + overRange = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem.OverRangeDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); + overRange = string.Format("+{0}", overRange); #endregion break; default: break; } + + this.buttonPassRange.Text = myKeyPad.StringValue; + this.buttonUnderRange.Text = underRange; + this.buttonOverRange.Text = overRange; } private void buttonOverRange_Click(object sender, EventArgs e) { string value = "", sValue = ""; double dValue = 0.0; - int digit = 0; - if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 0) - digit = 4; - else if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 1) - digit = 5; - else if (this.ParentForm.ParentForm.SystemConfig.DecimalPlaces == 2) - digit = 6; - else - digit = 5; - - DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonOverRange.Text, digit, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces, + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonOverRange.Text, 5, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() != DialogResult.OK) @@ -431,11 +426,29 @@ namespace INT51DB.Controls } else { + string temp = ""; this.ParentForm.ParentForm.CurrentProductItem.OverRange = sValue.Replace(".", ""); - this.buttonOverRange.Text = myKeyPad.StringValue; - this.ParentForm.RescaleControl(); + switch (this.ParentForm.ParentForm.CurrentSystemStatus.CurrentWeightInputMode) + { + case DataStore.WeightInputMode.Weight: + value = myKeyPad.StringValue; + break; + case DataStore.WeightInputMode.Deviation: + if (myKeyPad.StringValue.Contains('+') == true) + temp = myKeyPad.StringValue.Replace("+", ""); + else + temp = myKeyPad.StringValue; + value = string.Format("+{0}", temp); + break; + default: + value = myKeyPad.StringValue; + break; + } + this.buttonOverRange.Text = value; + + this.ParentForm.RescaleControl(this.ParentForm.ParentForm.CurrentProductItem); this.ParentForm.ParentForm.SaveProductFile(this.ParentForm.ParentForm.CurrentProductItem, this.ParentForm.ParentForm.SystemConfig.ProductNumber - 1); value = Helper.StringZeroFillDigits7(this.ParentForm.ParentForm.CurrentProductItem.OverRange); diff --git a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.cs b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.cs index 67b758f..3c215f4 100644 --- a/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.cs +++ b/INT51DB/Controls/MainDisplay/ControlMainDisplayFunction1.cs @@ -76,6 +76,21 @@ namespace INT51DB.Controls this.labelDownDelayTime.Text = value; #endregion } + public void UpdateEquipmentStatusDisplay(DataStore.EquipmentStatus status) + { + string value = ""; + + if (status == DataStore.EquipmentStatus.Start) + { + this.buttonServoDown.Enabled = false; + this.buttonServoUp1.Enabled = false; + } + else + { + this.buttonServoDown.Enabled = true; + this.buttonServoUp1.Enabled = true; + } + } public void DisplayRefresh(SystemStatus status) { diff --git a/INT51DB/Controls/MainDisplay/ControlMainDisplayLineGraph.Designer.cs b/INT51DB/Controls/MainDisplay/ControlMainDisplayLineGraph.Designer.cs index a5419d2..4e9599c 100644 --- a/INT51DB/Controls/MainDisplay/ControlMainDisplayLineGraph.Designer.cs +++ b/INT51DB/Controls/MainDisplay/ControlMainDisplayLineGraph.Designer.cs @@ -277,7 +277,9 @@ this.buttonOverRange.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonOverRange.Name = "buttonOverRange"; this.buttonOverRange.NestedClickEventPrevent = false; + this.buttonOverRange.OutlinePixel = 1; this.buttonOverRange.RepeatInterval = 200; + this.buttonOverRange.RepeatIntervalAccelerate = null; this.buttonOverRange.SafeInterval = 200; this.buttonOverRange.Size = new System.Drawing.Size(176, 66); this.buttonOverRange.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -289,6 +291,7 @@ this.buttonOverRange.TextLocation = new System.Drawing.Point(0, 0); this.buttonOverRange.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonOverRange.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonOverRange.UpImage"))); + this.buttonOverRange.Click += new System.EventHandler(this.buttonOverRange_Click); // // buttonPassRange // @@ -307,7 +310,9 @@ this.buttonPassRange.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonPassRange.Name = "buttonPassRange"; this.buttonPassRange.NestedClickEventPrevent = false; + this.buttonPassRange.OutlinePixel = 1; this.buttonPassRange.RepeatInterval = 200; + this.buttonPassRange.RepeatIntervalAccelerate = null; this.buttonPassRange.SafeInterval = 200; this.buttonPassRange.Size = new System.Drawing.Size(176, 66); this.buttonPassRange.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -319,6 +324,7 @@ this.buttonPassRange.TextLocation = new System.Drawing.Point(0, 0); this.buttonPassRange.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonPassRange.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonPassRange.UpImage"))); + this.buttonPassRange.Click += new System.EventHandler(this.buttonPassRange_Click); // // buttonUnderRange // @@ -337,7 +343,9 @@ this.buttonUnderRange.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonUnderRange.Name = "buttonUnderRange"; this.buttonUnderRange.NestedClickEventPrevent = false; + this.buttonUnderRange.OutlinePixel = 1; this.buttonUnderRange.RepeatInterval = 200; + this.buttonUnderRange.RepeatIntervalAccelerate = null; this.buttonUnderRange.SafeInterval = 200; this.buttonUnderRange.Size = new System.Drawing.Size(176, 66); this.buttonUnderRange.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; @@ -349,6 +357,7 @@ this.buttonUnderRange.TextLocation = new System.Drawing.Point(0, 0); this.buttonUnderRange.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonUnderRange.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonUnderRange.UpImage"))); + this.buttonUnderRange.Click += new System.EventHandler(this.buttonUnderRange_Click); // // draw // diff --git a/INT51DB/Controls/MainDisplay/ControlMainDisplayLineGraph.cs b/INT51DB/Controls/MainDisplay/ControlMainDisplayLineGraph.cs index 5092f00..065c235 100644 --- a/INT51DB/Controls/MainDisplay/ControlMainDisplayLineGraph.cs +++ b/INT51DB/Controls/MainDisplay/ControlMainDisplayLineGraph.cs @@ -113,7 +113,7 @@ namespace INT51DB.Controls overValue = Helper.StringToDecimalPlaces(item.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); break; case DataStore.WeightInputMode.Deviation: - underValue = Helper.StringToDecimalPlaces(item.UnderRangDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); + underValue = Helper.StringToDecimalPlaces(item.UnderRangeDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); passValue = Helper.StringToDecimalPlaces(item.PassRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); overValue = Helper.StringToDecimalPlaces(item.OverRangeDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); overValue = string.Format("+{0}", overValue); @@ -273,7 +273,7 @@ namespace INT51DB.Controls this.ParentForm.ParentForm.CurrentProductItem.UnderRange = sValue.Replace(".", ""); this.buttonUnderRange.Text = myKeyPad.StringValue; - this.ParentForm.RescaleControl(); + this.ParentForm.RescaleControl(this.ParentForm.ParentForm.CurrentProductItem); this.ParentForm.ParentForm.SaveProductFile(this.ParentForm.ParentForm.CurrentProductItem, this.ParentForm.ParentForm.SystemConfig.ProductNumber - 1); @@ -319,7 +319,7 @@ namespace INT51DB.Controls this.ParentForm.ParentForm.CurrentProductItem.PassRange = myKeyPad.StringValue.Replace(".", ""); this.buttonPassRange.Text = myKeyPad.StringValue; - this.ParentForm.RescaleControl(); + this.ParentForm.RescaleControl(this.ParentForm.ParentForm.CurrentProductItem); this.ParentForm.ParentForm.SaveProductFile(this.ParentForm.ParentForm.CurrentProductItem, this.ParentForm.ParentForm.SystemConfig.ProductNumber - 1); @@ -332,7 +332,7 @@ namespace INT51DB.Controls #region DeviationMode this.ParentForm.ParentForm.CurrentProductItem.PassRange = myKeyPad.StringValue.Replace(".", ""); - temp = this.ParentForm.ParentForm.CurrentProductItem.PassRangeInt + this.ParentForm.ParentForm.CurrentProductItem.UnderRangDeviation; + temp = this.ParentForm.ParentForm.CurrentProductItem.PassRangeInt + this.ParentForm.ParentForm.CurrentProductItem.UnderRangeDeviation; if (temp < 0) this.ParentForm.ParentForm.CurrentProductItem.UnderRange = "0"; else @@ -344,12 +344,12 @@ namespace INT51DB.Controls else this.ParentForm.ParentForm.CurrentProductItem.OverRange = temp.ToString(); - this.ParentForm.RescaleControl(); + this.ParentForm.RescaleControl(this.ParentForm.ParentForm.CurrentProductItem); this.ParentForm.ParentForm.SaveProductFile(this.ParentForm.ParentForm.CurrentProductItem, this.ParentForm.ParentForm.SystemConfig.ProductNumber - 1); this.buttonPassRange.Text = myKeyPad.StringValue; - this.buttonUnderRange.Text = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem.UnderRangDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); + this.buttonUnderRange.Text = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem.UnderRangeDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); this.buttonOverRange.Text = Helper.StringToDecimalPlaces(this.ParentForm.ParentForm.CurrentProductItem.OverRangeDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); sb.Append(Helper.StringZeroFillDigits7(this.ParentForm.ParentForm.CurrentProductItem.UnderRange)); @@ -413,7 +413,7 @@ namespace INT51DB.Controls this.ParentForm.ParentForm.CurrentProductItem.OverRange = sValue.Replace(".", ""); this.buttonOverRange.Text = myKeyPad.StringValue; - this.ParentForm.RescaleControl(); + this.ParentForm.RescaleControl(this.ParentForm.ParentForm.CurrentProductItem); this.ParentForm.ParentForm.SaveProductFile(this.ParentForm.ParentForm.CurrentProductItem, this.ParentForm.ParentForm.SystemConfig.ProductNumber - 1); diff --git a/INT51DB/Controls/MainDisplay/ControlMainDisplayStatistics.cs b/INT51DB/Controls/MainDisplay/ControlMainDisplayStatistics.cs index 73e224d..626a0c6 100644 --- a/INT51DB/Controls/MainDisplay/ControlMainDisplayStatistics.cs +++ b/INT51DB/Controls/MainDisplay/ControlMainDisplayStatistics.cs @@ -73,7 +73,7 @@ namespace INT51DB.Controls overValue = Helper.StringToDecimalPlaces(item.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); break; case DataStore.WeightInputMode.Deviation: - underValue = Helper.StringToDecimalPlaces(item.UnderRangDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); + underValue = Helper.StringToDecimalPlaces(item.UnderRangeDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); passValue = Helper.StringToDecimalPlaces(item.PassRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); overValue = Helper.StringToDecimalPlaces(item.OverRangeDeviation.ToString(), this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); overValue = string.Format("+{0}", overValue); diff --git a/INT51DB/DataStore.cs b/INT51DB/DataStore.cs index 68133e5..d5444fc 100644 --- a/INT51DB/DataStore.cs +++ b/INT51DB/DataStore.cs @@ -916,20 +916,20 @@ namespace INT51DB public int OverRangeDeviation { - get { return this.m_OverRangeDeviation; } + get { return this.OverRangeInt - this.PassRangeInt; } //set //{ // int iValue = 0; - + // iValue = this.OverRangeInt - Math.Abs(value); - + // this.m_OverRange = iValue.ToString(); // this.m_OverRangeDeviation = value; //} } - public int UnderRangDeviation + public int UnderRangeDeviation { - get { return this.m_UnderRangeDeviation; } + get { return this.UnderRangeInt - this.PassRangeInt; } //set //{ // int iValue = 0; @@ -939,7 +939,7 @@ namespace INT51DB // this.m_UnderRange = iValue.ToString(); // this.m_UnderRangeDeviation = value; //} - } + } public int UnderRangeInt { diff --git a/INT51DB/Forms/FormMainDisplay.Designer.cs b/INT51DB/Forms/FormMainDisplay.Designer.cs index ae99fc6..05261e5 100644 --- a/INT51DB/Forms/FormMainDisplay.Designer.cs +++ b/INT51DB/Forms/FormMainDisplay.Designer.cs @@ -497,7 +497,7 @@ this.buttonWeightInputMode.ButtonImageAutoSize = true; this.buttonWeightInputMode.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonWeightInputMode.DisableImage = null; - this.buttonWeightInputMode.DownImage = null; + this.buttonWeightInputMode.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonWeightInputMode.DownImage"))); this.buttonWeightInputMode.GroupID = 0; this.buttonWeightInputMode.InitVisible = false; this.buttonWeightInputMode.Location = new System.Drawing.Point(710, 129); diff --git a/INT51DB/Forms/FormMainDisplay.cs b/INT51DB/Forms/FormMainDisplay.cs index 3d94c19..66ec540 100644 --- a/INT51DB/Forms/FormMainDisplay.cs +++ b/INT51DB/Forms/FormMainDisplay.cs @@ -203,9 +203,9 @@ namespace INT51DB.Forms this.ParentForm.TransferProductParameter(productNumber); } - public void RescaleControl() + public void RescaleControl(ProductItem item) { - this.MainDisplayBarGraph.RescaleProgressBar(); + this.MainDisplayBarGraph.RescaleProgressBar(item); } public void Clear() { @@ -305,9 +305,12 @@ namespace INT51DB.Forms this.MainDisplayFunction2.Visible = false; this.labelWeight.Text = Helper.StringToDecimalPlaces("0", this.ParentForm.SystemConfig.DecimalPlaces); + this.buttonConveyorUpDown.Enabled = false; + this.MainDisplayBarGraph.UpdateEquipmentStatusDisplay(status); this.MainDisplayLineGraph.UpdateEquipmentStatusDisplay(status); this.MainDisplayList.UpdateEquipmentStatusDisplay(status); + this.MainDisplayFunction1.UpdateEquipmentStatusDisplay(status); } else { @@ -319,9 +322,13 @@ namespace INT51DB.Forms this.buttonProductNo.Enabled = true; this.MainDisplayFunction2.Visible = false; + this.buttonConveyorUpDown.Enabled = true; + this.buttonConveyorUpDown.ButtonUp(); + this.MainDisplayBarGraph.UpdateEquipmentStatusDisplay(status); this.MainDisplayLineGraph.UpdateEquipmentStatusDisplay(status); this.MainDisplayList.UpdateEquipmentStatusDisplay(status); + this.MainDisplayFunction1.UpdateEquipmentStatusDisplay(status); } } public void UpdateCurrentProductDisplay(DataStore.EquipmentStatus status, ProductItem pItem, WeightData wData) @@ -521,6 +528,9 @@ namespace INT51DB.Forms this.UpdateDisplay(); this.DisplayBottomMain(this.CurrentDisplay); + this.buttonConveyorUpDown.Visible = true; + this.buttonConveyorUpDown.ButtonUp(); + this.ProductChange(this.ParentForm.SystemConfig.ProductNumber); } #endregion diff --git a/INT51DB/Forms/FormMainDisplay.resx b/INT51DB/Forms/FormMainDisplay.resx index 71f0fb9..aa4290a 100644 --- a/INT51DB/Forms/FormMainDisplay.resx +++ b/INT51DB/Forms/FormMainDisplay.resx @@ -1728,6 +1728,70 @@ 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 diff --git a/INT51DB/Forms/FormMenu.cs b/INT51DB/Forms/FormMenu.cs index 55bc537..1fce867 100644 --- a/INT51DB/Forms/FormMenu.cs +++ b/INT51DB/Forms/FormMenu.cs @@ -354,6 +354,14 @@ namespace INT51DB.Forms break; } } + private bool EquipmentRun(DataStore.DisplayStore currentDisplay) + { + if (currentDisplay == DataStore.DisplayStore.SystemJudgmentSetting + || currentDisplay == DataStore.DisplayStore.SystemSorterSetting) + return true; + else + return false; + } private void DisplaySideMenu(DataStore.MemuSide menu) { @@ -894,30 +902,38 @@ namespace INT51DB.Forms #endregion #region Event Handler + private void pictureBoxStop_Click(object sender, EventArgs e) + { + if (this.EquipmentRun(this.ParentForm.CurrentSystemStatus.CurrentDisplay) == true) + this.ParentForm.TransferData(CommunicationCommand.Start, CommunicationID.MainBoard); + + } + private void pictureBoxStart_Click(object sender, EventArgs e) + { + if (this.EquipmentRun(this.ParentForm.CurrentSystemStatus.CurrentDisplay) == true) + this.ParentForm.TransferData(CommunicationCommand.Stop, CommunicationID.MainBoard); + } + private void buttonBasic_Click(object sender, EventArgs e) { this.SelectedSideMenu = DataStore.MemuSide.Basic; this.DisplaySideMenu(this.SelectedSideMenu); } - private void buttonConfiguration_Click(object sender, EventArgs e) { this.SelectedSideMenu = DataStore.MemuSide.Configuration; this.DisplaySideMenu(this.SelectedSideMenu); } - private void buttonSystem_Click(object sender, EventArgs e) { this.SelectedSideMenu = DataStore.MemuSide.System; this.DisplaySideMenu(this.SelectedSideMenu); } - private void buttonEquipment_Click(object sender, EventArgs e) { this.SelectedSideMenu = DataStore.MemuSide.Equipment; this.DisplaySideMenu(this.SelectedSideMenu); } - private void buttonInformation_Click(object sender, EventArgs e) { this.SelectedSideMenu = DataStore.MemuSide.Information; @@ -935,20 +951,11 @@ namespace INT51DB.Forms ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormMainDisplay); } - private void pictureBoxStop_Click(object sender, EventArgs e) - { - - } - - private void pictureBoxStart_Click(object sender, EventArgs e) - { - - } - private void buttonHidden_Click(object sender, EventArgs e) { this.ParentForm.CurrentSystemStatus.CurrentUser.Group = DataStore.UserGroup.Level4Developer; } + #endregion } } \ No newline at end of file diff --git a/INT51DB/Version.txt b/INT51DB/Version.txt index 3132e55..90bba0f 100644 --- a/INT51DB/Version.txt +++ b/INT51DB/Version.txt @@ -11,6 +11,16 @@ ٿ 1 üĿ */ +@ Ver 1.0.1 + - 2023.11.27 + - Framework : SmartX Framework V3.1.1(update: 2019.03.21) + - ȭ + 1. ̹ + 2. ߷ ߰ + 3. ߷ Է + 4. + 5. ǰ + @ Ver 1.0.0 - 2023.11.24 - Framework : SmartX Framework V3.1.1(update: 2019.03.21) diff --git a/INT51DB/obj/Release/INT51DB.exe b/INT51DB/obj/Release/INT51DB.exe index 5cd90be..c8f754c 100644 Binary files a/INT51DB/obj/Release/INT51DB.exe and b/INT51DB/obj/Release/INT51DB.exe differ