diff --git a/ITC81DB.suo b/ITC81DB.suo index 297b7aa..1498e8c 100644 Binary files a/ITC81DB.suo and b/ITC81DB.suo differ diff --git a/ITC81DB/Controls/CenterBasic/ControlCenterBasicDataStatistics.Designer.cs b/ITC81DB/Controls/CenterBasic/ControlCenterBasicDataStatistics.Designer.cs index 52cde9a..9e36afe 100644 --- a/ITC81DB/Controls/CenterBasic/ControlCenterBasicDataStatistics.Designer.cs +++ b/ITC81DB/Controls/CenterBasic/ControlCenterBasicDataStatistics.Designer.cs @@ -175,7 +175,7 @@ this.labelNGCount.BackPictureBox2 = this.smartGroupBox1; this.labelNGCount.BorderColor = System.Drawing.Color.Black; this.labelNGCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelNGCount.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); + this.labelNGCount.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); this.labelNGCount.ForeColor = System.Drawing.Color.White; this.labelNGCount.InitVisible = true; this.labelNGCount.LineSpacing = 0F; @@ -642,7 +642,7 @@ this.labelUnderSumWeight.BackPictureBox2 = this.smartGroupBox1; this.labelUnderSumWeight.BorderColor = System.Drawing.Color.Black; this.labelUnderSumWeight.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelUnderSumWeight.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelUnderSumWeight.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelUnderSumWeight.ForeColor = System.Drawing.Color.White; this.labelUnderSumWeight.InitVisible = true; this.labelUnderSumWeight.LineSpacing = 0F; @@ -662,7 +662,7 @@ this.labelPassSumWeight.BackPictureBox2 = this.smartGroupBox1; this.labelPassSumWeight.BorderColor = System.Drawing.Color.Black; this.labelPassSumWeight.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelPassSumWeight.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelPassSumWeight.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelPassSumWeight.ForeColor = System.Drawing.Color.White; this.labelPassSumWeight.InitVisible = true; this.labelPassSumWeight.LineSpacing = 0F; @@ -682,7 +682,7 @@ this.labelOverSumWeight.BackPictureBox2 = this.smartGroupBox1; this.labelOverSumWeight.BorderColor = System.Drawing.Color.Black; this.labelOverSumWeight.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelOverSumWeight.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelOverSumWeight.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelOverSumWeight.ForeColor = System.Drawing.Color.White; this.labelOverSumWeight.InitVisible = true; this.labelOverSumWeight.LineSpacing = 0F; @@ -765,7 +765,7 @@ this.labelStopTime.BackPictureBox2 = this.smartGroupBox1; this.labelStopTime.BorderColor = System.Drawing.Color.Black; this.labelStopTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStopTime.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelStopTime.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); this.labelStopTime.ForeColor = System.Drawing.Color.White; this.labelStopTime.InitVisible = true; this.labelStopTime.LineSpacing = 0F; @@ -785,7 +785,7 @@ this.labelTotalCount.BackPictureBox2 = this.smartGroupBox1; this.labelTotalCount.BorderColor = System.Drawing.Color.Black; this.labelTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTotalCount.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); + this.labelTotalCount.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); this.labelTotalCount.ForeColor = System.Drawing.Color.White; this.labelTotalCount.InitVisible = true; this.labelTotalCount.LineSpacing = 0F; @@ -805,7 +805,7 @@ this.labelStartTime.BackPictureBox2 = this.smartGroupBox1; this.labelStartTime.BorderColor = System.Drawing.Color.Black; this.labelStartTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStartTime.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelStartTime.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); this.labelStartTime.ForeColor = System.Drawing.Color.White; this.labelStartTime.InitVisible = true; this.labelStartTime.LineSpacing = 0F; @@ -825,7 +825,7 @@ this.labelExNGCount.BackPictureBox2 = this.smartGroupBox1; this.labelExNGCount.BorderColor = System.Drawing.Color.Black; this.labelExNGCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelExNGCount.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); + this.labelExNGCount.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); this.labelExNGCount.ForeColor = System.Drawing.Color.White; this.labelExNGCount.InitVisible = true; this.labelExNGCount.LineSpacing = 0F; @@ -845,7 +845,7 @@ this.labelUnderRatio.BackPictureBox2 = this.smartGroupBox1; this.labelUnderRatio.BorderColor = System.Drawing.Color.Black; this.labelUnderRatio.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelUnderRatio.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelUnderRatio.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); this.labelUnderRatio.ForeColor = System.Drawing.Color.White; this.labelUnderRatio.InitVisible = true; this.labelUnderRatio.LineSpacing = 0F; @@ -865,7 +865,7 @@ this.labelUnderAverage.BackPictureBox2 = this.smartGroupBox1; this.labelUnderAverage.BorderColor = System.Drawing.Color.Black; this.labelUnderAverage.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelUnderAverage.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelUnderAverage.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelUnderAverage.ForeColor = System.Drawing.Color.White; this.labelUnderAverage.InitVisible = true; this.labelUnderAverage.LineSpacing = 0F; @@ -885,7 +885,7 @@ this.labelUnderRange.BackPictureBox2 = this.smartGroupBox1; this.labelUnderRange.BorderColor = System.Drawing.Color.Black; this.labelUnderRange.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelUnderRange.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelUnderRange.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); this.labelUnderRange.ForeColor = System.Drawing.Color.White; this.labelUnderRange.InitVisible = true; this.labelUnderRange.LineSpacing = 0F; @@ -905,7 +905,7 @@ this.labelUnderCount.BackPictureBox2 = this.smartGroupBox1; this.labelUnderCount.BorderColor = System.Drawing.Color.Black; this.labelUnderCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelUnderCount.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelUnderCount.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelUnderCount.ForeColor = System.Drawing.Color.White; this.labelUnderCount.InitVisible = true; this.labelUnderCount.LineSpacing = 0F; @@ -925,7 +925,7 @@ this.labelPassRatio.BackPictureBox2 = this.smartGroupBox1; this.labelPassRatio.BorderColor = System.Drawing.Color.Black; this.labelPassRatio.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelPassRatio.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelPassRatio.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); this.labelPassRatio.ForeColor = System.Drawing.Color.White; this.labelPassRatio.InitVisible = true; this.labelPassRatio.LineSpacing = 0F; @@ -945,7 +945,7 @@ this.labelPassAverage.BackPictureBox2 = this.smartGroupBox1; this.labelPassAverage.BorderColor = System.Drawing.Color.Black; this.labelPassAverage.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelPassAverage.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelPassAverage.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelPassAverage.ForeColor = System.Drawing.Color.White; this.labelPassAverage.InitVisible = true; this.labelPassAverage.LineSpacing = 0F; @@ -965,7 +965,7 @@ this.labelPassRange.BackPictureBox2 = this.smartGroupBox1; this.labelPassRange.BorderColor = System.Drawing.Color.Black; this.labelPassRange.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelPassRange.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelPassRange.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); this.labelPassRange.ForeColor = System.Drawing.Color.White; this.labelPassRange.InitVisible = true; this.labelPassRange.LineSpacing = 0F; @@ -985,7 +985,7 @@ this.labelPassCount.BackPictureBox2 = this.smartGroupBox1; this.labelPassCount.BorderColor = System.Drawing.Color.Black; this.labelPassCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelPassCount.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelPassCount.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelPassCount.ForeColor = System.Drawing.Color.White; this.labelPassCount.InitVisible = true; this.labelPassCount.LineSpacing = 0F; @@ -1005,7 +1005,7 @@ this.labelOverRatio.BackPictureBox2 = this.smartGroupBox1; this.labelOverRatio.BorderColor = System.Drawing.Color.Black; this.labelOverRatio.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelOverRatio.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelOverRatio.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); this.labelOverRatio.ForeColor = System.Drawing.Color.White; this.labelOverRatio.InitVisible = true; this.labelOverRatio.LineSpacing = 0F; @@ -1025,7 +1025,7 @@ this.labelOverAverage.BackPictureBox2 = this.smartGroupBox1; this.labelOverAverage.BorderColor = System.Drawing.Color.Black; this.labelOverAverage.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelOverAverage.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelOverAverage.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelOverAverage.ForeColor = System.Drawing.Color.White; this.labelOverAverage.InitVisible = true; this.labelOverAverage.LineSpacing = 0F; @@ -1045,7 +1045,7 @@ this.labelOverRange.BackPictureBox2 = this.smartGroupBox1; this.labelOverRange.BorderColor = System.Drawing.Color.Black; this.labelOverRange.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelOverRange.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelOverRange.Font = new System.Drawing.Font("새굴림", 13F, System.Drawing.FontStyle.Bold); this.labelOverRange.ForeColor = System.Drawing.Color.White; this.labelOverRange.InitVisible = true; this.labelOverRange.LineSpacing = 0F; @@ -1065,7 +1065,7 @@ this.labelOverCount.BackPictureBox2 = this.smartGroupBox1; this.labelOverCount.BorderColor = System.Drawing.Color.Black; this.labelOverCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelOverCount.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelOverCount.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.labelOverCount.ForeColor = System.Drawing.Color.White; this.labelOverCount.InitVisible = true; this.labelOverCount.LineSpacing = 0F; diff --git a/ITC81DB/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs b/ITC81DB/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs index a1743e9..c99f216 100644 --- a/ITC81DB/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs +++ b/ITC81DB/Controls/CenterEquipment/ControlCenterEquipFunctionSetting.cs @@ -92,6 +92,8 @@ namespace ITC81DB.Controls this.buttonStartStopLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engOFF)); this.buttonCommunicationLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engON)); this.buttonCommunicationLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engOFF)); + this.buttonBarcodeLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engON)); + this.buttonBarcodeLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engOFF)); #endregion } else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) @@ -135,6 +137,8 @@ namespace ITC81DB.Controls this.buttonStartStopLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnOFF)); this.buttonCommunicationLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnON)); this.buttonCommunicationLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnOFF)); + this.buttonBarcodeLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnON)); + this.buttonBarcodeLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnOFF)); #endregion } else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) @@ -182,6 +186,8 @@ namespace ITC81DB.Controls this.buttonStartStopLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusOFF)); this.buttonCommunicationLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusON)); this.buttonCommunicationLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusOFF)); + this.buttonBarcodeLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusON)); + this.buttonBarcodeLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusOFF)); #endregion } else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.German) @@ -225,6 +231,8 @@ namespace ITC81DB.Controls this.buttonStartStopLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerOFF)); this.buttonCommunicationLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerON)); this.buttonCommunicationLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerOFF)); + this.buttonBarcodeLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerON)); + this.buttonBarcodeLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerOFF)); #endregion } else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) @@ -268,6 +276,8 @@ namespace ITC81DB.Controls this.buttonStartStopLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engOFF)); this.buttonCommunicationLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engON)); this.buttonCommunicationLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engOFF)); + this.buttonBarcodeLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engON)); + this.buttonBarcodeLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engOFF)); #endregion } else @@ -311,6 +321,8 @@ namespace ITC81DB.Controls this.buttonStartStopLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engOFF)); this.buttonCommunicationLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engON)); this.buttonCommunicationLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engOFF)); + this.buttonBarcodeLog.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engON)); + this.buttonBarcodeLog.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engOFF)); #endregion } } diff --git a/ITC81DB/Controls/CenterSystem/ControlCenterSystemCalibration.cs b/ITC81DB/Controls/CenterSystem/ControlCenterSystemCalibration.cs index 28dd400..9d0a34d 100644 --- a/ITC81DB/Controls/CenterSystem/ControlCenterSystemCalibration.cs +++ b/ITC81DB/Controls/CenterSystem/ControlCenterSystemCalibration.cs @@ -548,6 +548,7 @@ namespace ITC81DB.Controls this.ParentForm.ParentForm.SaveSystemConfigurationFile1(this.ParentForm.ParentForm.SystemConfig1); + this.ParentForm.ParentForm.ChildFormMainDisplay.MainDataStatistics.LabelUnit(); this.labelMaxWeightUnit.Text = this.labelBalanceWeightUnit.Text = this.labelWeightUnit.Text = this.ParentForm.ParentForm.SystemConfig1.Unit; } private void radioButtonDigit_Click(object sender, EventArgs e) diff --git a/ITC81DB/Controls/MainDisplay/ControlMainBarGraph.cs b/ITC81DB/Controls/MainDisplay/ControlMainBarGraph.cs index 4caa33d..de5b9f4 100644 --- a/ITC81DB/Controls/MainDisplay/ControlMainBarGraph.cs +++ b/ITC81DB/Controls/MainDisplay/ControlMainBarGraph.cs @@ -331,10 +331,13 @@ namespace ITC81DB.Controls public void UpdateStartWeightDisplay(DataStore.EquipmentStatus status, WeightData data) { string value = ""; - - value = data.ProductionSpeed.ToString(); - if (this.labelSpeed.Text != value) - this.labelSpeed.Text = value; + + if (data.ProductionSpeed <= 500) + { + value = data.ProductionSpeed.ToString(); + if (this.labelSpeed.Text != value) + this.labelSpeed.Text = value; + } this.SetProgressBarValue(this.progressBar, data.Weight, data.JudgmentStatus, this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces); diff --git a/ITC81DB/Controls/MainDisplay/ControlMainDataStatistics.Designer.cs b/ITC81DB/Controls/MainDisplay/ControlMainDataStatistics.Designer.cs index 4127b1b..676f1d7 100644 --- a/ITC81DB/Controls/MainDisplay/ControlMainDataStatistics.Designer.cs +++ b/ITC81DB/Controls/MainDisplay/ControlMainDataStatistics.Designer.cs @@ -172,9 +172,9 @@ this.labelExNgCount.ForeColor = System.Drawing.Color.White; this.labelExNgCount.InitVisible = true; this.labelExNgCount.LineSpacing = 0F; - this.labelExNgCount.Location = new System.Drawing.Point(337, 175); + this.labelExNgCount.Location = new System.Drawing.Point(347, 175); this.labelExNgCount.Name = "labelExNgCount"; - this.labelExNgCount.Size = new System.Drawing.Size(120, 30); + this.labelExNgCount.Size = new System.Drawing.Size(110, 30); this.labelExNgCount.TabIndex = 26; this.labelExNgCount.Text = "234567890"; this.labelExNgCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; @@ -472,9 +472,9 @@ this.labelTitleExNG.ForeColor = System.Drawing.Color.White; this.labelTitleExNG.InitVisible = true; this.labelTitleExNG.LineSpacing = 0F; - this.labelTitleExNG.Location = new System.Drawing.Point(252, 175); + this.labelTitleExNG.Location = new System.Drawing.Point(247, 175); this.labelTitleExNG.Name = "labelTitleExNG"; - this.labelTitleExNG.Size = new System.Drawing.Size(80, 30); + this.labelTitleExNG.Size = new System.Drawing.Size(97, 30); this.labelTitleExNG.TabIndex = 40; this.labelTitleExNG.Text = "기타불량"; this.labelTitleExNG.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; diff --git a/ITC81DB/Controls/MainDisplay/ControlMainDataStatistics.cs b/ITC81DB/Controls/MainDisplay/ControlMainDataStatistics.cs index b75cb10..5efcf8e 100644 --- a/ITC81DB/Controls/MainDisplay/ControlMainDataStatistics.cs +++ b/ITC81DB/Controls/MainDisplay/ControlMainDataStatistics.cs @@ -45,37 +45,88 @@ namespace ITC81DB.Controls if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) { - this.pictureBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.engMainStatScreen)); + this.labelTitleWeight.Font = new Font("새굴림", 15, FontStyle.Bold); + this.labelTitleWeight.Text = "Weight value"; + this.labelTitleCount.Text = "Count"; + this.labelTitleSumWeight.Text = "Sum(kg)"; + this.labelTitleAverage.Text = "Average"; + this.labelTitleNG.Text = "Faulty"; + this.labelTitleExNG.Text = "Other Faulty"; + this.labelTitleTotalCount.Text = "Total"; } else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) { - this.pictureBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.chnMainStatScreen)); + this.labelTitleWeight.Font = new Font("새굴림", 15, FontStyle.Bold); + this.labelTitleWeight.Text = "设定值"; + this.labelTitleCount.Text = "当前"; + this.labelTitleSumWeight.Text = "总和(kg)"; + this.labelTitleAverage.Text = "平均"; + this.labelTitleNG.Text = "剔除"; + this.labelTitleExNG.Text = "其他不良"; + this.labelTitleTotalCount.Text = "总共计数"; } else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) { } else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Russian) { - this.pictureBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.rusMainStatScreen)); + this.labelTitleWeight.Font = new Font("새굴림", 9, FontStyle.Bold); + this.labelTitleWeight.Text = "Настройка значений"; + this.labelTitleCount.Text = "Итог"; + this.labelTitleSumWeight.Text = "Сумма(kg)"; + this.labelTitleAverage.Text = "Средний"; + this.labelTitleNG.Text = "Дефект"; + this.labelTitleExNG.Text = "Другие дефект"; + this.labelTitleTotalCount.Text = "Итого"; } else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.German) { - this.pictureBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.gerMainStatScreen)); + this.labelTitleWeight.Font = new Font("새굴림", 11, FontStyle.Bold); + this.labelTitleWeight.Text = "Einstellungswert"; + this.labelTitleCount.Text = "Zählen"; + this.labelTitleSumWeight.Text = "Summe(kg)"; + this.labelTitleAverage.Text = "Durchschnitt"; + this.labelTitleNG.Text = "Schlecht"; + this.labelTitleExNG.Text = "Andere Schlecht"; + this.labelTitleTotalCount.Text = "Insgesamt"; } else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Spanish) { - this.pictureBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.engMainStatScreen)); + this.labelTitleWeight.Font = new Font("새굴림", 15, FontStyle.Bold); + this.labelTitleWeight.Text = "Setear Valor"; + this.labelTitleCount.Text = "Conteo"; + this.labelTitleSumWeight.Text = "Suma(kg)"; + this.labelTitleAverage.Text = "Promedio"; + this.labelTitleNG.Text = "Rechazo"; + this.labelTitleExNG.Text = "Otro rechazo"; + this.labelTitleTotalCount.Text = "Conteo Total"; } else { - this.pictureBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.korMainStatScreen)); + this.labelTitleWeight.Font = new Font("새굴림", 15, FontStyle.Bold); + this.labelTitleWeight.Text = "설정값"; + this.labelTitleCount.Text = "수량"; + this.labelTitleSumWeight.Text = "누적(kg)"; + this.labelTitleAverage.Text = "평균"; + this.labelTitleNG.Text = "불량"; + this.labelTitleExNG.Text = "기타불량"; + this.labelTitleTotalCount.Text = "전체수량"; } + + this.LabelUnit(); } private void DefaultSetting() { - } + public void LabelUnit() + { + string[] data = this.labelTitleSumWeight.Text.Split('('); + if (this.ParentForm.ParentForm.SystemConfig1.Unit == "oz") + this.labelTitleSumWeight.Text = data[0] + "(oz)"; + else + this.labelTitleSumWeight.Text = data[0] + "(kg)"; + } private void SetProduct(ProductItem item) { string underValue = "", passValue = "", overValue = ""; @@ -137,17 +188,34 @@ namespace ITC81DB.Controls #endregion #region SumWeight - value = data.UnderSumWeightKG; - if (this.labelUnderSumWeight.Text != value) - this.labelUnderSumWeight.Text = value; + if (this.ParentForm.ParentForm.SystemConfig1.Unit != "oz") + { + value = data.UnderSumWeightKG; + if (this.labelUnderSumWeight.Text != value) + this.labelUnderSumWeight.Text = value; - value = data.PassSumWeightKG; - if (this.labelPassSumWeight.Text != value) - this.labelPassSumWeight.Text = value; + value = data.PassSumWeightKG; + if (this.labelPassSumWeight.Text != value) + this.labelPassSumWeight.Text = value; - value = data.OverSumWeightKG; - if (this.labelOverSumWeight.Text != value) - this.labelOverSumWeight.Text = value; + value = data.OverSumWeightKG; + if (this.labelOverSumWeight.Text != value) + this.labelOverSumWeight.Text = value; + } + else + { + value = data.UnderSumWeight.ToString(); + if (this.labelUnderSumWeight.Text != value) + this.labelUnderSumWeight.Text = value; + + value = data.PassSumWeight.ToString(); + if (this.labelPassSumWeight.Text != value) + this.labelPassSumWeight.Text = value; + + value = data.OverSumWeight.ToString(); + if (this.labelOverSumWeight.Text != value) + this.labelOverSumWeight.Text = value; + } #endregion #region Average diff --git a/ITC81DB/Forms/FormMain.cs b/ITC81DB/Forms/FormMain.cs index af51b6c..8a70ba5 100644 --- a/ITC81DB/Forms/FormMain.cs +++ b/ITC81DB/Forms/FormMain.cs @@ -24,7 +24,7 @@ namespace ITC81DB.Forms { #region Field public static string DisplayVersion = "8.16.0"; - public static string ReleaseDate = "2023.7.13"; + public static string ReleaseDate = "2023.7.20"; public SmartSplash SmartSplashProgramLoad; public bool IsCommunicationLogOpen; diff --git a/ITC81DB/Version.txt b/ITC81DB/Version.txt index c8cd30d..7d71a86 100644 Binary files a/ITC81DB/Version.txt and b/ITC81DB/Version.txt differ diff --git a/ITC81DB/bin/Release/ITC81DB.exe b/ITC81DB/bin/Release/ITC81DB.exe index 3464a42..f171b78 100644 Binary files a/ITC81DB/bin/Release/ITC81DB.exe and b/ITC81DB/bin/Release/ITC81DB.exe differ diff --git a/ITC81DB/bin/Release/ITC81DB.pdb b/ITC81DB/bin/Release/ITC81DB.pdb index ba47fef..7f9c9a3 100644 Binary files a/ITC81DB/bin/Release/ITC81DB.pdb and b/ITC81DB/bin/Release/ITC81DB.pdb differ diff --git a/ITC81DB/obj/Release/ITC81DB.csproj.GenerateResource.Cache b/ITC81DB/obj/Release/ITC81DB.csproj.GenerateResource.Cache index eacb394..413938f 100644 Binary files a/ITC81DB/obj/Release/ITC81DB.csproj.GenerateResource.Cache and b/ITC81DB/obj/Release/ITC81DB.csproj.GenerateResource.Cache differ diff --git a/ITC81DB/obj/Release/ITC81DB.exe b/ITC81DB/obj/Release/ITC81DB.exe index 3464a42..f171b78 100644 Binary files a/ITC81DB/obj/Release/ITC81DB.exe and b/ITC81DB/obj/Release/ITC81DB.exe differ diff --git a/ITC81DB/obj/Release/ITC81DB.pdb b/ITC81DB/obj/Release/ITC81DB.pdb index ba47fef..7f9c9a3 100644 Binary files a/ITC81DB/obj/Release/ITC81DB.pdb and b/ITC81DB/obj/Release/ITC81DB.pdb differ diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/obj/Release/Refactor/ITC81DB_ImageDll.dll b/ITC81DB_ImageDll/ITC81DB_ImageDll/obj/Release/Refactor/ITC81DB_ImageDll.dll index 6d9dd3d..64baca8 100644 Binary files a/ITC81DB_ImageDll/ITC81DB_ImageDll/obj/Release/Refactor/ITC81DB_ImageDll.dll and b/ITC81DB_ImageDll/ITC81DB_ImageDll/obj/Release/Refactor/ITC81DB_ImageDll.dll differ