From 61ac292ffe932e26237a4dafaef7ab58a8a4c956 Mon Sep 17 00:00:00 2001 From: "DESKTOP-999R8N3\\CJY" Date: Mon, 25 Sep 2023 15:53:07 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EA=B7=B8=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DC_7C/DataStore.cs | 12 ++- .../DialogForms/DialogFormHistoryData.cs | 10 +++ .../DialogForms/DialogFormMessage.Designer.cs | 8 +- INT69DC_7C/Forms/FormCalibration.cs | 3 +- .../Forms/FormDataStatistics.Designer.cs | 43 ++++++++++ INT69DC_7C/Forms/FormDataStatistics.cs | 28 +++++-- INT69DC_7C/Forms/FormDataViewer.Designer.cs | 14 ++-- INT69DC_7C/Forms/FormDataViewer.cs | 8 +- INT69DC_7C/Forms/FormInformation.Designer.cs | 80 +++++++++---------- INT69DC_7C/Forms/FormMainDisplay.cs | 4 + INT69DC_7C/INT69DC_7C.csproj | 2 + 11 files changed, 148 insertions(+), 64 deletions(-) diff --git a/INT69DC_7C/DataStore.cs b/INT69DC_7C/DataStore.cs index 40161d8..b6bd23b 100644 --- a/INT69DC_7C/DataStore.cs +++ b/INT69DC_7C/DataStore.cs @@ -3986,13 +3986,19 @@ namespace INT69DC_7C this.PassRange = "-"; this.UnderRange = "-"; this.TareRange = "-"; + this.TotalPassCount = 0; - this.TotalOverCount = 0; - this.TotalUnderCount = 0; - this.TotalExNgCount = 0; this.TotalPassSumWeight = 0.0; + this.TotalPassAverageWeight = 0.0; + this.TotalPassVariance = 0.0; + + this.TotalOverCount = 0; this.TotalOverSumWeight = 0.0; + + this.TotalUnderCount = 0; this.TotalUnderSumWeight = 0.0; + + this.TotalExNgCount = 0; } public void Clear() diff --git a/INT69DC_7C/DialogForms/DialogFormHistoryData.cs b/INT69DC_7C/DialogForms/DialogFormHistoryData.cs index a14d01c..2a1fee6 100644 --- a/INT69DC_7C/DialogForms/DialogFormHistoryData.cs +++ b/INT69DC_7C/DialogForms/DialogFormHistoryData.cs @@ -212,6 +212,16 @@ namespace INT69DC_7C.DialogForms } this.treeView.Nodes.Add(node); } + + //try + //{ + // if (this.treeView.SelectedNode.IsSelected == true) + // this.treeView.SelectedNode.Parent.Expand(); + //} + //catch + //{ + + //} } } #endregion diff --git a/INT69DC_7C/DialogForms/DialogFormMessage.Designer.cs b/INT69DC_7C/DialogForms/DialogFormMessage.Designer.cs index b39d21b..eb3a8c8 100644 --- a/INT69DC_7C/DialogForms/DialogFormMessage.Designer.cs +++ b/INT69DC_7C/DialogForms/DialogFormMessage.Designer.cs @@ -88,7 +88,7 @@ // // labelMessage2 // - this.labelMessage2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.labelMessage2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelMessage2.Location = new System.Drawing.Point(67, 51); this.labelMessage2.Name = "labelMessage2"; this.labelMessage2.Size = new System.Drawing.Size(350, 20); @@ -96,7 +96,7 @@ // // labelMessage1 // - this.labelMessage1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.labelMessage1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelMessage1.Location = new System.Drawing.Point(67, 20); this.labelMessage1.Name = "labelMessage1"; this.labelMessage1.Size = new System.Drawing.Size(350, 20); @@ -105,7 +105,7 @@ // buttonOK // this.buttonOK.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40))))); - this.buttonOK.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.buttonOK.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.buttonOK.ForeColor = System.Drawing.Color.White; this.buttonOK.Location = new System.Drawing.Point(335, 135); this.buttonOK.Name = "buttonOK"; @@ -117,7 +117,7 @@ // // labelErrorCode // - this.labelErrorCode.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); + this.labelErrorCode.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); this.labelErrorCode.Location = new System.Drawing.Point(15, 11); this.labelErrorCode.Name = "labelErrorCode"; this.labelErrorCode.Size = new System.Drawing.Size(350, 20); diff --git a/INT69DC_7C/Forms/FormCalibration.cs b/INT69DC_7C/Forms/FormCalibration.cs index 02f7a79..a7575b9 100644 --- a/INT69DC_7C/Forms/FormCalibration.cs +++ b/INT69DC_7C/Forms/FormCalibration.cs @@ -370,11 +370,10 @@ namespace INT69DC_7C.Forms value = Helper.StringZeroFillDigits4(this.comboBoxDigit.SelectedItem.ToString()); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._3003_Digit, value); - after = value; + after = int.Parse(value).ToString(); // Part 11 if (this.ParentForm.SystemConfig.IsPart11 == true) - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.CalDigit, "", before, after); } diff --git a/INT69DC_7C/Forms/FormDataStatistics.Designer.cs b/INT69DC_7C/Forms/FormDataStatistics.Designer.cs index 6ba8103..d9cc785 100644 --- a/INT69DC_7C/Forms/FormDataStatistics.Designer.cs +++ b/INT69DC_7C/Forms/FormDataStatistics.Designer.cs @@ -301,6 +301,8 @@ this.labelTitleAllCnt = new SmartX.SmartLabel(); this.labelTitleInformation = new SmartX.SmartLabel(); this.smartGroupBox2 = new SmartX.SmartGroupBox(); + this.labelFileName = new SmartX.SmartLabel(); + this.smartLabel9 = new SmartX.SmartLabel(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.smartGroupBox2.SuspendLayout(); this.SuspendLayout(); @@ -6064,12 +6066,51 @@ this.smartGroupBox2.TabIndex = 37; this.smartGroupBox2.TextColor = System.Drawing.Color.Black; // + // labelFileName + // + this.labelFileName.BackPictureBox = this.smartForm1; + this.labelFileName.BackPictureBox1 = null; + this.labelFileName.BackPictureBox2 = null; + this.labelFileName.BorderColor = System.Drawing.Color.Black; + this.labelFileName.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelFileName.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Bold); + this.labelFileName.InitVisible = true; + this.labelFileName.LineSpacing = 0F; + this.labelFileName.Location = new System.Drawing.Point(845, 40); + this.labelFileName.Name = "labelFileName"; + this.labelFileName.Size = new System.Drawing.Size(170, 23); + this.labelFileName.TabIndex = 44; + this.labelFileName.Text = "FileName"; + this.labelFileName.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.labelFileName.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelFileName.Wordwrap = false; + // + // smartLabel9 + // + this.smartLabel9.BackPictureBox = this.smartForm1; + this.smartLabel9.BackPictureBox1 = null; + this.smartLabel9.BackPictureBox2 = null; + this.smartLabel9.BorderColor = System.Drawing.Color.Black; + this.smartLabel9.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.smartLabel9.InitVisible = true; + this.smartLabel9.LineSpacing = 0F; + this.smartLabel9.Location = new System.Drawing.Point(845, 12); + this.smartLabel9.Name = "smartLabel9"; + this.smartLabel9.Size = new System.Drawing.Size(80, 22); + this.smartLabel9.TabIndex = 43; + this.smartLabel9.Text = "FileName :"; + this.smartLabel9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; + this.smartLabel9.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel9.Wordwrap = false; + // // FormDataStatistics // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScroll = true; this.ClientSize = new System.Drawing.Size(1024, 768); + this.Controls.Add(this.labelFileName); + this.Controls.Add(this.smartLabel9); this.Controls.Add(this.buttonSave); this.Controls.Add(this.buttonFileSelect); this.Controls.Add(this.smartGroupBox2); @@ -6358,5 +6399,7 @@ private SmartX.SmartLabel labelTitleAllCnt; private SmartX.SmartLabel labelTitleInformation; private SmartX.SmartGroupBox smartGroupBox2; + private SmartX.SmartLabel labelFileName; + private SmartX.SmartLabel smartLabel9; } } \ No newline at end of file diff --git a/INT69DC_7C/Forms/FormDataStatistics.cs b/INT69DC_7C/Forms/FormDataStatistics.cs index fe30fe0..d8c8fc7 100644 --- a/INT69DC_7C/Forms/FormDataStatistics.cs +++ b/INT69DC_7C/Forms/FormDataStatistics.cs @@ -383,17 +383,25 @@ namespace INT69DC_7C.Forms } // 전체 정량 평균 - passAverageWeight = passSumWeight / passCount; - // 전체 정량 분산 - for (int i = 0; i < laneDatas.Count; i++) + if (passCount != 0) { - for (int j = 0; j < laneDatas[i].PassWeightData.Count; j++) + passAverageWeight = passSumWeight / passCount; + // 전체 정량 분산 + for (int i = 0; i < laneDatas.Count; i++) { - dValue1 = passAverageWeight - laneDatas[i].PassWeightData[j]; - dValue2 += dValue1 * dValue1; + for (int j = 0; j < laneDatas[i].PassWeightData.Count; j++) + { + dValue1 = passAverageWeight - laneDatas[i].PassWeightData[j]; + dValue2 += dValue1 * dValue1; + } } + passVariance = dValue2 / passCount; + } + else + { + passAverageWeight = 0.0; + passVariance = 0.0; } - passVariance = dValue2 / passCount; this.CurrentDataCommonList.TotalUnderCount = underCount; this.CurrentDataCommonList.TotalPassCount = passCount; @@ -605,6 +613,11 @@ namespace INT69DC_7C.Forms this.CollectionWeightData.RemoveAt(0); this.DataAnalysis(); + // File Name + string[] data = this.SelectFilePath.Split('\\'); + data = data[data.Length - 1].Split('.'); + this.labelFileName.Text = data[0]; + ret = 0; splash.Finish(); } @@ -1115,6 +1128,7 @@ namespace INT69DC_7C.Forms { this.ParentForm.SystemConfig.CurrentForm = DataStore.FormStore.FormDataStatistics; + this.labelFileName.Text = ""; this.ClearData(); this.buttonSave.Enabled = false; } diff --git a/INT69DC_7C/Forms/FormDataViewer.Designer.cs b/INT69DC_7C/Forms/FormDataViewer.Designer.cs index fe220d9..90c93c9 100644 --- a/INT69DC_7C/Forms/FormDataViewer.Designer.cs +++ b/INT69DC_7C/Forms/FormDataViewer.Designer.cs @@ -90,7 +90,7 @@ this.labelTitle.BackPictureBox2 = null; this.labelTitle.BorderColor = System.Drawing.Color.Black; this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitle.Font = new System.Drawing.Font("New Gulim", 35F, System.Drawing.FontStyle.Bold); + this.labelTitle.Font = new System.Drawing.Font("새굴림", 35F, System.Drawing.FontStyle.Bold); this.labelTitle.InitVisible = true; this.labelTitle.LineSpacing = 0F; this.labelTitle.Location = new System.Drawing.Point(3, 7); @@ -785,7 +785,7 @@ this.labelItemsCount.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelItemsCount.InitVisible = true; this.labelItemsCount.LineSpacing = 0F; - this.labelItemsCount.Location = new System.Drawing.Point(948, 14); + this.labelItemsCount.Location = new System.Drawing.Point(6, 7); this.labelItemsCount.Name = "labelItemsCount"; this.labelItemsCount.Size = new System.Drawing.Size(70, 30); this.labelItemsCount.TabIndex = 31; @@ -804,7 +804,7 @@ this.smartLabel9.BorderStyle = System.Windows.Forms.BorderStyle.None; this.smartLabel9.InitVisible = true; this.smartLabel9.LineSpacing = 0F; - this.smartLabel9.Location = new System.Drawing.Point(744, 12); + this.smartLabel9.Location = new System.Drawing.Point(845, 12); this.smartLabel9.Name = "smartLabel9"; this.smartLabel9.Size = new System.Drawing.Size(80, 22); this.smartLabel9.TabIndex = 28; @@ -820,12 +820,12 @@ this.labelFileName.BackPictureBox2 = null; this.labelFileName.BorderColor = System.Drawing.Color.Black; this.labelFileName.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelFileName.Font = new System.Drawing.Font("Arial", 14F, System.Drawing.FontStyle.Bold); + this.labelFileName.Font = new System.Drawing.Font("Arial", 13F, System.Drawing.FontStyle.Bold); this.labelFileName.InitVisible = true; this.labelFileName.LineSpacing = 0F; - this.labelFileName.Location = new System.Drawing.Point(744, 40); + this.labelFileName.Location = new System.Drawing.Point(845, 40); this.labelFileName.Name = "labelFileName"; - this.labelFileName.Size = new System.Drawing.Size(198, 23); + this.labelFileName.Size = new System.Drawing.Size(170, 23); this.labelFileName.TabIndex = 29; this.labelFileName.Text = "FileName"; this.labelFileName.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; @@ -869,7 +869,7 @@ this.labelRemainDataCount.BorderStyle = System.Windows.Forms.BorderStyle.None; this.labelRemainDataCount.InitVisible = true; this.labelRemainDataCount.LineSpacing = 0F; - this.labelRemainDataCount.Location = new System.Drawing.Point(948, 50); + this.labelRemainDataCount.Location = new System.Drawing.Point(6, 43); this.labelRemainDataCount.Name = "labelRemainDataCount"; this.labelRemainDataCount.Size = new System.Drawing.Size(70, 20); this.labelRemainDataCount.TabIndex = 32; diff --git a/INT69DC_7C/Forms/FormDataViewer.cs b/INT69DC_7C/Forms/FormDataViewer.cs index 2647e52..7ba1494 100644 --- a/INT69DC_7C/Forms/FormDataViewer.cs +++ b/INT69DC_7C/Forms/FormDataViewer.cs @@ -336,7 +336,8 @@ namespace INT69DC_7C.Forms // File Name string[] data = filePath.Split('\\'); - this.labelFileName.Text = data[data.Length - 1]; + data = data[data.Length - 1].Split('.'); + this.labelFileName.Text = data[0]; // List 갱신 this.UpdateListItemByFilter(this.ParentForm.CurrentDataViewerFilter); // 화면 표시 @@ -446,7 +447,12 @@ namespace INT69DC_7C.Forms } if (this.RemainCNT < 6) + { this.ListBoxScrollDown(); + + if (this.listBoxTime.ViewRemainCount == 0) + this.ListBoxScrollDown(20); + } else this.ListBoxScrollDown(50); } diff --git a/INT69DC_7C/Forms/FormInformation.Designer.cs b/INT69DC_7C/Forms/FormInformation.Designer.cs index ad56a82..8ad4f23 100644 --- a/INT69DC_7C/Forms/FormInformation.Designer.cs +++ b/INT69DC_7C/Forms/FormInformation.Designer.cs @@ -108,8 +108,8 @@ // tabControlSpecialFunction // this.tabControlSpecialFunction.Controls.Add(this.tabPage1); - this.tabControlSpecialFunction.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); - this.tabControlSpecialFunction.Location = new System.Drawing.Point(1095, 122); + this.tabControlSpecialFunction.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.tabControlSpecialFunction.Location = new System.Drawing.Point(1052, 122); this.tabControlSpecialFunction.Name = "tabControlSpecialFunction"; this.tabControlSpecialFunction.SelectedIndex = 0; this.tabControlSpecialFunction.Size = new System.Drawing.Size(313, 530); @@ -156,7 +156,7 @@ this.labelSub12.BackPictureBox2 = null; this.labelSub12.BorderColor = System.Drawing.Color.Black; this.labelSub12.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelSub12.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelSub12.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelSub12.InitVisible = true; this.labelSub12.LineSpacing = 0F; this.labelSub12.Location = new System.Drawing.Point(33, 454); @@ -176,7 +176,7 @@ this.labelSub11.BackPictureBox2 = null; this.labelSub11.BorderColor = System.Drawing.Color.Black; this.labelSub11.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelSub11.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelSub11.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelSub11.InitVisible = true; this.labelSub11.LineSpacing = 0F; this.labelSub11.Location = new System.Drawing.Point(33, 417); @@ -236,7 +236,7 @@ this.smartLabel28.BackPictureBox2 = null; this.smartLabel28.BorderColor = System.Drawing.Color.Black; this.smartLabel28.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel28.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel28.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.smartLabel28.InitVisible = true; this.smartLabel28.LineSpacing = 0F; this.smartLabel28.Location = new System.Drawing.Point(33, 48); @@ -316,7 +316,7 @@ this.labelSub10.BackPictureBox2 = null; this.labelSub10.BorderColor = System.Drawing.Color.Black; this.labelSub10.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelSub10.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelSub10.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelSub10.InitVisible = true; this.labelSub10.LineSpacing = 0F; this.labelSub10.Location = new System.Drawing.Point(33, 381); @@ -356,7 +356,7 @@ this.labelSub9.BackPictureBox2 = null; this.labelSub9.BorderColor = System.Drawing.Color.Black; this.labelSub9.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelSub9.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelSub9.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelSub9.InitVisible = true; this.labelSub9.LineSpacing = 0F; this.labelSub9.Location = new System.Drawing.Point(33, 344); @@ -396,7 +396,7 @@ this.labelSub8.BackPictureBox2 = null; this.labelSub8.BorderColor = System.Drawing.Color.Black; this.labelSub8.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelSub8.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelSub8.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelSub8.InitVisible = true; this.labelSub8.LineSpacing = 0F; this.labelSub8.Location = new System.Drawing.Point(33, 307); @@ -436,7 +436,7 @@ this.smartLabel49.BackPictureBox2 = null; this.smartLabel49.BorderColor = System.Drawing.Color.Black; this.smartLabel49.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel49.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel49.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.smartLabel49.InitVisible = true; this.smartLabel49.LineSpacing = 0F; this.smartLabel49.Location = new System.Drawing.Point(33, 270); @@ -476,7 +476,7 @@ this.smartLabel51.BackPictureBox2 = null; this.smartLabel51.BorderColor = System.Drawing.Color.Black; this.smartLabel51.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel51.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel51.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.smartLabel51.InitVisible = true; this.smartLabel51.LineSpacing = 0F; this.smartLabel51.Location = new System.Drawing.Point(33, 233); @@ -516,7 +516,7 @@ this.smartLabel56.BackPictureBox2 = null; this.smartLabel56.BorderColor = System.Drawing.Color.Black; this.smartLabel56.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel56.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel56.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.smartLabel56.InitVisible = true; this.smartLabel56.LineSpacing = 0F; this.smartLabel56.Location = new System.Drawing.Point(33, 196); @@ -556,7 +556,7 @@ this.smartLabel61.BackPictureBox2 = null; this.smartLabel61.BorderColor = System.Drawing.Color.Black; this.smartLabel61.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel61.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel61.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.smartLabel61.InitVisible = true; this.smartLabel61.LineSpacing = 0F; this.smartLabel61.Location = new System.Drawing.Point(33, 159); @@ -576,7 +576,7 @@ this.smartLabel62.BackPictureBox2 = null; this.smartLabel62.BorderColor = System.Drawing.Color.Black; this.smartLabel62.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel62.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel62.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.smartLabel62.InitVisible = true; this.smartLabel62.LineSpacing = 0F; this.smartLabel62.Location = new System.Drawing.Point(33, 85); @@ -616,7 +616,7 @@ this.smartLabel67.BackPictureBox2 = null; this.smartLabel67.BorderColor = System.Drawing.Color.Black; this.smartLabel67.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel67.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel67.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.smartLabel67.InitVisible = true; this.smartLabel67.LineSpacing = 0F; this.smartLabel67.Location = new System.Drawing.Point(33, 122); @@ -630,7 +630,7 @@ // // buttonSubBoardVersion // - this.buttonSubBoardVersion.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); + this.buttonSubBoardVersion.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); this.buttonSubBoardVersion.Location = new System.Drawing.Point(153, 13); this.buttonSubBoardVersion.Name = "buttonSubBoardVersion"; this.buttonSubBoardVersion.Size = new System.Drawing.Size(100, 30); @@ -691,7 +691,7 @@ this.labelInfo2.BackPictureBox2 = null; this.labelInfo2.BorderColor = System.Drawing.Color.Black; this.labelInfo2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelInfo2.Font = new System.Drawing.Font("New Gulim", 18F, System.Drawing.FontStyle.Bold); + this.labelInfo2.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold); this.labelInfo2.ForeColor = System.Drawing.SystemColors.ActiveCaption; this.labelInfo2.InitVisible = true; this.labelInfo2.LineSpacing = 0F; @@ -711,7 +711,7 @@ this.labelSerialNo.BackPictureBox2 = null; this.labelSerialNo.BorderColor = System.Drawing.Color.Black; this.labelSerialNo.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelSerialNo.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelSerialNo.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.labelSerialNo.InitVisible = true; this.labelSerialNo.LineSpacing = 0F; this.labelSerialNo.Location = new System.Drawing.Point(380, 168); @@ -731,7 +731,7 @@ this.labelMainControlVer.BackPictureBox2 = null; this.labelMainControlVer.BorderColor = System.Drawing.Color.Black; this.labelMainControlVer.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelMainControlVer.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelMainControlVer.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelMainControlVer.InitVisible = true; this.labelMainControlVer.LineSpacing = 0F; this.labelMainControlVer.Location = new System.Drawing.Point(557, 233); @@ -750,7 +750,7 @@ this.labelStaticSerialNo.BackPictureBox2 = null; this.labelStaticSerialNo.BorderColor = System.Drawing.Color.Black; this.labelStaticSerialNo.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticSerialNo.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelStaticSerialNo.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.labelStaticSerialNo.InitVisible = true; this.labelStaticSerialNo.LineSpacing = 0F; this.labelStaticSerialNo.Location = new System.Drawing.Point(224, 168); @@ -769,7 +769,7 @@ this.labelDisplayVer.BackPictureBox2 = null; this.labelDisplayVer.BorderColor = System.Drawing.Color.Black; this.labelDisplayVer.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelDisplayVer.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelDisplayVer.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelDisplayVer.InitVisible = true; this.labelDisplayVer.LineSpacing = 0F; this.labelDisplayVer.Location = new System.Drawing.Point(557, 202); @@ -788,7 +788,7 @@ this.labelCompany.BackPictureBox2 = null; this.labelCompany.BorderColor = System.Drawing.Color.Black; this.labelCompany.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelCompany.Font = new System.Drawing.Font("New Gulim", 24F, System.Drawing.FontStyle.Bold); + this.labelCompany.Font = new System.Drawing.Font("새굴림", 24F, System.Drawing.FontStyle.Bold); this.labelCompany.ForeColor = System.Drawing.SystemColors.ActiveCaption; this.labelCompany.InitVisible = true; this.labelCompany.LineSpacing = 0F; @@ -808,7 +808,7 @@ this.labelWebsite.BackPictureBox2 = null; this.labelWebsite.BorderColor = System.Drawing.Color.Black; this.labelWebsite.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelWebsite.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelWebsite.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.labelWebsite.ForeColor = System.Drawing.SystemColors.ActiveCaption; this.labelWebsite.InitVisible = true; this.labelWebsite.LineSpacing = 0F; @@ -828,7 +828,7 @@ this.labelAddress1.BackPictureBox2 = null; this.labelAddress1.BorderColor = System.Drawing.Color.Black; this.labelAddress1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelAddress1.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelAddress1.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.labelAddress1.ForeColor = System.Drawing.Color.DarkOliveGreen; this.labelAddress1.InitVisible = true; this.labelAddress1.LineSpacing = 0F; @@ -848,7 +848,7 @@ this.labelEmail.BackPictureBox2 = null; this.labelEmail.BorderColor = System.Drawing.Color.Black; this.labelEmail.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelEmail.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelEmail.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.labelEmail.ForeColor = System.Drawing.SystemColors.ActiveCaption; this.labelEmail.InitVisible = true; this.labelEmail.LineSpacing = 0F; @@ -868,7 +868,7 @@ this.labelTelNumber.BackPictureBox2 = null; this.labelTelNumber.BorderColor = System.Drawing.Color.Black; this.labelTelNumber.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTelNumber.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelTelNumber.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.labelTelNumber.ForeColor = System.Drawing.SystemColors.ActiveCaption; this.labelTelNumber.InitVisible = true; this.labelTelNumber.LineSpacing = 0F; @@ -888,7 +888,7 @@ this.labelAddress2.BackPictureBox2 = null; this.labelAddress2.BorderColor = System.Drawing.Color.Black; this.labelAddress2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelAddress2.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelAddress2.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.labelAddress2.ForeColor = System.Drawing.Color.DarkOliveGreen; this.labelAddress2.InitVisible = true; this.labelAddress2.LineSpacing = 0F; @@ -939,7 +939,7 @@ this.labelTitle.BackPictureBox2 = null; this.labelTitle.BorderColor = System.Drawing.Color.Black; this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitle.Font = new System.Drawing.Font("New Gulim", 35F, System.Drawing.FontStyle.Bold); + this.labelTitle.Font = new System.Drawing.Font("새굴림", 35F, System.Drawing.FontStyle.Bold); this.labelTitle.InitVisible = true; this.labelTitle.LineSpacing = 0F; this.labelTitle.Location = new System.Drawing.Point(130, 7); @@ -989,7 +989,7 @@ this.smartLabel1.BackPictureBox2 = null; this.smartLabel1.BorderColor = System.Drawing.Color.Black; this.smartLabel1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel1.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel1.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.smartLabel1.InitVisible = true; this.smartLabel1.LineSpacing = 0F; this.smartLabel1.Location = new System.Drawing.Point(224, 202); @@ -1008,7 +1008,7 @@ this.smartLabel2.BackPictureBox2 = null; this.smartLabel2.BorderColor = System.Drawing.Color.Black; this.smartLabel2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel2.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel2.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.smartLabel2.InitVisible = true; this.smartLabel2.LineSpacing = 0F; this.smartLabel2.Location = new System.Drawing.Point(380, 233); @@ -1027,7 +1027,7 @@ this.smartLabel3.BackPictureBox2 = null; this.smartLabel3.BorderColor = System.Drawing.Color.Black; this.smartLabel3.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel3.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel3.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.smartLabel3.InitVisible = true; this.smartLabel3.LineSpacing = 0F; this.smartLabel3.Location = new System.Drawing.Point(224, 233); @@ -1046,7 +1046,7 @@ this.smartLabel4.BackPictureBox2 = null; this.smartLabel4.BorderColor = System.Drawing.Color.Black; this.smartLabel4.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel4.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel4.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.smartLabel4.InitVisible = true; this.smartLabel4.LineSpacing = 0F; this.smartLabel4.Location = new System.Drawing.Point(380, 202); @@ -1065,7 +1065,7 @@ this.smartLabel5.BackPictureBox2 = null; this.smartLabel5.BorderColor = System.Drawing.Color.Black; this.smartLabel5.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel5.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel5.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.smartLabel5.InitVisible = true; this.smartLabel5.LineSpacing = 0F; this.smartLabel5.Location = new System.Drawing.Point(516, 233); @@ -1084,7 +1084,7 @@ this.smartLabel6.BackPictureBox2 = null; this.smartLabel6.BorderColor = System.Drawing.Color.Black; this.smartLabel6.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel6.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel6.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.smartLabel6.InitVisible = true; this.smartLabel6.LineSpacing = 0F; this.smartLabel6.Location = new System.Drawing.Point(516, 202); @@ -1103,7 +1103,7 @@ this.labelUserMgerVer.BackPictureBox2 = null; this.labelUserMgerVer.BorderColor = System.Drawing.Color.Black; this.labelUserMgerVer.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelUserMgerVer.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelUserMgerVer.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelUserMgerVer.InitVisible = true; this.labelUserMgerVer.LineSpacing = 0F; this.labelUserMgerVer.Location = new System.Drawing.Point(845, 202); @@ -1123,7 +1123,7 @@ this.labelAes128Ver.BackPictureBox2 = null; this.labelAes128Ver.BorderColor = System.Drawing.Color.Black; this.labelAes128Ver.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelAes128Ver.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelAes128Ver.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelAes128Ver.InitVisible = true; this.labelAes128Ver.LineSpacing = 0F; this.labelAes128Ver.Location = new System.Drawing.Point(845, 233); @@ -1143,7 +1143,7 @@ this.labelTitleDllAes128.BackPictureBox2 = null; this.labelTitleDllAes128.BorderColor = System.Drawing.Color.Black; this.labelTitleDllAes128.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleDllAes128.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelTitleDllAes128.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelTitleDllAes128.InitVisible = true; this.labelTitleDllAes128.LineSpacing = 0F; this.labelTitleDllAes128.Location = new System.Drawing.Point(698, 233); @@ -1163,7 +1163,7 @@ this.labelTitleDllUserMgr.BackPictureBox2 = null; this.labelTitleDllUserMgr.BorderColor = System.Drawing.Color.Black; this.labelTitleDllUserMgr.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleDllUserMgr.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelTitleDllUserMgr.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelTitleDllUserMgr.InitVisible = true; this.labelTitleDllUserMgr.LineSpacing = 0F; this.labelTitleDllUserMgr.Location = new System.Drawing.Point(698, 202); @@ -1183,7 +1183,7 @@ this.labelTitleDllAes128Ver.BackPictureBox2 = null; this.labelTitleDllAes128Ver.BorderColor = System.Drawing.Color.Black; this.labelTitleDllAes128Ver.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleDllAes128Ver.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelTitleDllAes128Ver.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelTitleDllAes128Ver.InitVisible = true; this.labelTitleDllAes128Ver.LineSpacing = 0F; this.labelTitleDllAes128Ver.Location = new System.Drawing.Point(804, 233); @@ -1203,7 +1203,7 @@ this.labelTitleDllUserMgrVer.BackPictureBox2 = null; this.labelTitleDllUserMgrVer.BorderColor = System.Drawing.Color.Black; this.labelTitleDllUserMgrVer.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleDllUserMgrVer.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.labelTitleDllUserMgrVer.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); this.labelTitleDllUserMgrVer.InitVisible = true; this.labelTitleDllUserMgrVer.LineSpacing = 0F; this.labelTitleDllUserMgrVer.Location = new System.Drawing.Point(804, 202); @@ -1222,11 +1222,11 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScroll = true; this.ClientSize = new System.Drawing.Size(1024, 768); + this.Controls.Add(this.tabControlSpecialFunction); this.Controls.Add(this.labelTitleDllAes128Ver); this.Controls.Add(this.labelTitleDllUserMgrVer); this.Controls.Add(this.smartKeyboard1); this.Controls.Add(this.textBoxSerialNo); - this.Controls.Add(this.tabControlSpecialFunction); this.Controls.Add(this.labelTitleDllAes128); this.Controls.Add(this.labelTitleDllUserMgr); this.Controls.Add(this.labelAes128Ver); diff --git a/INT69DC_7C/Forms/FormMainDisplay.cs b/INT69DC_7C/Forms/FormMainDisplay.cs index 99fa235..16b5f01 100644 --- a/INT69DC_7C/Forms/FormMainDisplay.cs +++ b/INT69DC_7C/Forms/FormMainDisplay.cs @@ -1021,6 +1021,10 @@ namespace INT69DC_7C.Forms { this.buttonUser.ButtonDown(); this.UpdateDisplayUser(this.ParentForm.SystemConfig.CurrentUser); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Login, ""); } else this.buttonUser.ButtonUp(); diff --git a/INT69DC_7C/INT69DC_7C.csproj b/INT69DC_7C/INT69DC_7C.csproj index adb1efc..e69636f 100644 --- a/INT69DC_7C/INT69DC_7C.csproj +++ b/INT69DC_7C/INT69DC_7C.csproj @@ -612,9 +612,11 @@ FormUserEditor.cs + Designer FormUserGroupEditor.cs + Designer ResXFileCodeGenerator