diff --git a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.Designer.cs b/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.Designer.cs index 9204525..8b5367d 100644 --- a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.Designer.cs +++ b/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.Designer.cs @@ -39,7 +39,11 @@ this.labelWeight = new SmartX.SmartLabel(); this.buttonStart = new SmartX.SmartButton(); this.pictureBoxStep1 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.radioButtonDecimalPlaces2 = new SmartX.SmartRadioButton(); + this.radioButtonDecimalPlaces1 = new SmartX.SmartRadioButton(); this.smartGroupBox1.SuspendLayout(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // smartGroupBox1 @@ -47,6 +51,7 @@ this.smartGroupBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(46)))), ((int)(((byte)(46)))), ((int)(((byte)(46))))); this.smartGroupBox1.BackPictureBox = null; this.smartGroupBox1.BackPictureBox1 = null; + this.smartGroupBox1.Controls.Add(this.panel1); this.smartGroupBox1.Controls.Add(this.listBoxHelp); this.smartGroupBox1.Controls.Add(this.buttonCancel); this.smartGroupBox1.Controls.Add(this.buttonZero); @@ -76,14 +81,14 @@ this.listBoxHelp.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.LEFT; this.listBoxHelp.ColumnDelimiter = '\0'; this.listBoxHelp.ColumnOffsets = null; - this.listBoxHelp.Font = new System.Drawing.Font("Arial", 17F, System.Drawing.FontStyle.Bold); + this.listBoxHelp.Font = new System.Drawing.Font("Arial", 15F, System.Drawing.FontStyle.Bold); this.listBoxHelp.FontColor = System.Drawing.Color.White; 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(232, 330); + this.listBoxHelp.Location = new System.Drawing.Point(259, 351); this.listBoxHelp.MouseMoveEventSpace = 3; this.listBoxHelp.MouseMoveSpace = 10; this.listBoxHelp.Name = "listBoxHelp"; @@ -115,7 +120,7 @@ this.buttonCancel.ForeColor = System.Drawing.Color.Black; this.buttonCancel.GroupID = 0; this.buttonCancel.InitVisible = true; - this.buttonCancel.Location = new System.Drawing.Point(446, 186); + this.buttonCancel.Location = new System.Drawing.Point(465, 155); this.buttonCancel.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonCancel.Name = "buttonCancel"; this.buttonCancel.NestedClickEventPrevent = false; @@ -146,7 +151,7 @@ this.buttonZero.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonZero.DownImage"))); this.buttonZero.GroupID = 0; this.buttonZero.InitVisible = true; - this.buttonZero.Location = new System.Drawing.Point(446, 52); + this.buttonZero.Location = new System.Drawing.Point(465, 21); this.buttonZero.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonZero.Name = "buttonZero"; this.buttonZero.NestedClickEventPrevent = false; @@ -168,14 +173,14 @@ // pictureBoxStep3 // this.pictureBoxStep3.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxStep3.Image"))); - this.pictureBoxStep3.Location = new System.Drawing.Point(109, 52); + this.pictureBoxStep3.Location = new System.Drawing.Point(128, 21); this.pictureBoxStep3.Name = "pictureBoxStep3"; this.pictureBoxStep3.Size = new System.Drawing.Size(330, 194); // // pictureBoxStep2 // this.pictureBoxStep2.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxStep2.Image"))); - this.pictureBoxStep2.Location = new System.Drawing.Point(109, 52); + this.pictureBoxStep2.Location = new System.Drawing.Point(128, 21); this.pictureBoxStep2.Name = "pictureBoxStep2"; this.pictureBoxStep2.Size = new System.Drawing.Size(330, 194); // @@ -190,7 +195,7 @@ this.labelWeightUnit.ForeColor = System.Drawing.Color.White; this.labelWeightUnit.InitVisible = true; this.labelWeightUnit.LineSpacing = 0F; - this.labelWeightUnit.Location = new System.Drawing.Point(519, 264); + this.labelWeightUnit.Location = new System.Drawing.Point(546, 229); this.labelWeightUnit.Name = "labelWeightUnit"; this.labelWeightUnit.Size = new System.Drawing.Size(27, 40); this.labelWeightUnit.TabIndex = 189; @@ -210,7 +215,7 @@ this.labelWeight.ForeColor = System.Drawing.Color.White; this.labelWeight.InitVisible = true; this.labelWeight.LineSpacing = 0F; - this.labelWeight.Location = new System.Drawing.Point(232, 264); + this.labelWeight.Location = new System.Drawing.Point(259, 229); this.labelWeight.Name = "labelWeight"; this.labelWeight.Size = new System.Drawing.Size(281, 40); this.labelWeight.TabIndex = 188; @@ -233,7 +238,7 @@ this.buttonStart.ForeColor = System.Drawing.Color.Black; this.buttonStart.GroupID = 0; this.buttonStart.InitVisible = true; - this.buttonStart.Location = new System.Drawing.Point(446, 119); + this.buttonStart.Location = new System.Drawing.Point(465, 88); this.buttonStart.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonStart.Name = "buttonStart"; this.buttonStart.NestedClickEventPrevent = false; @@ -255,10 +260,73 @@ // pictureBoxStep1 // this.pictureBoxStep1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxStep1.Image"))); - this.pictureBoxStep1.Location = new System.Drawing.Point(109, 52); + this.pictureBoxStep1.Location = new System.Drawing.Point(128, 21); this.pictureBoxStep1.Name = "pictureBoxStep1"; this.pictureBoxStep1.Size = new System.Drawing.Size(330, 194); // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.Black; + this.panel1.Controls.Add(this.radioButtonDecimalPlaces2); + this.panel1.Controls.Add(this.radioButtonDecimalPlaces1); + this.panel1.Location = new System.Drawing.Point(259, 289); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(314, 40); + // + // radioButtonDecimalPlaces2 + // + this.radioButtonDecimalPlaces2.BackColor = System.Drawing.Color.Black; + this.radioButtonDecimalPlaces2.BackPictureBox = null; + this.radioButtonDecimalPlaces2.BackPictureBox1 = null; + this.radioButtonDecimalPlaces2.BackPictureBox2 = null; + this.radioButtonDecimalPlaces2.Checked = false; + this.radioButtonDecimalPlaces2.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold); + this.radioButtonDecimalPlaces2.ForeColor = System.Drawing.Color.White; + this.radioButtonDecimalPlaces2.GroupID = 0; + this.radioButtonDecimalPlaces2.ImageCheckRadioButton = null; + this.radioButtonDecimalPlaces2.ImageUnCheckRadioButton = null; + this.radioButtonDecimalPlaces2.InitVisible = true; + this.radioButtonDecimalPlaces2.Location = new System.Drawing.Point(172, 6); + this.radioButtonDecimalPlaces2.Name = "radioButtonDecimalPlaces2"; + this.radioButtonDecimalPlaces2.OutputOnly = false; + this.radioButtonDecimalPlaces2.RadioBackColor = System.Drawing.Color.White; + this.radioButtonDecimalPlaces2.RadioCheckColor = System.Drawing.Color.Green; + this.radioButtonDecimalPlaces2.RadioForeColor = System.Drawing.Color.Black; + this.radioButtonDecimalPlaces2.RadioSymbolSize = 14; + this.radioButtonDecimalPlaces2.Shadow = false; + this.radioButtonDecimalPlaces2.Size = new System.Drawing.Size(75, 28); + this.radioButtonDecimalPlaces2.TabIndex = 422; + this.radioButtonDecimalPlaces2.Text = "0.00"; + this.radioButtonDecimalPlaces2.TextVAlign = SmartX.SmartRadioButton.TextVerAlign.Middle; + this.radioButtonDecimalPlaces2.Click += new System.EventHandler(this.radioButtonDecimalPlaces_Click); + // + // radioButtonDecimalPlaces1 + // + this.radioButtonDecimalPlaces1.BackColor = System.Drawing.Color.Black; + this.radioButtonDecimalPlaces1.BackPictureBox = null; + this.radioButtonDecimalPlaces1.BackPictureBox1 = null; + this.radioButtonDecimalPlaces1.BackPictureBox2 = null; + this.radioButtonDecimalPlaces1.Checked = false; + this.radioButtonDecimalPlaces1.Font = new System.Drawing.Font("Arial", 18F, System.Drawing.FontStyle.Bold); + this.radioButtonDecimalPlaces1.ForeColor = System.Drawing.Color.White; + this.radioButtonDecimalPlaces1.GroupID = 0; + this.radioButtonDecimalPlaces1.ImageCheckRadioButton = null; + this.radioButtonDecimalPlaces1.ImageUnCheckRadioButton = null; + this.radioButtonDecimalPlaces1.InitVisible = true; + this.radioButtonDecimalPlaces1.Location = new System.Drawing.Point(18, 6); + this.radioButtonDecimalPlaces1.Name = "radioButtonDecimalPlaces1"; + this.radioButtonDecimalPlaces1.OutputOnly = false; + this.radioButtonDecimalPlaces1.RadioBackColor = System.Drawing.Color.White; + this.radioButtonDecimalPlaces1.RadioCheckColor = System.Drawing.Color.Green; + this.radioButtonDecimalPlaces1.RadioForeColor = System.Drawing.Color.Black; + this.radioButtonDecimalPlaces1.RadioSymbolSize = 14; + this.radioButtonDecimalPlaces1.Shadow = false; + this.radioButtonDecimalPlaces1.Size = new System.Drawing.Size(75, 28); + this.radioButtonDecimalPlaces1.TabIndex = 421; + this.radioButtonDecimalPlaces1.Text = "0.0"; + this.radioButtonDecimalPlaces1.TextVAlign = SmartX.SmartRadioButton.TextVerAlign.Middle; + this.radioButtonDecimalPlaces1.Click += new System.EventHandler(this.radioButtonDecimalPlaces_Click); + // // ControlCenterSystemCalibration // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); @@ -268,6 +336,7 @@ this.Name = "ControlCenterSystemCalibration"; this.Size = new System.Drawing.Size(710, 470); this.smartGroupBox1.ResumeLayout(false); + this.panel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -284,5 +353,8 @@ private System.Windows.Forms.PictureBox pictureBoxStep2; private SmartX.SmartButton buttonZero; private SmartX.SmartListBox listBoxHelp; + private System.Windows.Forms.Panel panel1; + private SmartX.SmartRadioButton radioButtonDecimalPlaces2; + private SmartX.SmartRadioButton radioButtonDecimalPlaces1; } } diff --git a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.cs b/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.cs index 82cee7d..1cd9b8c 100644 --- a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.cs +++ b/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.cs @@ -196,6 +196,17 @@ namespace ITC81DB_0H.Controls this.CalibrationButtonEnable(true, false); this.CalibrationPictureBoxVisible(true, false, false); + if (this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces == 1) + { + if (this.radioButtonDecimalPlaces1.Checked != true) + this.radioButtonDecimalPlaces1.Checked = true; + } + else + { + if (this.radioButtonDecimalPlaces2.Checked != true) + this.radioButtonDecimalPlaces2.Checked = true; + } + if (this.labelWeightUnit.Text != this.ParentForm.ParentForm.SystemConfig1.Unit) this.labelWeightUnit.Text = this.ParentForm.ParentForm.SystemConfig1.Unit; } @@ -212,7 +223,10 @@ namespace ITC81DB_0H.Controls case DataStore.WeightStatus.CalStandby: // 분동중량 표시 this.IsCalibrationFinish = false; - this.labelWeight.Text = "-200.00"; + if(this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces == 1) + this.labelWeight.Text = "-200.0"; + else + this.labelWeight.Text = "-200.00"; this.labelWeight.ForeColor = this.NormalColor; this.listBoxHelp.ClearAll(); if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) @@ -243,7 +257,10 @@ namespace ITC81DB_0H.Controls break; case DataStore.WeightStatus.CalBalans: // 분동중량표시 - this.labelWeight.Text = "-200.00"; + if (this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces == 1) + this.labelWeight.Text = "-200.0"; + else + this.labelWeight.Text = "-200.00"; this.labelWeight.ForeColor = this.NormalColor; this.CalibrationButtonEnable(false, true); this.CalibrationPictureBoxVisible(false, false, true); @@ -328,7 +345,6 @@ namespace ITC81DB_0H.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.UpdateControlsDisplay(); this.Refresh(); @@ -376,42 +392,6 @@ namespace ITC81DB_0H.Controls this.CalibrationButtonEnable(false, false); } - private void buttonBalance_Click(object sender, EventArgs e) - { - this.listBoxHelp.ClearAll(); - if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) - { - this.listBoxHelp.AddItem("Caculating..."); - this.listBoxHelp.AddItem("Wait a minute."); - } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) - { - this.listBoxHelp.AddItem("测量砝码中"); - this.listBoxHelp.AddItem("请等待"); - } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Czech) - { - - } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Russian) - { - this.listBoxHelp.AddItem("Имерение…"); - this.listBoxHelp.AddItem("Ожидайте"); - } - else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.German) - { - this.listBoxHelp.AddItem("Rechnen..."); - this.listBoxHelp.AddItem("bitte warten."); - } - else - { - this.listBoxHelp.AddItem("분동 계산중 입니다"); - this.listBoxHelp.AddItem("잠시만 기다리세요"); - } - - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, CommunicationID.SubBoard1); - this.CalibrationButtonEnable(false, true); - } private void buttonCancel_Click(object sender, EventArgs e) { this.listBoxHelp.ClearAll(); @@ -442,6 +422,68 @@ namespace ITC81DB_0H.Controls this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, CommunicationID.SubBoard1); this.CalibrationButtonEnable(true, false); } + + private void radioButtonDecimalPlaces_Click(object sender, EventArgs e) + { + //this.ParentForm.ParentForm.TransferDataStream(CommunicationCommand.Read, CommunicationID.MainBoard, CommunicationAddress.ParameterRead3901, ""); + this.ParentForm.ParentForm.OpenSmartFileIO(); + + if (this.ParentForm.ParentForm.SystemConfig2.IsUsingRandomMode == true) + { + int currentDecimalPlaces = this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces; + bool radioButtonCompare = false; + + if (this.radioButtonDecimalPlaces1.Checked == true) + { + if (currentDecimalPlaces != 1) + radioButtonCompare = true; + } + else if (this.radioButtonDecimalPlaces2.Checked == true) + { + if (currentDecimalPlaces != 2) + radioButtonCompare = true; + } + + if (radioButtonCompare == true) + { + DialogFormYesNo myDlg = new DialogFormYesNo(this.ParentForm.ParentForm.SystemConfig1.Language, 24); + if (myDlg.ShowDialog() == DialogResult.Yes) + { + if (this.radioButtonDecimalPlaces1.Checked == true) + { + this.ParentForm.ParentForm.CreateProductFileForRandomMode(); + this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces = 1; + } + else if (this.radioButtonDecimalPlaces2.Checked == true) + { + this.ParentForm.ParentForm.CreateProductFileForRandomMode2(); + this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces = 2; + } + + this.ParentForm.ParentForm.SaveSystemConfigurationFile1(this.ParentForm.ParentForm.SystemConfig1); + } + } + } + else + { + if (this.radioButtonDecimalPlaces1.Checked == true) + { + this.ParentForm.ParentForm.CreateProductFileForRandomMode(); + this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces = 1; + } + else if (this.radioButtonDecimalPlaces2.Checked == true) + { + this.ParentForm.ParentForm.CreateProductFileForRandomMode2(); + this.ParentForm.ParentForm.SystemConfig1.DecimalPlaces = 2; + } + + this.ParentForm.ParentForm.SaveSystemConfigurationFile1(this.ParentForm.ParentForm.SystemConfig1); + } + + this.ParentForm.ParentForm.CloseSmartFileIO(); + this.ParentForm.ParentForm.ReLoadProductFile(); + this.ParentForm.ParentForm.TransferRandomMode(); + } #endregion } } diff --git a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.resx b/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.resx index 60ae377..2d6f186 100644 --- a/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.resx +++ b/ITC81DB_0H/Controls/CenterSystem/ControlCenterSystemCalibration.resx @@ -4319,135 +4319,163 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOxAAADsQBlSsOGwAAHdZJREFUeF7t3U+MnXXV - wHGooWzARNwLpFLAHQuSVgjaatHg6g0scC0CBYVI4g4SQljxJ0FZ6IKE1jZBpmi6AALLEnl3LNhaCloI - hI1I7IaS8rzvudfHnHfe0/nTPzPz3PM5ySdt5965M7r4nW8enrlzyX+9+N/D6Fvf+hYAALSRW1gYAwDQ - Vm5hYQwAQFu5hYUxAABt5RYWxgAAtJVbWBgDANBWbmFhDABAW7mFhTEAAG3lFhbGAAC0lVtYGAMA0FZu - YWEMAEBbuYWFMQAAbeUWFsYAALSVW1gYAwDQVm5hYQwAQFu5hYUxAABt5RYWxgAAtJVbWBgDANBWbmFh - DABAW7mFhTEAAG3lFhbGAAC0lVtYGAMA0FZuYWEMAEBbuYWFMQAAbeUWFsYAALSVW1gYAwDQVm5hYQwA - QFu5hYUxAABt5RYWxgAAtJVbWBgDANBWbmFhDABAW7mFhTEAAG3lFhbGAAC0lVtYGAMA0FZuYWEMAEBb - uYWFMQAAbeUWFsYAALSVW1gYAwDQVm5hYQwAQFu5hYUxAABt5RYWxgAAtJVbWBgDANBWbmFhDABAW7mF - hTEAAG3lFhbGAAC0lVtYGAMA0FZuYWEMAEBbuYWFMQAAbeUWFsYAALSVW1gYAwDQVm5hYQwAQFu5hYUx - AABt5RYWxgAAtJVbWBgDANBWbmFhDABAW7mFhTEAAG3lFhbGAAC0lVtYGAMA0FZuYWEMAEBbuYWFMQAA - beUWFsYAALSVW1gYAwDQVm5hYQwAQFu5hYUxAABt5RYWxgAAtJVbWBgDANBWbmFhDABAW7mFhTEAAG3l + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOxAAADsQBlSsOGwAAJF5JREFUeF7t3V+s53V5 + 4HGkYbyBJrX3BTKI2DsvTKAaK1Oxjb3aDLuRXm4tMGIhmngnW2K8QtzYklS3JZFhJmudETMXwkKabAMR + 225C1U1qU2EYBdZZUqslnWyWQfjsPr8fX/PM6XPm/5w583leT/LKwJzf+Z0zPdPP8/bL9/zOZf/uK98e + i1/7tV8DAIA2cgsLYwAA2sotLIwBAGgrt7AwBgCgrdzCwhgAgLZyCwtjAADayi0sjAEAaCu3sDAGAKCt + 3MLCGACAtnILC2MAANrKLSyMAQBoK7ewMAYAoK3cwsIYAIC2cgsLYwAA2sotLIwBAGgrt7AwBgCgrdzC + whgAgLZyCwtjAADayi0sjAEAaCu3sDAGAKCt3MLCGACAtnILC2MAANrKLSyMAQBoK7ewMAYAoK3cwsIY + AIC2cgsLYwAA2sotLIwBAGgrt7AwBgCgrdzCwhgAgLZyCwtjAADayi0sjAEAaCu3sDAGAKCt3MLCGACA + tnILC2MAANrKLSyMAQBoK7ewMAYAoK3cwsIYAIC2cgsLYwAA2sotLIwBAGgrt7AwBgCgrdzCwhgAgLZy + CwtjAADayi0sjAEAaCu3sDAGAKCt3MLCGACAtnILC2MAANrKLSyMAQBoK7ewMAYAoK3cwsIYAIC2cgsL + YwAA2sotLIwBAGgrt7AwBgCgrdzCwhgAgLZyCwtjAADayi0sjAEAaCu3sDAGAKCt3MLCGACAtnILC2MA + ANrKLSyMAQBoK7ewMAYAoK3cwsIYAIC2cgsLYwAA2sotLIwBAGgrt7AwBgCgrdzCwhgAgLZyCwtjAADa + yi0sjAEAaCu3sDAGAKCt3MLCGACAtnILC2MAANrKLSyMAQBoK7ewMAYAoK3cwsIYAIC2cgsLYwAA2sot + LIwBAGgrt7AwBgCgrdzCwhgAgLZyCwtjAADayi0sjAEAaCu3sDAGAKCt3MLCGACAtnILC2MAANrKLSyM + AQBoK7ewMAYAoK3cwsIYAIC2cgsLYwAA2sotLIwBAGgrt7AwBgCgrdzCwhgAgLZyCwtjAADayi0sjAEA + aCu3sDAGAKCt3MLCGACAtnILC2MAANrKLSyMAQBoK7ewMAYAoK3cwsIYAIC2cgsLYwAA2sotLIwBAGgr + t7AwBgCgrdzCwhgAgLZyCwtjAADayi0sjAEAaCu3sDAGAKCt3MLCGACAtnILC2MAANrKLSyMAQBoK7ew + MAYAoK3cwsIYAIC2cgsLYwAA2sotLIwBAGgrt7AwBgCgrdzCwhgAgLZyCwtjAADayi0sjAEAaCu3sDAG + AKCt3MLCGACAtnILC2MAANrKLSyMAQBoK7ewMAYAoK3cwsIYAIC2cgsLYwAA2sotLIwBAGgrt7AwBgCg + rdzCwhgAgLZyCwtjAADayi0sjAEAaCu3sDAGAKCt3MLCGACAtnILC2MAANrKLSyMAQBoK7ewMAYAoK3c + wsIYAIC2cgsLYwAA2sotLIwBAGgrt7AwBgCgrdzCwhgAgLZyCwtjAADayi0sjAEAaCu3sDAGAKCt3MLC + GACAtnILC2MAANrKLSyMAQBoK7ewMAYAoK3cwsIYAIC2cgsLYwAA2sotLIwBAGgrt7AwBgCgrdzCwhgA + gLZyCwtjAADayi0sjAEAaCu3sDAGAKCt3MLCGACAtnILC2MAANrKLSyMAQBoK7ewMAYAoK3cwsIYAIC2 + cgsLYwAA2sotLIwBAGgrt7AwBgCgrdzCwhgAgLZyCwtjAADayi0sjAEAaCu3sDAGAKCt3MLCGACAtnIL + C2MAANrKLSyMAQBoK7ewMAYAoK3cwsIYAIC2cgsLYwAA2sotLIwBAGgrt7AwBgCgrdzCwhgAgLZyCwtj + AADayi0sjAEAaCu3sDAGAKCt3MLCGACAtnILC2MAANrKLSyMAQBoK7ewMAYAoK3cwsIYAIC2cgsLYwAA + 2sotLIwBAGgrt7AwBgCgrdzCwhgAgLZyCwtjAADayi0sjAEAaCu3sDAGAKCt3MLCGACAtnILC2MAANrK + LSyMAQBoK7ewMAYAoK3cwsIYAIC2cgsLYwAA2sotLIwBAGgrt7AwBgCgrdzCwhgAgLZyCwtjAADayi0s + jAEAaCu3sDAGAKCt3MLCGACAtnILC2MAANrKLSyMAQBoK7ewMAYAoK3cwsIYAIC2cgsLYwAA2sotLIwB + AGgrt7AwBgCgrdzCwhgAgLZyCwtjAADayi0sjAEAaCu3sDAGAKCt3MLCGACAtnILC2MAANrKLSyMAQBo + K7ewMAYAoK3cwsIYAIC2cgsLYwAA2sotLIwBAGgrt7AwBgCgrdzCwhgAgLZyCwtjAADayi0sjAEAaCu3 + sDAGAKCt3MLCmLN24403jk9+8pPjK1/5ynjqqafG4cOHx89+9rPx2muvDWOMMeZCzvHjx1c7J3ZP7KDY + RbGTYjdVOws2k1tYGHNG4sB54IEHxg9+8IPx4osvjr17944//MM/HB/+8IfH9ddfP97xjneMt7/97eOy + yy4DgAtmx44dq50Tuyd2UOyi2Emxm2JHxa666aabyl0GWW5hYcxp+e3f/u3xzW9+c7zxxhvjs5/97Pj1 + X//18qACgIstdlTsqthZsbtih1W7DUJuYWHMSb3nPe8ZBw8eHG+++ea44447xuWXX14eQgCw3cTOit0V + Oyx2Wey0atfRW25hYcym9uzZM1599dVx3333jbe97W3loQMA213ssNhlsdNit1U7j75yCwtj/o2dO3eO + Rx55ZBw4cGDcfPPN5SEDAJea2Gmx2/bt27faddUOpJ/cwsKYE7z73e9efXfvF7/4xfJQAYBLXey42HWx + 86pdSC+5hYUxv/Cud71rPPvss+P+++8vDxIAmEXsuth5sfuqnUgfuYWFMSvxn5SeeeaZ1cvbVAcIAMwm + dt63vvUtt1U0l1tYGLMS9xS7fQKAbmL3xT3H1W6kh9zCwphx1113jb/4i78oDwwAmN1Xv/rV8YlPfKLc + kcwvt7Awbu69733v6uVrfvM3f7M8LABgdh/4wAdWuzB2YrUrmVtuYWHc3KFDh8ZnPvOZ8qAAgC5iF8ZO + rHYlc8stLIwb+8hHPrL6aUB+eAcA3cUujJ0Yu7Hamcwrt7AwbuzJJ58cH/vYx8oDAgC6iZ0Yu7Hamcwr + t7Awbuqmm24ab7zxxurnyFeHA6fnox/96OqbF3ft2lW+HYBLR+zE2I3ve9/7yt3JnHILC+OmPv/5z4/P + fe5z5cFwoUVILnPvvfeWj4nQXObw4cPlY8ITTzzx1qNG+faTeeihh956z7H6nKrHnMr3vve91fvHc1Vv + B+DSEnvpj//4j8vdyZxyCwvjpp577rnVj8KsDoWtsEyEbfX2HK0xm12RfeWVV1Zvj0Ct3n4yFyOMr7/+ + +tXHCvHP1WMAuHjibI4LMtXuZE65hYVxQzfeeON48cUXywNhq8RP2YuJsD3Z25f5whe+8G8eE7cxLHOx + rtieaRjnq+VnG+MAXFgRxu9///vLHcp8cgsL44Y+9alPjYcffrg8DLZKvlpbXQ1e5tixY6tfI5Q3PuZU + z7EVhDHAfOJM//SnP13uUOaTW1gYNxRRHD/hpzoMtkq+h3jj1eC4v2uZJX4jkPNjwsmuOsfzR3guqnDO + tzWc7G2bvX/IYXw67xO/v0z888a3A3DxxY6MXVntUOaTW1gYN/TUU0+ND3/4w+VhsJWW+4M33md84MCB + 1e/Hf8rKAb0xJJeryfH4/PvL+2+ciNh8X2+O1Pz+EerLc+eJz2eZ5bFLGMfbqvdZPrf8sTbO6V5tBmBr + 3HLLLePpp58udyjzyS0sjBv64Q9/OHbu3FkeBltpCdiNV4OXYF6CcQnSHMD5/uL8yhb5VSrinyNIcyjH + cy2PrcI4/148NiI5Po+N0bs8fgnjmHhMPDbeJ0d0/HsEfrxt4+cXvxcfc3k+AC6+2JGxK6sdynxyCwvj + hv71X/91/PIv/3J5GGylfMtEhG78Xr5CvPzeErY5aiMol1l+72TfjJc/1nLrRhXGS+hG5Oary/HcOY43 + Pj5m+XxDvO/y+Hx/dP6Yghhge/rVX/3V8dOf/rTcocwnt7AwbiimOgguhmWWkF2CN6JyeUyOyeW+3SVI + c3TmK8M5ahcbb93YGMbxPsvkq9OL/PzL71Wfx2K5Bzoes/yeMAbY/nbs2DGOHz9e7lDmk1tYGDcUUx0E + F8MSj0tYLv++xOtiufq6XO1dJl8ZXiI1Ajh+f6MljJdQ3RjGp4rWfNV5+b3lY8bz58eG+L0YYQxwaRHG + veQWFsYNbZdbKcISj8sV4mWWAF4s9+ZGOOdAza/8sETqqeZsw3jj44MwBpjPO97xjvGzn/2s3KHMJ7ew + MG5ou3zzXcj3FJ/sVogI5ZgI6OVxcQU4P2aJ1ByiJ7MxdE8VrRsfH4QxwHx8810vuYWFcUPb5eXaFsst + Dsvkb7Jb5Pt/l9l4H/ASzPn+5CyuNkekLhG7MXTzx6hC92T3GAtjgHl4ubZecgsL44a2ww/4yHJwxlSR + GfJLoMXkl2kLOTo3PsdyxTnmZK9KsUR6/JqvWsc/L/c5xyy/L4wB5uMHfPSSW1gYN7QdfiR0lu8Zjskv + e5YtoblM9ZglVGPivuSIz/x++Wp0Fcb5c4nHxr9HSG+8qr08/kzDON86Ep/f8vz5/QC4uOL89iOh+8gt + LIwbuvHGG8eLL75YHgYXyzKb3QYR8usUL69isVFc2V1e2WLjRKDmq8BVGId8dTlPju7lsWcaxmH5RsJl + Nr4dgIsrLoy8//3vL3co88ktLIybeu6558a73/3u8kCYQUR0hO8iv3rFyeT3yeL9czBX73sm8nNvdoUc + gK33zne+c7zwwgvl7mROuYWFcVOf//znx+c+97nyUOhsuY954ytehOXqsCu8APP6zGc+M/7kT/6k3J3M + KbewMG7qN37jN8Ybb7wxLr/88vJg6Gq5/SEmIjn+PSzBHBNXeav3BeDSFjsxduP73ve+cncyp9zCwrix + J598cvz+7/9+eTh0FiGcX4FimbiKvPGVMACYx8c+9rHVbqx2JvPKLSyMG/vd3/3d8eabb463ve1t5QHR + XdxXvNwHfLr3KANwaYpdGDvxIx/5SLkzmVduYWHc3KFDh1b3U1WHBAB0EbswdmK1K5lbbmFh3Nx73/ve + 8eqrr44PfOAD5UEBALOLHRi7MHZitSuZW25hYczqJ/x89atfLQ8LAJhd7MDYhdWOZH65hYUxK/v27Rtf + /OIXywMDAGYVu2///v3lbqSH3MLCmJWdO3eufmLcAw88UB4cADCb2Hmx+2IHVruRHnILC2N+4V3vetd4 + 9tlnx/33318eIAAwi9h1sfNi91U7kT5yCwtjThA/Jvqpp55yWwUA04odF7sudl61C+klt7Aw5t+I/6QU + 91sdOHBg3HzzzeWhAgCXmg9+8IPja1/72mrHuX2CRW5hYcym9uzZs3r5mvvuu88PAQHgkhU7LHZZ7LSP + f/zj5c6jr9zCwpiTes973jO+/vWvr34a0O233776OfLVoQMA203srNhdscNil8VOq3YdveUWFsaclt/5 + nd8Z3/zmN8cbb7wxPvvZz67uy6oOIQC42G644YbVroqdFbsrdli12yDkFhbGnJEbb7xx9fI2zz333PjR + j340Hn744XHXXXeNW265Zbzzne8cv/IrvzKuuOKK8qACgPMldk3snNg9sYNiF8VOit30/PPPr3bVTTfd + VO4yyHILC2POWkTypz71qbF3797x9NNPjxdeeGH8y7/8y3j99deHMcYYcyEndk3snNg9sYNiF8VOit1U + 7SzYTG5hYQwAQFu5hYUxAABt5RYWxgAAtJVbWBgDANBWbmFhDABAW7mFhTEAAG3lFhbGAAC0lVtYGAMA + 0FZuYWEMAEBbuYWFMQAAbeUWFsas3HDDDeOhhx4aL730kh/pbIwxZuo5duzYeP7558ehQ4fGnj17xs6d + O8vdSA+5hYUx40//9E/H8ePHx7eO/GT856d+MO44+Oz493v/+oS/KFy6Yi677DIA3nLllVeuLgjddttt + 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 - dLEDYxfGTqx2Jawmt7Awnrj4DT8vvfRSeVgAwKKLHRi7sNqRsBa5hYXxAjh06NDw3HPPlQcGACyq2H2H - Dx8udyOsVW5hYbwAduzYMfuNcc8880x5cADAoomdF7svdmC1G2GtcgsL4wVx/fXXD++8887w1FNPlQcI - ACyK2HWx82L3VTsR1iO3sDBeIPFroo8dO+a2CgAWVuy42HWx86pdCOuVW1gYL5j4T0pxv9XS0tKwZ8+e - 8lABgKn5/ve/P7z88suzHef2CS6k3MLCeEHt379/9vY1jz/+uF8CAsBkxQ6LXRY77YEHHih3HpyP3MLC - eIHddNNNwyuvvDL7bUD33nvv7PfIV4cOAGw1sbNid8UOi10WO63adXC+cgsL4wZ+/OMfD6+++upw5syZ - 4Yknnpjdl1UdQgCw2W644YbZroqdFbsrdli12+BCyS0sjBvZtWvX7O1tjh8/Pvz9738fDhw4MDz44IPD - vn37huuuu274xje+MVx22WXlQQUAF0rsmtg5sXtiB8Uuip0Uu+m9996b7ardu3eXuwwutNzCwripiORH - HnlkOHjw4PDWW28N77///vDPf/5z+PLLLwdjjDHmYk7smtg5sXtiB8Uuip0Uu6naWXAx5RYWxgAAtJVb - WBgDANBWbmFhDABAW7mFhTEAAG3lFhbGAAC0lVtYGAMA0FZuYWEMAEBbuYWFMQAAbeUWFsYAALSVW1gY - AwDQVm5hYQwAQFu5hYUxAABt5RYWxgAAtJVbWBgvgB07dgwPPPDAcPTo0eHDDz8cTp8+PRhjjDGLOKdO - nRree++92c7bv3//bAdWuxHWKrewMJ64n//858MHH3wwvPzyy8NPf/rT4Zprrhm2b98+XHLJJQCwcK64 - 4orhhhtumO28paWl2Q689957yx0Ja5FbWBhP1LXXXjv87ne/G/785z8P+/btKw8PAFh0P/zhD4c//elP - s50Yu7HambCS3MLCeKLiAHj++eeHK6+8sjwoAKCL2IWxE2M3VjsTVpJbWBhP0P333z8cOXJEFAPAv8VO - jN0YO7LanXA2uYWF8cTEDxl8/PHHw969e8uDAQC6it34ySef+IE81iW3sDCemIceemg4fPhweSAAQHeH - Dh0aHn744XKHQiW3sDCemNdee2246667ysMAALq78847h9dff73coVDJLSyMJ+ajjz4arr766vIwAIDu - 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 - xf8e/gcz4GrueSDaMgAAAABJRU5ErkJggg== + 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 + IOMmPLoAAAAASUVORK5CYII= diff --git a/ITC81DB_0H/DataStore.cs b/ITC81DB_0H/DataStore.cs index 12fe89c..76e1dd3 100644 --- a/ITC81DB_0H/DataStore.cs +++ b/ITC81DB_0H/DataStore.cs @@ -1016,7 +1016,7 @@ namespace ITC81DB_0H this.IsExternalInputLamp = false; this.EquipmentID = 1; - this.DecimalPlaces = 1; + this.DecimalPlaces = 2; this.ProductNumber = 1; this.UsbID = 1; this.SerialCOM1BaudRate = 0; diff --git a/ITC81DB_0H/DialogForms/DialogFormLogOn.Designer.cs b/ITC81DB_0H/DialogForms/DialogFormLogOn.Designer.cs index dab48ef..7a149a6 100644 --- a/ITC81DB_0H/DialogForms/DialogFormLogOn.Designer.cs +++ b/ITC81DB_0H/DialogForms/DialogFormLogOn.Designer.cs @@ -64,6 +64,7 @@ this.textBoxPassword.TabIndex = 167; this.textBoxPassword.Text = "ABCDEFGHJK"; this.textBoxPassword.GotFocus += new System.EventHandler(this.textBoxPassword_GotFocus); + this.textBoxPassword.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBoxPassword_KeyPress); // // textBoxID // @@ -75,6 +76,7 @@ this.textBoxID.TabIndex = 166; this.textBoxID.Text = "ABCDEFGHJK"; this.textBoxID.GotFocus += new System.EventHandler(this.textBoxID_GotFocus); + this.textBoxID.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBoxID_KeyPress); // // buttonLogon // diff --git a/ITC81DB_0H/DialogForms/DialogFormLogOn.cs b/ITC81DB_0H/DialogForms/DialogFormLogOn.cs index f2eef76..8190b4d 100644 --- a/ITC81DB_0H/DialogForms/DialogFormLogOn.cs +++ b/ITC81DB_0H/DialogForms/DialogFormLogOn.cs @@ -168,5 +168,71 @@ namespace ITC81DB_0H.DialogForms //this.smartKeyboard.Show(); } #endregion + + private void textBoxID_KeyPress(object sender, KeyPressEventArgs e) + { + if (e.KeyChar == '\r') + { + UserItem user = null; + + user = this.ParentForm.CurrentUser.FindUser(this.textBoxID.Text); + + if (user != null) + { + if (user.Password == this.textBoxPassword.Text) + { + this.ParentForm.CurrentSystemStatus.CurrentUser.ID = user.ID; + this.ParentForm.CurrentSystemStatus.CurrentUser.Password = user.Password; + this.ParentForm.CurrentSystemStatus.CurrentUser.Group = user.Group; + + this.DialogResult = DialogResult.OK; + this.Close(); + } + else + { + DialogFormMessage myMsg = new DialogFormMessage(33, this.ParentForm.SystemConfig1.Language); + myMsg.ShowDialog(); + } + } + else + { + DialogFormMessage myMsg = new DialogFormMessage(32, this.ParentForm.SystemConfig1.Language); + myMsg.ShowDialog(); + } + } + } + + private void textBoxPassword_KeyPress(object sender, KeyPressEventArgs e) + { + if (e.KeyChar == '\r') + { + UserItem user = null; + + user = this.ParentForm.CurrentUser.FindUser(this.textBoxID.Text); + + if (user != null) + { + if (user.Password == this.textBoxPassword.Text) + { + this.ParentForm.CurrentSystemStatus.CurrentUser.ID = user.ID; + this.ParentForm.CurrentSystemStatus.CurrentUser.Password = user.Password; + this.ParentForm.CurrentSystemStatus.CurrentUser.Group = user.Group; + + this.DialogResult = DialogResult.OK; + this.Close(); + } + else + { + DialogFormMessage myMsg = new DialogFormMessage(33, this.ParentForm.SystemConfig1.Language); + myMsg.ShowDialog(); + } + } + else + { + DialogFormMessage myMsg = new DialogFormMessage(32, this.ParentForm.SystemConfig1.Language); + myMsg.ShowDialog(); + } + } + } } } \ No newline at end of file diff --git a/ITC81DB_0H/Forms/FormMain.cs b/ITC81DB_0H/Forms/FormMain.cs index 10da7b6..d294b3f 100644 --- a/ITC81DB_0H/Forms/FormMain.cs +++ b/ITC81DB_0H/Forms/FormMain.cs @@ -274,6 +274,7 @@ namespace ITC81DB_0H.Forms this.CountingOutput2Count = 0; this.FlagThreadMessage1 = false; this.IsCurrentKeyKorean = false; + this.OverloadWeight = 700.00; #region 통신관련 this.CurrentOPT2COM1 = new SerialOPT2(); diff --git a/ITC81DB_0H/bin/Release/ITC81DB_0H.exe b/ITC81DB_0H/bin/Release/ITC81DB_0H.exe index 279b524..f7a13a3 100644 Binary files a/ITC81DB_0H/bin/Release/ITC81DB_0H.exe and b/ITC81DB_0H/bin/Release/ITC81DB_0H.exe differ diff --git a/ITC81DB_0H/bin/Release/ITC81DB_ImageDll.dll b/ITC81DB_0H/bin/Release/ITC81DB_ImageDll.dll index d49d308..5be5d32 100644 Binary files a/ITC81DB_0H/bin/Release/ITC81DB_ImageDll.dll and b/ITC81DB_0H/bin/Release/ITC81DB_ImageDll.dll differ diff --git a/ITC81DB_0H/obj/Release/ITC81DB_0H.exe b/ITC81DB_0H/obj/Release/ITC81DB_0H.exe index 279b524..f7a13a3 100644 Binary files a/ITC81DB_0H/obj/Release/ITC81DB_0H.exe and b/ITC81DB_0H/obj/Release/ITC81DB_0H.exe differ diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/ITC81DB_0H_ImageDll.csproj b/ITC81DB_ImageDll/ITC81DB_ImageDll/ITC81DB_0H_ImageDll.csproj index 6f8874c..a34a653 100644 --- a/ITC81DB_ImageDll/ITC81DB_ImageDll/ITC81DB_0H_ImageDll.csproj +++ b/ITC81DB_ImageDll/ITC81DB_ImageDll/ITC81DB_0H_ImageDll.csproj @@ -3085,18 +3085,12 @@ - - - - - - @@ -3145,9 +3139,6 @@ - - - @@ -3172,9 +3163,6 @@ - - - @@ -3202,11 +3190,23 @@ + + + - + + + + + + + + + + diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/chnBackgroundCalibration.png b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/chnBackgroundCalibration.png index b4cf3a0..df0af78 100644 Binary files a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/chnBackgroundCalibration.png and b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/chnBackgroundCalibration.png differ diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/engBackgroundCalibration.png b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/engBackgroundCalibration.png index ae831c4..3d61f92 100644 Binary files a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/engBackgroundCalibration.png and b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/engBackgroundCalibration.png differ diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/gerBackgroundCalibration.png b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/gerBackgroundCalibration.png index 7ae4936..1b07c0e 100644 Binary files a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/gerBackgroundCalibration.png and b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/gerBackgroundCalibration.png differ diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/korBackgroundCalibration.png b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/korBackgroundCalibration.png index 4cbef8e..241e78a 100644 Binary files a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/korBackgroundCalibration.png and b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/korBackgroundCalibration.png differ diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/rusBackgroundCalibration.png b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/rusBackgroundCalibration.png index ab0e2f1..e44ce8d 100644 Binary files a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/rusBackgroundCalibration.png and b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/rusBackgroundCalibration.png differ diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/bin/Release/ITC81DB_ImageDll.dll b/ITC81DB_ImageDll/ITC81DB_ImageDll/bin/Release/ITC81DB_ImageDll.dll index d49d308..5be5d32 100644 Binary files a/ITC81DB_ImageDll/ITC81DB_ImageDll/bin/Release/ITC81DB_ImageDll.dll and b/ITC81DB_ImageDll/ITC81DB_ImageDll/bin/Release/ITC81DB_ImageDll.dll differ