diff --git a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStart.Designer.cs b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStart.Designer.cs index 230373a..8697d47 100644 --- a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStart.Designer.cs +++ b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStart.Designer.cs @@ -42,7 +42,9 @@ this.buttonPassRange = new SmartX.SmartButton(); this.buttonOverRange = new SmartX.SmartButton(); this.buttonUnderRange = new SmartX.SmartButton(); - this.labelDoubleEntryCount = new SmartX.SmartLabel(); + this.labelTitleTotalCount = new SmartX.SmartLabel(); + this.labelTitleExNgCount = new SmartX.SmartLabel(); + this.labelTitleSpeed = new SmartX.SmartLabel(); this.SuspendLayout(); // // pictureBox1 @@ -63,7 +65,7 @@ this.smartLabel20.ForeColor = System.Drawing.Color.White; this.smartLabel20.InitVisible = true; this.smartLabel20.LineSpacing = 0F; - this.smartLabel20.Location = new System.Drawing.Point(119, 175); + this.smartLabel20.Location = new System.Drawing.Point(170, 175); this.smartLabel20.Name = "smartLabel20"; this.smartLabel20.Size = new System.Drawing.Size(50, 30); this.smartLabel20.TabIndex = 469; @@ -99,13 +101,13 @@ this.labelTotalCount.BackPictureBox2 = null; this.labelTotalCount.BorderColor = System.Drawing.Color.Black; this.labelTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTotalCount.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.labelTotalCount.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Bold); this.labelTotalCount.ForeColor = System.Drawing.Color.White; this.labelTotalCount.InitVisible = true; this.labelTotalCount.LineSpacing = 0F; - this.labelTotalCount.Location = new System.Drawing.Point(601, 175); + this.labelTotalCount.Location = new System.Drawing.Point(573, 175); this.labelTotalCount.Name = "labelTotalCount"; - this.labelTotalCount.Size = new System.Drawing.Size(95, 30); + this.labelTotalCount.Size = new System.Drawing.Size(115, 30); this.labelTotalCount.TabIndex = 465; this.labelTotalCount.Text = "234567890"; this.labelTotalCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; @@ -119,18 +121,19 @@ this.labelExNGCount.BackPictureBox2 = null; this.labelExNGCount.BorderColor = System.Drawing.Color.Black; this.labelExNGCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelExNGCount.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.labelExNGCount.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Bold); this.labelExNGCount.ForeColor = System.Drawing.Color.White; this.labelExNGCount.InitVisible = true; this.labelExNGCount.LineSpacing = 0F; - this.labelExNGCount.Location = new System.Drawing.Point(426, 175); + this.labelExNGCount.Location = new System.Drawing.Point(340, 175); this.labelExNGCount.Name = "labelExNGCount"; - this.labelExNGCount.Size = new System.Drawing.Size(95, 30); + this.labelExNGCount.Size = new System.Drawing.Size(115, 30); this.labelExNGCount.TabIndex = 468; this.labelExNGCount.Text = "234567890"; this.labelExNGCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; this.labelExNGCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelExNGCount.Wordwrap = false; + this.labelExNGCount.Click += new System.EventHandler(this.labelTitleExNgCount_Click); // // labelPassCount // @@ -163,7 +166,7 @@ this.labelSpeed.ForeColor = System.Drawing.Color.White; this.labelSpeed.InitVisible = true; this.labelSpeed.LineSpacing = 0F; - this.labelSpeed.Location = new System.Drawing.Point(58, 175); + this.labelSpeed.Location = new System.Drawing.Point(109, 175); this.labelSpeed.Name = "labelSpeed"; this.labelSpeed.Size = new System.Drawing.Size(55, 30); this.labelSpeed.TabIndex = 464; @@ -348,31 +351,74 @@ this.buttonUnderRange.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonUnderRange.UpImage"))); this.buttonUnderRange.Click += new System.EventHandler(this.buttonUnderRange_Click); // - // labelDoubleEntryCount + // labelTitleTotalCount // - this.labelDoubleEntryCount.BackPictureBox = this.pictureBox1; - this.labelDoubleEntryCount.BackPictureBox1 = null; - this.labelDoubleEntryCount.BackPictureBox2 = null; - this.labelDoubleEntryCount.BorderColor = System.Drawing.Color.Black; - this.labelDoubleEntryCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelDoubleEntryCount.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.labelDoubleEntryCount.ForeColor = System.Drawing.Color.White; - this.labelDoubleEntryCount.InitVisible = true; - this.labelDoubleEntryCount.LineSpacing = 0F; - this.labelDoubleEntryCount.Location = new System.Drawing.Point(251, 175); - this.labelDoubleEntryCount.Name = "labelDoubleEntryCount"; - this.labelDoubleEntryCount.Size = new System.Drawing.Size(95, 30); - this.labelDoubleEntryCount.TabIndex = 476; - this.labelDoubleEntryCount.Text = "234567890"; - this.labelDoubleEntryCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; - this.labelDoubleEntryCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelDoubleEntryCount.Wordwrap = false; + this.labelTitleTotalCount.BackPictureBox = this.pictureBox1; + this.labelTitleTotalCount.BackPictureBox1 = null; + this.labelTitleTotalCount.BackPictureBox2 = null; + this.labelTitleTotalCount.BorderColor = System.Drawing.Color.Black; + this.labelTitleTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleTotalCount.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleTotalCount.ForeColor = System.Drawing.Color.White; + this.labelTitleTotalCount.InitVisible = true; + this.labelTitleTotalCount.LineSpacing = 0F; + this.labelTitleTotalCount.Location = new System.Drawing.Point(487, 175); + this.labelTitleTotalCount.Name = "labelTitleTotalCount"; + this.labelTitleTotalCount.Size = new System.Drawing.Size(80, 30); + this.labelTitleTotalCount.TabIndex = 479; + this.labelTitleTotalCount.Text = "총계"; + this.labelTitleTotalCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleTotalCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleTotalCount.Wordwrap = false; + // + // labelTitleExNgCount + // + this.labelTitleExNgCount.BackPictureBox = this.pictureBox1; + this.labelTitleExNgCount.BackPictureBox1 = null; + this.labelTitleExNgCount.BackPictureBox2 = null; + this.labelTitleExNgCount.BorderColor = System.Drawing.Color.Black; + this.labelTitleExNgCount.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleExNgCount.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleExNgCount.ForeColor = System.Drawing.Color.White; + this.labelTitleExNgCount.InitVisible = true; + this.labelTitleExNgCount.LineSpacing = 0F; + this.labelTitleExNgCount.Location = new System.Drawing.Point(254, 175); + this.labelTitleExNgCount.Name = "labelTitleExNgCount"; + this.labelTitleExNgCount.Size = new System.Drawing.Size(80, 30); + this.labelTitleExNgCount.TabIndex = 478; + this.labelTitleExNgCount.Text = "기타불량"; + this.labelTitleExNgCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleExNgCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleExNgCount.Wordwrap = false; + this.labelTitleExNgCount.Click += new System.EventHandler(this.labelTitleExNgCount_Click); + // + // labelTitleSpeed + // + this.labelTitleSpeed.BackPictureBox = this.pictureBox1; + this.labelTitleSpeed.BackPictureBox1 = null; + this.labelTitleSpeed.BackPictureBox2 = null; + this.labelTitleSpeed.BorderColor = System.Drawing.Color.Black; + this.labelTitleSpeed.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleSpeed.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleSpeed.ForeColor = System.Drawing.Color.White; + this.labelTitleSpeed.InitVisible = true; + this.labelTitleSpeed.LineSpacing = 0F; + this.labelTitleSpeed.Location = new System.Drawing.Point(21, 175); + this.labelTitleSpeed.Name = "labelTitleSpeed"; + this.labelTitleSpeed.Size = new System.Drawing.Size(80, 30); + this.labelTitleSpeed.TabIndex = 480; + this.labelTitleSpeed.Text = "속도"; + this.labelTitleSpeed.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleSpeed.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleSpeed.Wordwrap = false; // // ControlMainDisplayStart // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.Controls.Add(this.labelDoubleEntryCount); + this.Controls.Add(this.labelTitleSpeed); + this.Controls.Add(this.labelTitleTotalCount); + this.Controls.Add(this.labelTitleExNgCount); this.Controls.Add(this.labelUnderCount); this.Controls.Add(this.buttonUnderRange); this.Controls.Add(this.buttonTareRange); @@ -407,7 +453,9 @@ private SmartX.SmartButton buttonPassRange; private SmartX.SmartButton buttonOverRange; private SmartX.SmartButton buttonUnderRange; - private SmartX.SmartLabel labelDoubleEntryCount; + private SmartX.SmartLabel labelTitleTotalCount; + private SmartX.SmartLabel labelTitleExNgCount; + private SmartX.SmartLabel labelTitleSpeed; } } diff --git a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStart.cs b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStart.cs index 8001349..9f57bc3 100644 --- a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStart.cs +++ b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStart.cs @@ -47,9 +47,11 @@ namespace ITC81DB_0H.Controls if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) { - this.pictureBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.engMainStopScreen)); + this.labelTitleSpeed.Text = "Speed"; + this.labelTitleExNgCount.Text = "ExNG"; + this.labelTitleTotalCount.Text = "Total"; - this.buttonOverRange.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engMainRunOverDisable)); + this.buttonOverRange.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engMainRunOverDisable)); this.buttonOverRange.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.engMainRunOverDown)); this.buttonOverRange.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.engMainRunOverUp)); this.buttonPassRange.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.engMainRunPassDisable)); @@ -64,8 +66,6 @@ namespace ITC81DB_0H.Controls } else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) { - this.pictureBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.chnMainStopScreen)); - this.buttonOverRange.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnMainRunOverDisable)); this.buttonOverRange.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnMainRunOverDown)); this.buttonOverRange.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.chnMainRunOverUp)); @@ -84,8 +84,6 @@ namespace ITC81DB_0H.Controls } else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Russian) { - this.pictureBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.rusMainStopScreen)); - this.buttonOverRange.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusMainRunOverDisable)); this.buttonOverRange.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusMainRunOverDown)); this.buttonOverRange.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.rusMainRunOverUp)); @@ -101,8 +99,6 @@ namespace ITC81DB_0H.Controls } else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.German) { - this.pictureBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.gerMainRunScreen)); - this.buttonOverRange.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerMainRunOverDisable)); this.buttonOverRange.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerMainRunOverDown)); this.buttonOverRange.UpImage = new Bitmap(images.GetImage(Class1.ButtonImages.gerMainRunOverUp)); @@ -118,7 +114,9 @@ namespace ITC81DB_0H.Controls } else { - this.pictureBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.korMainStopScreen)); + this.labelTitleSpeed.Text = "속도"; + this.labelTitleExNgCount.Text = "기타불량"; + this.labelTitleTotalCount.Text = "총계"; this.buttonOverRange.DisableImage = new Bitmap(images.GetImage(Class1.ButtonImages.korMainRunOverDisable)); this.buttonOverRange.DownImage = new Bitmap(images.GetImage(Class1.ButtonImages.korMainRunOverDown)); @@ -211,10 +209,6 @@ namespace ITC81DB_0H.Controls if (this.labelExNGCount.Text != value) this.labelExNGCount.Text = value; - value = data.DoubleEntryCount.ToString(); - if (this.labelDoubleEntryCount.Text != value) - this.labelDoubleEntryCount.Text = value; - value = data.TotalCount.ToString(); if (this.labelTotalCount.Text != value) this.labelTotalCount.Text = value; @@ -335,6 +329,28 @@ namespace ITC81DB_0H.Controls #endregion #region Event Handler + private void labelTitleExNgCount_Click(object sender, EventArgs e) + { + if (this.labelTitleExNgCount.Text == "Double" || this.labelTitleExNgCount.Text == "이중진입") + { + if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + this.labelTitleExNgCount.Text = "ExNG"; + else + this.labelTitleExNgCount.Text = "기타불량"; + + this.labelExNGCount.Text = this.ParentForm.ParentForm.CurrentWeightData.ExNGCount.ToString(); + } + else + { + if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + this.labelTitleExNgCount.Text = "Double"; + else + this.labelTitleExNgCount.Text = "이중진입"; + + this.labelExNGCount.Text = this.ParentForm.ParentForm.CurrentWeightData.DoubleEntryCount.ToString(); + } + } + private void buttonUnderRange_Click(object sender, EventArgs e) { if (this.ParentForm.ParentForm.SystemConfig1.ProductNumber >= 996 diff --git a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStart.resx b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStart.resx index 310be43..6fb1cde 100644 --- a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStart.resx +++ b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStart.resx @@ -165,86 +165,52 @@ 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 - 6ve///3d/eQ067f69a9/ffe4NKo5xjm1NvLYVJ6/ziPnWPXPf/7z9Omnn/7X6yDHSeXnPM7tpbrxzta1 - 9cd4zfxHOvdTyVLdT8bnzM3qzdQye5H5VH7WWGf52Pn4S7/97W//73HLc+VxpbrxzqW1+d12v//Z/Ea+ - qu7n//o3uZjVXOUmx6jHnstQHWvea5eW5zaT2acv1Y2vuUljnMBV7blqlXDtqdp4+XZLdeOdPWvnnKbJ - rFpumMuNt2uM6/H/+te//muujlfHOVdZX8+b26k8bj7XNMc5l3rOf/zjH/+vOc5cqs6Xx5Pqxjtb117K - 0ZyhWltjlyrrs27OXh2rcpW53F5TuazHXqo6fp1r8pzb83Nze6luvHNpbXJxqebfd1Xdf8jGOHOpWt+5 - VLVOZp+mVDe+5uqNcf5Az01GAtOt61Rg846sQnaOK8bPh1Q33tm6Nm/YqqpxzZW0qvkNXbKWWttIl5nf - +rFa5T3HvzSfhju1bNrn10yN1R+hcxs/t5Hqxjtb165dMc6nB6n8rLUZTyUnuZ+a/4gv1Z7aZbNylaxn - fk1ldX5sp6ruZ/2y5vXc1p7//vesrd9zstLNR1U3t1THq/0utXbs5Lvyee7511TVfZl9mvb+Hq7aGCck - 1SBkc84GnMrPLVeOE9RUjtPN83xKdeOdrWvTSKbmJiKqueg+LusazTnzlfdsvPPj11Tel83ucr4aku5N - ZjXz8yZf67vz5bZS3Xhnz9pOZXf+vVd2Kx/z7XMqe/NevDVX3WM7VXW/znVu3Of13FaqG+/sWVu/5+yT - NZb+oH7nNZ/K7eRtzbw+93Os1FrG6zVStWWfnlXV/XpumX1aUt34mqs0xvnjXJthqpqNvDtbjp+7mrZ1 - Q+X5kurGO1vX1nd1l01p12jOG29t4Lk9XyXOR31Zm422rkjkZzKfYy7fGOa1UZVzmedKvR7yXKn5nEqd - 2zxX6+sPBY8n1Y139qztVB7n/XOZj/n2OZW9+ViVq71XjC9VHb/LMo8n1Y139qydvxZW+2Jla1lr41WZ - r9zUfpdaZijPk7FU8pvHVE6zd9cnJeVS1TqZfZpS3fiaB2+MK1yphKM2w4S0gpoXwtxEXGoE6hgQqW68 - s3XtWta6ja7Gkue8sVs2vl3Tm7Vz5tMcz2syP1eX+TrH+kOS51s+Vx2n3ozOY/k5r+X2Ut14Z8/apeQy - lYzM48s8p+arW7P5okVlL2/0ai4/k6mtKqupvBa6Nd0nM/PamuP2Ut14Z8/aylaq9q1kpXJYOUjNj0se - Ustc1PoaT+U5sg9n381zVCX71QQv9/I0yPUaSMnscaW68TUP3hgnSAnKvKlG1TyWNQnO8t1ZqRdMwtbN - 83xKdeOdrWsra10Wq+r+cuPNJr7M+5pu7bzxZzNOZWNerptfD7W5Z2PPZp+xnE/V3DDXuE368aW68c6e - tUuVj+XvvLKWLOX+uao1UdmrWmumt0jNx15Ta+fq1nEbe/7737q23uSnkaymdPmpXVTNY7WvVTOd+7HM - fip5q701lefrnqcuYtS5pLpPDdfI7NO09/dw9X98V6q6uTW1GSfoFfpz5maAb69UN97Zuraylo1tHk+m - UtlIa6w2v3zSkcfdVzbmvImsqo26NvZUcl3Neh6TyvNnrL7+MVc29LWr0fk5j3N7qW68s2ftrPKZLCzf - 6NVcspT7qb1XjOd83re656x9PMfP89XzzGvrfLi9VDfe2bK2muJU9qxqQFPzvhdV8+Mrk7U3L6v2u1Tl - vbtot6bOKbdTMntcqW58zYM2xs9SFdxZBX9rCeHzIdWNd7aurawtM5T7qTmfNXauMc5mnUpz0s1n45yv - SiyvXuR+zdf3lfO41HyOadxzv9T4LMfKY5fPwe2luvHOnrUlzURlrxqDWWU3ecj9+fY5c/aWmZsl16k0 - CN18bKk8XzUZW86P60t1451za5Of+U39vC8lH7Xv5Wdd7KqajzFXHjcfI9U1xve1pWT26Up142setDGu - d0/3sfWPdgKXml8IPF9S3Xhn69r6mK2a0HPjy423k7nUuQ0yx8wfiLUrGGly5px32c/r5tx5RNZnjdfM - 40t14509ayN5qcZ0LXeV3Zqfb5/TZa9rkM81xnUFcDle1r5itOX8uL5UN945tza/1zS9eQOX28v55CT5 - mXuCqrpfjXXlMrmrucpN7YsPUbnSnOMuyewxpLrxNTf7KsVD6TZoni+pbryzdW02uFQ27PoDnp919WLO - W21+XUNazULlNJt/Po679PFdHnMp0132a2xet1RN+qUGmutLdeOdPWuTu2pK87MyvFTZrT/c8+1Z8pq1 - 9cary17lamt1+c55ZjzHmuU1U+NbL5pwXaluvHNpbfKa3339/i/tj1W5nTykaq+ubKaZznyOl0p26rHZ - h+d8zerx+dnNR863zkVmjyfVja958Ma4Qrm18s6vO86aboPm+ZLqxjt71tZViNpE6yPpZUaXG2+NVWOy - VjlerjzMxypV3Vzpsl9jtTl35jXz8bi9VDfe2bo2mao3cOea4qjsJhO5v7W67HVXjDtVuV2Pjfo05lyl - 2Tn3n4fbSXXjna1rKx+VxzVV1RSn6vu/ycf8prCOWftd6tzxsy61ZX+U2WNKdeNrHrwxzmaZgF2S8KQu - vSCWug2a50uqG+/sWZvNrHJZ1W1yy423rjansn6ZzcxnbTUv9bhZ1XJ8Vlfx5vOp18OW6p6X20p1452t - aysD+aN96Q9yZbf23WRiTV0ByzG7fTe3u8ctVc2PrfG8JtLszOed23nuanbqXHlcqW68s3XtMo9rsi45 - qT10eUU2mckFjIzXMZOxzKXOHb+yWOvXyOxxpbrxNY/2VYpzL4iMPUstj8e3y57f8Z61Wy033tow0xQv - 186ymaa6zFctxy+p10o3V7Zu/Fxfqhvv7Fl76aPosrURWaqc5fE1NjcKmb9kPsfcT9VVv04uslR189zW - nt/D1rV785gMnctMLPfn1Lnjb90fZfa49v4+nmRjnAYiIb2v5fH4dkl14509a7dabrz5KDuVr0rMVxGW - 6qsa3deHqnLsS+bvu9VmPR9rKeeZ8tp4fKluvLNn7VbJT2prI1IqZ3l8jVWu9h4r6njn3kzW6yqNdzfP - baW68c7WtZXH+grEJef215J1qdrvUucyunV/lNnjSnXja55kYwznpLrxzp61Wy033mzW9RFaNsRsnJnL - Jpmf+Yi7vq+c+e7q3p6aN/DarLfUpY2f60t14509a7e6775bOcvjayx5Sm29Yjx//J3XQB6Xymsjr5Ec - r9TrKTU/jseT6sY7W9dWHrfWnL81y/05lfwt15XKca1fI7PHlerG1zxaY5yQJawJVzcPa/bkcc/arSq7 - y80v9zNem+dcGc/muXbFI5v5VvMV4zznvDmf0zXk3FaqG+/sWbvVfffdrM/j5gwli13O1mT9fMzkOMed - G4qqjOUN5px1HleqG+9sXZv9cN7bLtlyxXjpUt5r397SzMrsMaW68TWP1hjDfe3J4561cG178rhnLVzb - njzuWQvXtjePmxrjr7/++vTKK6+0c3BLL7300umbb75p5zqyy1MhuxyV7HJUe7Mbmxrjv//976fvfe97 - 7RzcUj5K++KLL9q5juzyVMguRyW7HNXe7Mamxvijjz46vfXWW+0c3NKbb755+vjjj9u5juzyVMguRyW7 - HNXe7Mamxvidd945ffjhh+0c3NIHH3xwevfdd9u5juzyVMguRyW7HNXe7Mamxjjf0fjyyy9PP/zhD9t5 - uIXk76uvvjq9/PLL7XxHdnkKZJejkl2O6j7ZjU2Ncbz99tt3/zMlvlDPY0jukr/ksJs/R3Z5TLLLUcku - R/Us2d3cGMdvfvOb0/vvv3968cUX23m4hu985zt3uUv+uvktZJfHILsclexyVM+a3V2NccKdJ8sXmX/0 - ox+1a+Ahvf7663f/kON3v/vdM22ussutyS5HJbsc1UNkd1djXPKv/D777LO7L9fn9muvvXb67ne/266F - PZKj5Cm5Sr6Ss4f8182yy7XILkcluxzVNbJ7r8Y48uX6/MvTvBP8/PPPT//5z3/u/t9FlHqWSo6Sp+Qq - +UrOuvw9C9lV1yjZVUct2VVHrWtk996NMQAAfJtojAEAYNAYAwDAoDEGAIBBYwwAAIPGGAAABo0xAAAM - GmMAABg0xgAAMGiMAQDghRdO/wuxCMi7JVPcjwAAAABJRU5ErkJggg== + 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOxAAADsQBlSsOGwAACoNJREFUeF7t3cur1fUa + x/Hzl3hBMy2hQsIuG2miOzInBWUOKgtTBMFRJGoTI0En5UDMkCSEIBMEs8QCCaOiGpSDTUYRe2CESGTY + Fek5z3fB5uyz+5691339Tr4GLwielejgA+99+a31r3nz5gUAANzohDEAACRhDAAASRgDAEASxgAAkIQx + AAAkYQwAAEkYAwBAEsYAAJCEMQAAJGEMAABJGAMAQBLGAACQhDEAACRhDAAASRgDAEASxgAAkIQxAAAk + YQwAAEkYAwBAEsYAAJCEMQAAJGEMAABJGAMAQBLGAACQhDEAACRhDAAASRgDAEASxgAAkIQxAAAkYQwA + AEkYAwBAEsYAAJCEMQAAJGEMAABJGAMAQBLGAACQhDEAACRhDAAASRgDAEASxgAAkIQxAAAkYQwAAEkY + AwBAEsYAAJCEMQAAJGEMAABJGAMAQBLGAACQhDEAACRhDAAASRgDAEASxgAAkIQxAAAkYQwAAEkYAwBA + EsYAAJCEMQAAJGEMAABJGAMAQBLGAACQhDEAACRhDAAASRgDAEASxgAAkIQxAAAkYQwAAEkYAwBAEsYA + AJCEMQAAJGEMAABJGAMAQBLGAACQhDEAACRhDAAASRgDAEASxgAAkIQxAAAkYQwAAEkYAwBAEsYAAJCE + MQAAJGEMAABJGAMAQBLGAACQhDEAACRhDAAASRgDAEASxgAAkIQxAAAkYQwAAEkYAwBAEsYAAJCEMQAA + JGEMAABJGAMAQBLGAACQhDEAACRhDAAASRgDAEASxgAAkIQxAAAkYQwAAEkYAwBAEsYAAJCEMQAAJGEM + AABJGAMAQBLGAACQhDEAACRhDAAASRgDAEASxgAAkIQxAAAkYQwAAEkYAwBAEsYAAJCEMQAAJGEMAABJ + GAMAQBLGAACQhDEAACRhDAAASRgDAEASxgAAkIQxAAAkYQwAAEkYAwBAEsYAAJCEMQAAJGEMAABJGAMA + QBLGAACQhDEAACRhDAAASRgDAEASxgAAkIQxAAAkYQwAAEkYAwBAEsYAAJCEMQAAJGEMAABJGAMAQBLG + AACQhDEAACRhDAAASRgDAEASxgAAkIQxAAAkYQwAAEkYAwBAEsYAAJCEMQAAJGEMAABJGAMAQBLGAACQ + hDEAACRhDAAASRgDAEASxgAAkIQxAAAkYQwAAEkYAwBAEsYAAJCEMQAAJGEMAABJGAMAQBLGAACQhhrG + ixcvjhUrVsTY2BjcMG677baYP39+dRNNYp/ciOwTmmsU+xxoGJd/1O7du+PMmTMxOTkZ169fj8uXL7f+ + G24UP/74Y/z6668xMTERx44di61bt8Ytt9xS3cww2SfYJzTZKPbZ9zBesGBBbNmyJT7//PPWP+ro0aOx + adOm1sgXLlxY/X/gn+7mm2+O8fHx2LFjR5w6dSp+++23eOutt2LNmjXV1w+KfcLf2Sc017D32dcwfuyx + x+LixYtx+vTpWL9+ffU1wLxYsmRJ7Ny5M/7666/W0FeuXFl9XT/ZJ7THPqG5Br3PvoTxsmXLWvX+4Ycf + xubNm6uvAf6u/O7Uvn374tq1a62vhmuv6ZV9QnfsE5prUPvsOYzLj3i++eabOHToUPUOzK38mKj8/tTx + 48dj0aJF1dd0wz6hd/YJzdXvffYUxqtXr249DPDCCy9U70Bnjhw5EufOnWv9TlXt3gn7hP6yT2iufu2z + 6zBetWpVXLlyJXbt2lW9A905fPhwnD17tqeHbewTBsM+obn6sc+uwnjp0qWtH//s2bOnegd6U55GLwOv + 3eZinzBY9gnN1cs+i67CuDwo8Morr1RvQO/KU7fliduNGzdW77OxTxgs+4Tm6mWfRcdhvGHDhjh//nz1 + BvTPE088EZcuXWo9tV6719gnDId9QnN1s88pHYVxefPxr7/+Op555pnqHeiv8rT6Sy+9VL3NZJ8wXPYJ + zdXJPqfrKIzLJ/KUNx+v3YD+u+OOO+Lq1auxfPny6n06+4Thsk9ork72OV1HYfzJJ5/4RB4YsvIgwe7d + u6u36ewThs8+obna3ed0bYfxvffe2/pl5vJJI7U7MBjr1q2LL774onqbYp8wGvYJzdXOPmdqO4xLcZfy + rt2Awfr+++9n/Tx4+4TRsU9orrn2OVPbYfzuu+96aABG5OTJk7Ft27bqrbBPGB37hOaaa58ztR3G5W0v + 7rrrruoNGKy9e/fGwYMHq7fCPmF07BOaa659ztRWGC9evNjvR8EIle82le861W72CaNln9Bcs+2zpq0w + vvPOO+OHH36o3oDBe/jhh+PTTz+t3uwTRss+oblm22dNW2F83333xbffflu9AYM3Pj4eExMT1Zt9wmjZ + JzTXbPusaSuMx8bGYnJysnoDBm/t2rVx4cKF6s0+YbTsE5prtn3WtBXG5dNDrly5Ur0Bg/fII4/Exx9/ + XL3ZJ4yWfUJzzbbPmrbCuHzG+59//hmLFi2q3oHB2r59e5w4caJ6s08YLfuE5pptnzVthXHx1VdfxerV + q6s3YLAOHDgQ+/fvr94K+4TRsU9orrn2OVPbYXzs2LHYsWNH9QYM1rlz5+Lxxx+v3gr7hNGxT2iuufY5 + U9thvHXr1jh16lT1BgxOeR/UP/74I5YtW1a9F/YJo2Gf0Fzt7HOmtsO4/KG//PJLLF26tHoHBmPz5s3x + zjvvVG9T7BNGwz6hudrZ50xth3Hx5ptvxnPPPVe9AYPx/vvvx8aNG6u36ewThs8+obna3ed0HYXx/fff + 76MtYYjWr18fFy9ebD3ZXrtPZ58wXPYJzdXJPqfrKIyLt99+O/bt21e9Af11+vTp2LJlS/VWY58wPPYJ + zdXpPqd0HMYrV66Ma9euxQMPPFC9A/3x4osvxvnz56u3/8U+YTjsE5qrm31O6TiMi2effTbeeOON6g3o + 3ZNPPhk//fRT3HPPPdX7bOwTBss+obl62WfRVRgXx48fjyNHjlRvQPfWrFkT169fb427dm+HfcJg2Cc0 + Vz/22XUYl4+3/OCDD+Lw4cPVO9C58ulYr7/+euzcubN6b5d9Qv/ZJzRXv/bZdRgXS5YsibNnz8bRo0fj + pptuqr4GaE/5ZJ7yle6uXbuq907ZJ/SPfUJz9XOfPYVxsXDhwnj11Vdbb0PTyUfuAf+xd+/euHr1ajz9 + 9NPVe7fsE3pnn9Bc/d5nz2E8pfyFLl26FIcOHYrbb7+9+hrgv5X3WSxvKVOenr377rurr+kH+4TO2Sc0 + 16D22bcwLsrHXr788svx888/x2uvvRYPPvhg9XVwIys/Ni3vrfjee++13ny8m/dZ7IZ9wtzsE5prGPvs + axhPufXWW+P555+PL7/8Mi5fvhwnT55sfat706ZN8dBDD8X4+HiMjY3BP9qqVati7dq18eijj8b27dvj + wIEDra9sf//999ZXuU899VTHn8jTD/YJ9glNNsp9DiSMp1uxYkVs27YtDh48GGfOnInPPvssJiYmYnJy + Ev7Rvvvuu7hw4UJ89NFHceLEidi/f39s2LCh9dBNbSujYJ/cqOwTmmuU+xx4GAMAwP8DYQwAAEkYAwBA + EsYAAJCEMQAAJGEMAABJGAMAQBLGAACQhDEAACRhDAAA8+bFvwGW/Kgli4R5mgAAAABJRU5ErkJggg== diff --git a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStopDataStatistics.Designer.cs b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStopDataStatistics.Designer.cs index e32fb79..54c8997 100644 --- a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStopDataStatistics.Designer.cs +++ b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStopDataStatistics.Designer.cs @@ -35,7 +35,7 @@ this.labelPassAverage = new SmartX.SmartLabel(); this.labelPassSumWeight = new SmartX.SmartLabel(); this.labelOverCount = new SmartX.SmartLabel(); - this.labelExNgCount = new SmartX.SmartLabel(); + this.labelExNGCount = new SmartX.SmartLabel(); this.labelUnderAverage = new SmartX.SmartLabel(); this.labelUnderSumWeight = new SmartX.SmartLabel(); this.labelTotalCount = new SmartX.SmartLabel(); @@ -45,7 +45,9 @@ this.labelUnderRange = new SmartX.SmartLabel(); this.labelOverRange = new SmartX.SmartLabel(); this.labelNgCount = new SmartX.SmartLabel(); - this.labelDoubleEntryCount = new SmartX.SmartLabel(); + this.labelTitleNgCount = new SmartX.SmartLabel(); + this.labelTitleExNGCount = new SmartX.SmartLabel(); + this.labelTitleTotalCount = new SmartX.SmartLabel(); this.SuspendLayout(); // // labelPassCount @@ -155,25 +157,26 @@ this.labelOverCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelOverCount.Wordwrap = false; // - // labelExNgCount + // labelExNGCount // - this.labelExNgCount.BackPictureBox = this.pictureBox1; - this.labelExNgCount.BackPictureBox1 = null; - this.labelExNgCount.BackPictureBox2 = null; - this.labelExNgCount.BorderColor = System.Drawing.Color.Black; - this.labelExNgCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelExNgCount.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.labelExNgCount.ForeColor = System.Drawing.Color.White; - this.labelExNgCount.InitVisible = true; - this.labelExNgCount.LineSpacing = 0F; - this.labelExNgCount.Location = new System.Drawing.Point(424, 175); - this.labelExNgCount.Name = "labelExNgCount"; - this.labelExNgCount.Size = new System.Drawing.Size(95, 30); - this.labelExNgCount.TabIndex = 26; - this.labelExNgCount.Text = "234567890"; - this.labelExNgCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; - this.labelExNgCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelExNgCount.Wordwrap = false; + this.labelExNGCount.BackPictureBox = this.pictureBox1; + this.labelExNGCount.BackPictureBox1 = null; + this.labelExNGCount.BackPictureBox2 = null; + this.labelExNGCount.BorderColor = System.Drawing.Color.Black; + this.labelExNGCount.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelExNGCount.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Bold); + this.labelExNGCount.ForeColor = System.Drawing.Color.White; + this.labelExNGCount.InitVisible = true; + this.labelExNGCount.LineSpacing = 0F; + this.labelExNGCount.Location = new System.Drawing.Point(340, 175); + this.labelExNGCount.Name = "labelExNGCount"; + this.labelExNGCount.Size = new System.Drawing.Size(115, 30); + this.labelExNGCount.TabIndex = 26; + this.labelExNGCount.Text = "234567890"; + this.labelExNGCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; + this.labelExNGCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelExNGCount.Wordwrap = false; + this.labelExNGCount.Click += new System.EventHandler(this.labelTitleExNGCount_Click); // // labelUnderAverage // @@ -222,13 +225,13 @@ this.labelTotalCount.BackPictureBox2 = null; this.labelTotalCount.BorderColor = System.Drawing.Color.Black; this.labelTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTotalCount.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.labelTotalCount.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Bold); this.labelTotalCount.ForeColor = System.Drawing.Color.White; this.labelTotalCount.InitVisible = true; this.labelTotalCount.LineSpacing = 0F; - this.labelTotalCount.Location = new System.Drawing.Point(599, 175); + this.labelTotalCount.Location = new System.Drawing.Point(573, 175); this.labelTotalCount.Name = "labelTotalCount"; - this.labelTotalCount.Size = new System.Drawing.Size(95, 30); + this.labelTotalCount.Size = new System.Drawing.Size(115, 30); this.labelTotalCount.TabIndex = 17; this.labelTotalCount.Text = "234567890"; this.labelTotalCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; @@ -342,51 +345,94 @@ this.labelNgCount.BackPictureBox2 = null; this.labelNgCount.BorderColor = System.Drawing.Color.Black; this.labelNgCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelNgCount.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.labelNgCount.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Bold); this.labelNgCount.ForeColor = System.Drawing.Color.White; this.labelNgCount.InitVisible = true; this.labelNgCount.LineSpacing = 0F; - this.labelNgCount.Location = new System.Drawing.Point(74, 175); + this.labelNgCount.Location = new System.Drawing.Point(107, 175); this.labelNgCount.Name = "labelNgCount"; - this.labelNgCount.Size = new System.Drawing.Size(95, 30); + this.labelNgCount.Size = new System.Drawing.Size(115, 30); this.labelNgCount.TabIndex = 33; this.labelNgCount.Text = "234567890"; this.labelNgCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; this.labelNgCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelNgCount.Wordwrap = false; // - // labelDoubleEntryCount + // labelTitleNgCount // - this.labelDoubleEntryCount.BackPictureBox = this.pictureBox1; - this.labelDoubleEntryCount.BackPictureBox1 = null; - this.labelDoubleEntryCount.BackPictureBox2 = null; - this.labelDoubleEntryCount.BorderColor = System.Drawing.Color.Black; - this.labelDoubleEntryCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelDoubleEntryCount.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.labelDoubleEntryCount.ForeColor = System.Drawing.Color.White; - this.labelDoubleEntryCount.InitVisible = true; - this.labelDoubleEntryCount.LineSpacing = 0F; - this.labelDoubleEntryCount.Location = new System.Drawing.Point(249, 175); - this.labelDoubleEntryCount.Name = "labelDoubleEntryCount"; - this.labelDoubleEntryCount.Size = new System.Drawing.Size(95, 30); - this.labelDoubleEntryCount.TabIndex = 35; - this.labelDoubleEntryCount.Text = "234567890"; - this.labelDoubleEntryCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; - this.labelDoubleEntryCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelDoubleEntryCount.Wordwrap = false; + this.labelTitleNgCount.BackPictureBox = this.pictureBox1; + this.labelTitleNgCount.BackPictureBox1 = null; + this.labelTitleNgCount.BackPictureBox2 = null; + this.labelTitleNgCount.BorderColor = System.Drawing.Color.Black; + this.labelTitleNgCount.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleNgCount.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleNgCount.ForeColor = System.Drawing.Color.White; + this.labelTitleNgCount.InitVisible = true; + this.labelTitleNgCount.LineSpacing = 0F; + this.labelTitleNgCount.Location = new System.Drawing.Point(21, 175); + this.labelTitleNgCount.Name = "labelTitleNgCount"; + this.labelTitleNgCount.Size = new System.Drawing.Size(80, 30); + this.labelTitleNgCount.TabIndex = 37; + this.labelTitleNgCount.Text = "불량"; + this.labelTitleNgCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleNgCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleNgCount.Wordwrap = false; + // + // labelTitleExNGCount + // + this.labelTitleExNGCount.BackPictureBox = this.pictureBox1; + this.labelTitleExNGCount.BackPictureBox1 = null; + this.labelTitleExNGCount.BackPictureBox2 = null; + this.labelTitleExNGCount.BorderColor = System.Drawing.Color.Black; + this.labelTitleExNGCount.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleExNGCount.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleExNGCount.ForeColor = System.Drawing.Color.White; + this.labelTitleExNGCount.InitVisible = true; + this.labelTitleExNGCount.LineSpacing = 0F; + this.labelTitleExNGCount.Location = new System.Drawing.Point(254, 175); + this.labelTitleExNGCount.Name = "labelTitleExNGCount"; + this.labelTitleExNGCount.Size = new System.Drawing.Size(80, 30); + this.labelTitleExNGCount.TabIndex = 38; + this.labelTitleExNGCount.Text = "기타불량"; + this.labelTitleExNGCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleExNGCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleExNGCount.Wordwrap = false; + this.labelTitleExNGCount.Click += new System.EventHandler(this.labelTitleExNGCount_Click); + // + // labelTitleTotalCount + // + this.labelTitleTotalCount.BackPictureBox = this.pictureBox1; + this.labelTitleTotalCount.BackPictureBox1 = null; + this.labelTitleTotalCount.BackPictureBox2 = null; + this.labelTitleTotalCount.BorderColor = System.Drawing.Color.Black; + this.labelTitleTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleTotalCount.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.labelTitleTotalCount.ForeColor = System.Drawing.Color.White; + this.labelTitleTotalCount.InitVisible = true; + this.labelTitleTotalCount.LineSpacing = 0F; + this.labelTitleTotalCount.Location = new System.Drawing.Point(487, 175); + this.labelTitleTotalCount.Name = "labelTitleTotalCount"; + this.labelTitleTotalCount.Size = new System.Drawing.Size(80, 30); + this.labelTitleTotalCount.TabIndex = 39; + this.labelTitleTotalCount.Text = "총계"; + this.labelTitleTotalCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleTotalCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleTotalCount.Wordwrap = false; // // ControlMainDisplayStopDataStatistics // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.Controls.Add(this.labelDoubleEntryCount); + this.Controls.Add(this.labelTitleTotalCount); + this.Controls.Add(this.labelTitleExNGCount); + this.Controls.Add(this.labelTitleNgCount); this.Controls.Add(this.labelNgCount); this.Controls.Add(this.labelPassCount); this.Controls.Add(this.labelUnderCount); this.Controls.Add(this.labelPassAverage); this.Controls.Add(this.labelPassSumWeight); this.Controls.Add(this.labelOverCount); - this.Controls.Add(this.labelExNgCount); + this.Controls.Add(this.labelExNGCount); this.Controls.Add(this.labelUnderAverage); this.Controls.Add(this.labelUnderSumWeight); this.Controls.Add(this.labelTotalCount); @@ -409,7 +455,7 @@ private SmartX.SmartLabel labelPassAverage; private SmartX.SmartLabel labelPassSumWeight; private SmartX.SmartLabel labelOverCount; - private SmartX.SmartLabel labelExNgCount; + private SmartX.SmartLabel labelExNGCount; private SmartX.SmartLabel labelUnderAverage; private SmartX.SmartLabel labelUnderSumWeight; private SmartX.SmartLabel labelTotalCount; @@ -420,7 +466,9 @@ private SmartX.SmartLabel labelOverRange; private SmartX.SmartLabel labelNgCount; private System.Windows.Forms.PictureBox pictureBox1; - private SmartX.SmartLabel labelDoubleEntryCount; + private SmartX.SmartLabel labelTitleNgCount; + private SmartX.SmartLabel labelTitleExNGCount; + private SmartX.SmartLabel labelTitleTotalCount; } } diff --git a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStopDataStatistics.cs b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStopDataStatistics.cs index 9f97f51..6b1f29e 100644 --- a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStopDataStatistics.cs +++ b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStopDataStatistics.cs @@ -46,6 +46,10 @@ namespace ITC81DB_0H.Controls if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) { this.pictureBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.engMainStatScreen)); + + this.labelTitleNgCount.Text = "NG"; + this.labelTitleExNGCount.Text = "ExNG"; + this.labelTitleTotalCount.Text = "Total"; } else if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.Chinese) { @@ -65,6 +69,10 @@ namespace ITC81DB_0H.Controls else { this.pictureBox1.Image = new Bitmap(images.GetImage(Class1.ButtonImages.korMainStatScreen)); + + this.labelTitleNgCount.Text = "불량"; + this.labelTitleExNGCount.Text = "기타불량"; + this.labelTitleTotalCount.Text = "총계"; } } private void DefaultSetting() @@ -124,12 +132,8 @@ namespace ITC81DB_0H.Controls this.labelNgCount.Text = value; value = data.ExNGCount.ToString(); - if (this.labelExNgCount.Text != value) - this.labelExNgCount.Text = value; - - value = data.DoubleEntryCount.ToString(); - if (this.labelDoubleEntryCount.Text != value) - this.labelDoubleEntryCount.Text = value; + if (this.labelExNGCount.Text != value) + this.labelExNGCount.Text = value; value = data.TotalCount.ToString(); if (this.labelTotalCount.Text != value) @@ -209,5 +213,29 @@ namespace ITC81DB_0H.Controls this.SetCount(this.ParentForm.ParentForm.CurrentWeightData); } #endregion + + #region Event Handler + private void labelTitleExNGCount_Click(object sender, EventArgs e) + { + if (this.labelTitleExNGCount.Text == "Double" || this.labelTitleExNGCount.Text == "이중진입") + { + if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + this.labelTitleExNGCount.Text = "ExNG"; + else + this.labelTitleExNGCount.Text = "기타불량"; + + this.labelExNGCount.Text = this.ParentForm.ParentForm.CurrentWeightData.ExNGCount.ToString(); + } + else + { + if (this.ParentForm.ParentForm.SystemConfig1.Language == DataStore.LanguageID.English) + this.labelTitleExNGCount.Text = "Double"; + else + this.labelTitleExNGCount.Text = "이중진입"; + + this.labelExNGCount.Text = this.ParentForm.ParentForm.CurrentWeightData.DoubleEntryCount.ToString(); + } + } + #endregion } } diff --git a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStopDataStatistics.resx b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStopDataStatistics.resx index 416b7e1..1d82577 100644 --- a/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStopDataStatistics.resx +++ b/ITC81DB_0H/Controls/MainDisplay/ControlMainDisplayStopDataStatistics.resx @@ -165,192 +165,161 @@ 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 - AAB33TX8f6ItV5N99u+tAAAAAElFTkSuQmCC + 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 diff --git a/ITC81DB_0H/bin/Release/ITC81DB_2H.exe b/ITC81DB_0H/bin/Release/ITC81DB_2H.exe index c7f3fcd..2d1fe48 100644 Binary files a/ITC81DB_0H/bin/Release/ITC81DB_2H.exe and b/ITC81DB_0H/bin/Release/ITC81DB_2H.exe differ diff --git a/ITC81DB_0H/bin/Release/ITC81DB_2H_ImageDll.dll b/ITC81DB_0H/bin/Release/ITC81DB_2H_ImageDll.dll index 42cfcf0..5c37b04 100644 Binary files a/ITC81DB_0H/bin/Release/ITC81DB_2H_ImageDll.dll and b/ITC81DB_0H/bin/Release/ITC81DB_2H_ImageDll.dll differ diff --git a/ITC81DB_0H/obj/Release/ITC81DB_2H.exe b/ITC81DB_0H/obj/Release/ITC81DB_2H.exe index c7f3fcd..2d1fe48 100644 Binary files a/ITC81DB_0H/obj/Release/ITC81DB_2H.exe and b/ITC81DB_0H/obj/Release/ITC81DB_2H.exe differ diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/Class1.cs b/ITC81DB_ImageDll/ITC81DB_ImageDll/Class1.cs index c51a6fd..0a7448a 100644 --- a/ITC81DB_ImageDll/ITC81DB_ImageDll/Class1.cs +++ b/ITC81DB_ImageDll/ITC81DB_ImageDll/Class1.cs @@ -1651,9 +1651,6 @@ namespace ITC81DB_2H_ImageDll case ButtonImages.chnMainStatScreen: bt = new Bitmap(Resource1.chnMainStatScreen); break; - case ButtonImages.chnMainStopScreen: - bt = new Bitmap(Resource1.chnMainStopScreen); - break; case ButtonImages.chnMainWeightUp: bt = new Bitmap(Resource1.chnMainWeightUp); break; @@ -2248,9 +2245,6 @@ namespace ITC81DB_2H_ImageDll case ButtonImages.engMainRunPassUp: bt = new Bitmap(Resource1.engMainRunPassUp); break; - case ButtonImages.engMainStopScreen: - bt = new Bitmap(Resource1.engMainStopScreen); - break; case ButtonImages.engMainRunTareDisable: bt = new Bitmap(Resource1.engMainRunTareDisable); break; @@ -2917,9 +2911,6 @@ namespace ITC81DB_2H_ImageDll case ButtonImages.gerMainStatScreen: bt = new Bitmap(Resource1.gerMainStatScreen); break; - case ButtonImages.gerMainStopScreen: - bt = new Bitmap(Resource1.gerMainStopScreen); - break; case ButtonImages.gerOFF: bt = new Bitmap(Resource1.gerOFF); break; @@ -3517,9 +3508,6 @@ namespace ITC81DB_2H_ImageDll case ButtonImages.korMainRunPassUp: bt = new Bitmap(Resource1.korMainRunPassUp); break; - case ButtonImages.korMainStopScreen: - bt = new Bitmap(Resource1.korMainStopScreen); - break; case ButtonImages.korMainRunTareDisable: bt = new Bitmap(Resource1.korMainRunTareDisable); break; @@ -4123,9 +4111,6 @@ namespace ITC81DB_2H_ImageDll case ButtonImages.rusMainStatScreen: bt = new Bitmap(Resource1.rusMainStatScreen); break; - case ButtonImages.rusMainStopScreen: - bt = new Bitmap(Resource1.rusMainStopScreen); - break; case ButtonImages.rusOFF: bt = new Bitmap(Resource1.rusOFF); break; diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/ITC81DB_2H_ImageDll.csproj b/ITC81DB_ImageDll/ITC81DB_ImageDll/ITC81DB_2H_ImageDll.csproj index c129142..34ca791 100644 --- a/ITC81DB_ImageDll/ITC81DB_ImageDll/ITC81DB_2H_ImageDll.csproj +++ b/ITC81DB_ImageDll/ITC81DB_ImageDll/ITC81DB_2H_ImageDll.csproj @@ -3262,12 +3262,6 @@ - - - - - - @@ -3277,6 +3271,12 @@ + + + + + + diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resource1.Designer.cs b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resource1.Designer.cs index 1f879df..c6d8585 100644 --- a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resource1.Designer.cs +++ b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resource1.Designer.cs @@ -1387,13 +1387,6 @@ namespace ITC81DB_2H_ImageDll { } } - internal static System.Drawing.Bitmap chnMainStopScreen { - get { - object obj = ResourceManager.GetObject("chnMainStopScreen", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - internal static System.Drawing.Bitmap chnMainWeightUp { get { object obj = ResourceManager.GetObject("chnMainWeightUp", resourceCulture); @@ -2843,13 +2836,6 @@ namespace ITC81DB_2H_ImageDll { } } - internal static System.Drawing.Bitmap engMainStopScreen { - get { - object obj = ResourceManager.GetObject("engMainStopScreen", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - internal static System.Drawing.Bitmap engNumKeypadCancelDown { get { object obj = ResourceManager.GetObject("engNumKeypadCancelDown", resourceCulture); @@ -4376,13 +4362,6 @@ namespace ITC81DB_2H_ImageDll { } } - internal static System.Drawing.Bitmap gerMainStopScreen { - get { - object obj = ResourceManager.GetObject("gerMainStopScreen", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - internal static System.Drawing.Bitmap gerOFF { get { object obj = ResourceManager.GetObject("gerOFF", resourceCulture); @@ -5839,13 +5818,6 @@ namespace ITC81DB_2H_ImageDll { } } - internal static System.Drawing.Bitmap korMainStopScreen { - get { - object obj = ResourceManager.GetObject("korMainStopScreen", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - internal static System.Drawing.Bitmap korNumKeypadCancelDown { get { object obj = ResourceManager.GetObject("korNumKeypadCancelDown", resourceCulture); @@ -7225,13 +7197,6 @@ namespace ITC81DB_2H_ImageDll { } } - internal static System.Drawing.Bitmap rusMainStopScreen { - get { - object obj = ResourceManager.GetObject("rusMainStopScreen", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - internal static System.Drawing.Bitmap rusOFF { get { object obj = ResourceManager.GetObject("rusOFF", resourceCulture); diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resource1.resx b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resource1.resx index a813046..976dcb2 100644 --- a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resource1.resx +++ b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resource1.resx @@ -520,9 +520,6 @@ Resources\korMainStatScreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Resources\korMainStopScreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Resources\korNumKeypadCancelDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -961,9 +958,6 @@ Resources\engMainStatScreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Resources\engMainStopScreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Resources\engNumKeypadCancelDown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -1585,9 +1579,6 @@ Resources\gerMainStatScreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Resources\gerMainStopScreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Resources\gerOFF(80_28).png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -2380,9 +2371,6 @@ Resources\chnMainStatScreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Resources\chnMainStopScreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Resources\chnMainWeightUp.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -2992,9 +2980,6 @@ Resources\rusMainStatScreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Resources\rusMainStopScreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Resources\rusOFF.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/engMainStatScreen.png b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/engMainStatScreen.png index ca1511e..18fdb5e 100644 Binary files a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/engMainStatScreen.png and b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/engMainStatScreen.png differ diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/korMainStatScreen.png b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/korMainStatScreen.png index 48dab39..1a83930 100644 Binary files a/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/korMainStatScreen.png and b/ITC81DB_ImageDll/ITC81DB_ImageDll/Resources/korMainStatScreen.png differ diff --git a/ITC81DB_ImageDll/ITC81DB_ImageDll/bin/Release/ITC81DB_2H_ImageDll.dll b/ITC81DB_ImageDll/ITC81DB_ImageDll/bin/Release/ITC81DB_2H_ImageDll.dll index 42cfcf0..5c37b04 100644 Binary files a/ITC81DB_ImageDll/ITC81DB_ImageDll/bin/Release/ITC81DB_2H_ImageDll.dll and b/ITC81DB_ImageDll/ITC81DB_ImageDll/bin/Release/ITC81DB_2H_ImageDll.dll differ