diff --git a/INT69DB_2A/DataStore.cs b/INT69DB_2A/DataStore.cs
index 7f56133..d56401d 100644
--- a/INT69DB_2A/DataStore.cs
+++ b/INT69DB_2A/DataStore.cs
@@ -3539,13 +3539,19 @@ namespace INT69DB_2A
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/INT69DB_2A/DialogForms/DialogFormHistoryData.cs b/INT69DB_2A/DialogForms/DialogFormHistoryData.cs
index 7013d7f..71caa5d 100644
--- a/INT69DB_2A/DialogForms/DialogFormHistoryData.cs
+++ b/INT69DB_2A/DialogForms/DialogFormHistoryData.cs
@@ -213,6 +213,9 @@ namespace INT69DB_2A.DialogForms
this.treeView.Nodes.Add(node);
}
}
+
+ //if (this.treeView.SelectedNode.IsSelected == true)
+ // this.treeView.SelectedNode.Parent.Expand();
}
#endregion
diff --git a/INT69DB_2A/DialogForms/DialogFormMessage.designer.cs b/INT69DB_2A/DialogForms/DialogFormMessage.designer.cs
index 349dc69..1e9b132 100644
--- a/INT69DB_2A/DialogForms/DialogFormMessage.designer.cs
+++ b/INT69DB_2A/DialogForms/DialogFormMessage.designer.cs
@@ -30,15 +30,15 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DialogFormMessage));
this.panel1 = new System.Windows.Forms.Panel();
- this.pictureBoxExclamation = new System.Windows.Forms.PictureBox();
this.labelMessage2 = new System.Windows.Forms.Label();
this.labelMessage1 = new System.Windows.Forms.Label();
- this.pictureBoxHand = new System.Windows.Forms.PictureBox();
- this.pictureBoxQuestion = new System.Windows.Forms.PictureBox();
- this.pictureBoxAsterisk = new System.Windows.Forms.PictureBox();
this.buttonOK = new System.Windows.Forms.Button();
this.labelErrorCode = new System.Windows.Forms.Label();
this.timerAutoClose = new System.Windows.Forms.Timer();
+ this.pictureBoxExclamation = new System.Windows.Forms.PictureBox();
+ this.pictureBoxHand = new System.Windows.Forms.PictureBox();
+ this.pictureBoxAsterisk = new System.Windows.Forms.PictureBox();
+ this.pictureBoxQuestion = new System.Windows.Forms.PictureBox();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
@@ -46,22 +46,15 @@
//
this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.pictureBoxExclamation);
+ this.panel1.Controls.Add(this.pictureBoxHand);
+ this.panel1.Controls.Add(this.pictureBoxAsterisk);
+ this.panel1.Controls.Add(this.pictureBoxQuestion);
this.panel1.Controls.Add(this.labelMessage2);
this.panel1.Controls.Add(this.labelMessage1);
- this.panel1.Controls.Add(this.pictureBoxHand);
- this.panel1.Controls.Add(this.pictureBoxQuestion);
- this.panel1.Controls.Add(this.pictureBoxAsterisk);
this.panel1.Location = new System.Drawing.Point(15, 34);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(420, 95);
//
- // pictureBoxExclamation
- //
- this.pictureBoxExclamation.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxExclamation.Image")));
- this.pictureBoxExclamation.Location = new System.Drawing.Point(11, 20);
- this.pictureBoxExclamation.Name = "pictureBoxExclamation";
- this.pictureBoxExclamation.Size = new System.Drawing.Size(50, 50);
- //
// labelMessage2
//
this.labelMessage2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
@@ -78,27 +71,6 @@
this.labelMessage1.Size = new System.Drawing.Size(350, 20);
this.labelMessage1.Text = "COM2 port problem. Please contact a manufacturer.";
//
- // pictureBoxHand
- //
- this.pictureBoxHand.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxHand.Image")));
- this.pictureBoxHand.Location = new System.Drawing.Point(11, 20);
- this.pictureBoxHand.Name = "pictureBoxHand";
- this.pictureBoxHand.Size = new System.Drawing.Size(50, 50);
- //
- // pictureBoxQuestion
- //
- this.pictureBoxQuestion.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxQuestion.Image")));
- this.pictureBoxQuestion.Location = new System.Drawing.Point(11, 20);
- this.pictureBoxQuestion.Name = "pictureBoxQuestion";
- this.pictureBoxQuestion.Size = new System.Drawing.Size(50, 50);
- //
- // pictureBoxAsterisk
- //
- this.pictureBoxAsterisk.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxAsterisk.Image")));
- this.pictureBoxAsterisk.Location = new System.Drawing.Point(11, 20);
- this.pictureBoxAsterisk.Name = "pictureBoxAsterisk";
- this.pictureBoxAsterisk.Size = new System.Drawing.Size(50, 50);
- //
// buttonOK
//
this.buttonOK.BackColor = System.Drawing.Color.LightGray;
@@ -125,6 +97,37 @@
this.timerAutoClose.Interval = 1000;
this.timerAutoClose.Tick += new System.EventHandler(this.timerAutoClose_Tick);
//
+ // pictureBoxExclamation
+ //
+ this.pictureBoxExclamation.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxExclamation.Image")));
+ this.pictureBoxExclamation.Location = new System.Drawing.Point(11, 20);
+ this.pictureBoxExclamation.Name = "pictureBoxExclamation";
+ this.pictureBoxExclamation.Size = new System.Drawing.Size(50, 50);
+ //
+ // pictureBoxHand
+ //
+ this.pictureBoxHand.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxHand.Image")));
+ this.pictureBoxHand.Location = new System.Drawing.Point(11, 20);
+ this.pictureBoxHand.Name = "pictureBoxHand";
+ this.pictureBoxHand.Size = new System.Drawing.Size(50, 50);
+ this.pictureBoxHand.Visible = false;
+ //
+ // pictureBoxAsterisk
+ //
+ this.pictureBoxAsterisk.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxAsterisk.Image")));
+ this.pictureBoxAsterisk.Location = new System.Drawing.Point(11, 20);
+ this.pictureBoxAsterisk.Name = "pictureBoxAsterisk";
+ this.pictureBoxAsterisk.Size = new System.Drawing.Size(50, 50);
+ this.pictureBoxAsterisk.Visible = false;
+ //
+ // pictureBoxQuestion
+ //
+ this.pictureBoxQuestion.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxQuestion.Image")));
+ this.pictureBoxQuestion.Location = new System.Drawing.Point(11, 20);
+ this.pictureBoxQuestion.Name = "pictureBoxQuestion";
+ this.pictureBoxQuestion.Size = new System.Drawing.Size(50, 50);
+ this.pictureBoxQuestion.Visible = false;
+ //
// DialogFormMessage
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -146,14 +149,14 @@
#endregion
private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.PictureBox pictureBoxExclamation;
private System.Windows.Forms.Label labelMessage2;
private System.Windows.Forms.Label labelMessage1;
private System.Windows.Forms.Button buttonOK;
private System.Windows.Forms.Label labelErrorCode;
- private System.Windows.Forms.PictureBox pictureBoxQuestion;
- private System.Windows.Forms.PictureBox pictureBoxAsterisk;
- private System.Windows.Forms.PictureBox pictureBoxHand;
private System.Windows.Forms.Timer timerAutoClose;
+ private System.Windows.Forms.PictureBox pictureBoxExclamation;
+ private System.Windows.Forms.PictureBox pictureBoxHand;
+ private System.Windows.Forms.PictureBox pictureBoxAsterisk;
+ private System.Windows.Forms.PictureBox pictureBoxQuestion;
}
}
\ No newline at end of file
diff --git a/INT69DB_2A/DialogForms/DialogFormMessage.resx b/INT69DB_2A/DialogForms/DialogFormMessage.resx
index 0d89a93..3d6a10d 100644
--- a/INT69DB_2A/DialogForms/DialogFormMessage.resx
+++ b/INT69DB_2A/DialogForms/DialogFormMessage.resx
@@ -182,7 +182,7 @@
- iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
+ iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAIAAACRXR/mAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
bGUAAEjHnZZ3VFTXFofPvXd6oc0w0hl6ky4wgPQuIB0EURhmBhjKAMMMTWyIqEBEEREBRZCggAGjoUis
iGIhKKhgD0gQUGIwiqioZEbWSnx5ee/l5ffHvd/aZ+9z99l7n7UuACRPHy4vBZYCIJkn4Ad6ONNXhUfQ
@@ -227,133 +227,43 @@
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
- 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
- gg==
+ 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
- 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
+ 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
@@ -398,39 +308,112 @@
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
- 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
+ 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
diff --git a/INT69DB_2A/DialogForms/DialogFormYesNo.designer.cs b/INT69DB_2A/DialogForms/DialogFormYesNo.designer.cs
index 1a70c85..be25b7f 100644
--- a/INT69DB_2A/DialogForms/DialogFormYesNo.designer.cs
+++ b/INT69DB_2A/DialogForms/DialogFormYesNo.designer.cs
@@ -31,14 +31,14 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DialogFormYesNo));
this.buttonNo = new System.Windows.Forms.Button();
this.labelErrorCode = new System.Windows.Forms.Label();
- this.pictureBoxExclamation = new System.Windows.Forms.PictureBox();
this.labelMessage1 = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
- this.pictureBoxQuestion = new System.Windows.Forms.PictureBox();
- this.pictureBoxAsterisk = new System.Windows.Forms.PictureBox();
this.labelMessage2 = new System.Windows.Forms.Label();
- this.pictureBoxHand = new System.Windows.Forms.PictureBox();
this.buttonYes = new System.Windows.Forms.Button();
+ this.pictureBoxExclamation = new System.Windows.Forms.PictureBox();
+ this.pictureBoxHand = new System.Windows.Forms.PictureBox();
+ this.pictureBoxAsterisk = new System.Windows.Forms.PictureBox();
+ this.pictureBoxQuestion = new System.Windows.Forms.PictureBox();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
@@ -63,13 +63,6 @@
this.labelErrorCode.Size = new System.Drawing.Size(350, 20);
this.labelErrorCode.Text = "Error 0";
//
- // pictureBoxExclamation
- //
- this.pictureBoxExclamation.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxExclamation.Image")));
- this.pictureBoxExclamation.Location = new System.Drawing.Point(11, 20);
- this.pictureBoxExclamation.Name = "pictureBoxExclamation";
- this.pictureBoxExclamation.Size = new System.Drawing.Size(50, 50);
- //
// labelMessage1
//
this.labelMessage1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
@@ -82,29 +75,15 @@
//
this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.pictureBoxExclamation);
- this.panel1.Controls.Add(this.pictureBoxQuestion);
+ this.panel1.Controls.Add(this.pictureBoxHand);
this.panel1.Controls.Add(this.pictureBoxAsterisk);
+ this.panel1.Controls.Add(this.pictureBoxQuestion);
this.panel1.Controls.Add(this.labelMessage2);
this.panel1.Controls.Add(this.labelMessage1);
- this.panel1.Controls.Add(this.pictureBoxHand);
this.panel1.Location = new System.Drawing.Point(15, 34);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(420, 95);
//
- // pictureBoxQuestion
- //
- this.pictureBoxQuestion.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxQuestion.Image")));
- this.pictureBoxQuestion.Location = new System.Drawing.Point(11, 20);
- this.pictureBoxQuestion.Name = "pictureBoxQuestion";
- this.pictureBoxQuestion.Size = new System.Drawing.Size(50, 50);
- //
- // pictureBoxAsterisk
- //
- this.pictureBoxAsterisk.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxAsterisk.Image")));
- this.pictureBoxAsterisk.Location = new System.Drawing.Point(11, 20);
- this.pictureBoxAsterisk.Name = "pictureBoxAsterisk";
- this.pictureBoxAsterisk.Size = new System.Drawing.Size(50, 50);
- //
// labelMessage2
//
this.labelMessage2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular);
@@ -113,13 +92,6 @@
this.labelMessage2.Size = new System.Drawing.Size(350, 20);
this.labelMessage2.Text = "COM2 port problem. Please contact a manufacturer.";
//
- // pictureBoxHand
- //
- this.pictureBoxHand.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxHand.Image")));
- this.pictureBoxHand.Location = new System.Drawing.Point(11, 20);
- this.pictureBoxHand.Name = "pictureBoxHand";
- this.pictureBoxHand.Size = new System.Drawing.Size(50, 50);
- //
// buttonYes
//
this.buttonYes.BackColor = System.Drawing.Color.LightGray;
@@ -133,6 +105,37 @@
this.buttonYes.Text = "Yes";
this.buttonYes.Click += new System.EventHandler(this.buttonYes_Click);
//
+ // pictureBoxExclamation
+ //
+ this.pictureBoxExclamation.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxExclamation.Image")));
+ this.pictureBoxExclamation.Location = new System.Drawing.Point(11, 20);
+ this.pictureBoxExclamation.Name = "pictureBoxExclamation";
+ this.pictureBoxExclamation.Size = new System.Drawing.Size(50, 50);
+ //
+ // pictureBoxHand
+ //
+ this.pictureBoxHand.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxHand.Image")));
+ this.pictureBoxHand.Location = new System.Drawing.Point(11, 20);
+ this.pictureBoxHand.Name = "pictureBoxHand";
+ this.pictureBoxHand.Size = new System.Drawing.Size(50, 50);
+ this.pictureBoxHand.Visible = false;
+ //
+ // pictureBoxAsterisk
+ //
+ this.pictureBoxAsterisk.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxAsterisk.Image")));
+ this.pictureBoxAsterisk.Location = new System.Drawing.Point(11, 20);
+ this.pictureBoxAsterisk.Name = "pictureBoxAsterisk";
+ this.pictureBoxAsterisk.Size = new System.Drawing.Size(50, 50);
+ this.pictureBoxAsterisk.Visible = false;
+ //
+ // pictureBoxQuestion
+ //
+ this.pictureBoxQuestion.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxQuestion.Image")));
+ this.pictureBoxQuestion.Location = new System.Drawing.Point(11, 20);
+ this.pictureBoxQuestion.Name = "pictureBoxQuestion";
+ this.pictureBoxQuestion.Size = new System.Drawing.Size(50, 50);
+ this.pictureBoxQuestion.Visible = false;
+ //
// DialogFormYesNo
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@@ -156,13 +159,13 @@
private System.Windows.Forms.Button buttonNo;
private System.Windows.Forms.Label labelErrorCode;
- private System.Windows.Forms.PictureBox pictureBoxExclamation;
private System.Windows.Forms.Label labelMessage1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Button buttonYes;
private System.Windows.Forms.Label labelMessage2;
+ private System.Windows.Forms.PictureBox pictureBoxExclamation;
private System.Windows.Forms.PictureBox pictureBoxHand;
- private System.Windows.Forms.PictureBox pictureBoxQuestion;
private System.Windows.Forms.PictureBox pictureBoxAsterisk;
+ private System.Windows.Forms.PictureBox pictureBoxQuestion;
}
}
\ No newline at end of file
diff --git a/INT69DB_2A/DialogForms/DialogFormYesNo.resx b/INT69DB_2A/DialogForms/DialogFormYesNo.resx
index 8d64c9d..4187d1a 100644
--- a/INT69DB_2A/DialogForms/DialogFormYesNo.resx
+++ b/INT69DB_2A/DialogForms/DialogFormYesNo.resx
@@ -180,9 +180,9 @@
YII=
-
+
- iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
+ iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAIAAACRXR/mAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
bGUAAEjHnZZ3VFTXFofPvXd6oc0w0hl6ky4wgPQuIB0EURhmBhjKAMMMTWyIqEBEEREBRZCggAGjoUis
iGIhKKhgD0gQUGIwiqioZEbWSnx5ee/l5ffHvd/aZ+9z99l7n7UuACRPHy4vBZYCIJkn4Ad6ONNXhUfQ
@@ -227,44 +227,43 @@
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
- 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
- gg==
+ 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
- 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
+ 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
@@ -309,44 +308,36 @@
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
- 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
+ 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
-
+
- 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
+ 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
@@ -391,46 +382,38 @@
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
- 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
+ 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
diff --git a/INT69DB_2A/Forms/FormCommunication.cs b/INT69DB_2A/Forms/FormCommunication.cs
index b0b4096..6a018d9 100644
--- a/INT69DB_2A/Forms/FormCommunication.cs
+++ b/INT69DB_2A/Forms/FormCommunication.cs
@@ -1486,13 +1486,21 @@ namespace INT69DB_2A.Forms
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
- if (this.ParentForm.serialPort3.IsOpen == true)
- this.ParentForm.serialPort3.Close();
+ if (this.ParentForm.smartSerialPortCom3.IsOpen == true)
+ this.ParentForm.smartSerialPortCom3.Close();
if (this.ParentForm.SystemConfig.Serial3Mode != 0)
{
- this.ParentForm.serialPort3.BaudRate = this.ParentForm.SystemConfig.Serial3BaudRate;
- this.ParentForm.serialPort3.Open();
+ switch (this.ParentForm.SystemConfig.Serial3Mode)
+ {
+ case 4:
+ this.ParentForm.smartSerialPortCom3.FrameSeparationType = SmartSerialPort.FRAMESEPARATIONTYPES.NONEFRAME_READTIMEOUT;
+ break;
+ default:
+ this.ParentForm.smartSerialPortCom3.FrameSeparationType = SmartSerialPort.FRAMESEPARATIONTYPES.STXANDETX;
+ break;
+ }
+ this.ParentForm.smartSerialPortCom3.Open();
this.buttonSerialSend.Enabled = true;
}
diff --git a/INT69DB_2A/Forms/FormDataStatistics.Designer.cs b/INT69DB_2A/Forms/FormDataStatistics.Designer.cs
index 6c26947..dc9bde2 100644
--- a/INT69DB_2A/Forms/FormDataStatistics.Designer.cs
+++ b/INT69DB_2A/Forms/FormDataStatistics.Designer.cs
@@ -270,6 +270,8 @@
this.labelStartTime = new SmartX.SmartLabel();
this.labelEndTime = new SmartX.SmartLabel();
this.buttonDisplay = new SmartX.SmartButton();
+ this.labelFileName = new SmartX.SmartLabel();
+ this.smartLabel9 = new SmartX.SmartLabel();
((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit();
this.smartGroupBox2.SuspendLayout();
this.smartGroupBox1.SuspendLayout();
@@ -520,7 +522,7 @@
this.smartGroupBox2.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.None;
this.smartGroupBox2.Image = null;
this.smartGroupBox2.InitVisible = true;
- this.smartGroupBox2.Location = new System.Drawing.Point(0, 65);
+ this.smartGroupBox2.Location = new System.Drawing.Point(0, 68);
this.smartGroupBox2.Name = "smartGroupBox2";
this.smartGroupBox2.RoundRadius = 5;
this.smartGroupBox2.Size = new System.Drawing.Size(800, 450);
@@ -5375,12 +5377,53 @@
this.buttonDisplay.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonDisplay.UpImage")));
this.buttonDisplay.Click += new System.EventHandler(this.buttonDisplay_Click);
//
+ // 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("새굴림", 12F, System.Drawing.FontStyle.Bold);
+ this.labelFileName.ForeColor = System.Drawing.Color.White;
+ this.labelFileName.InitVisible = true;
+ this.labelFileName.LineSpacing = 0F;
+ this.labelFileName.Location = new System.Drawing.Point(625, 34);
+ this.labelFileName.Name = "labelFileName";
+ this.labelFileName.Size = new System.Drawing.Size(170, 25);
+ this.labelFileName.TabIndex = 178;
+ 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.ForeColor = System.Drawing.Color.White;
+ this.smartLabel9.InitVisible = true;
+ this.smartLabel9.LineSpacing = 0F;
+ this.smartLabel9.Location = new System.Drawing.Point(625, 8);
+ this.smartLabel9.Name = "smartLabel9";
+ this.smartLabel9.Size = new System.Drawing.Size(170, 20);
+ this.smartLabel9.TabIndex = 177;
+ 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(800, 600);
+ this.Controls.Add(this.labelFileName);
+ this.Controls.Add(this.smartLabel9);
this.Controls.Add(this.buttonDisplay);
this.Controls.Add(this.smartGroupBox1);
this.Controls.Add(this.buttonFileSelect);
@@ -5642,5 +5685,7 @@
private SmartX.SmartLabel labelLane9;
private SmartX.SmartLabel labelLane10;
private SmartX.SmartButton buttonDisplay;
+ private SmartX.SmartLabel labelFileName;
+ private SmartX.SmartLabel smartLabel9;
}
}
\ No newline at end of file
diff --git a/INT69DB_2A/Forms/FormDataStatistics.cs b/INT69DB_2A/Forms/FormDataStatistics.cs
index 4a77a27..0ad5262 100644
--- a/INT69DB_2A/Forms/FormDataStatistics.cs
+++ b/INT69DB_2A/Forms/FormDataStatistics.cs
@@ -369,17 +369,25 @@ namespace INT69DB_2A.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;
@@ -641,6 +649,11 @@ namespace INT69DB_2A.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();
}
@@ -1153,6 +1166,7 @@ namespace INT69DB_2A.Forms
this.ClearData();
this.buttonSave.Enabled = false;
+ this.labelFileName.Text = "";
this.FlagInforUp = true;
this.smartGroupBox1.BringToFront();
diff --git a/INT69DB_2A/Forms/FormDataViewer.Designer.cs b/INT69DB_2A/Forms/FormDataViewer.Designer.cs
index 56462be..278d6f6 100644
--- a/INT69DB_2A/Forms/FormDataViewer.Designer.cs
+++ b/INT69DB_2A/Forms/FormDataViewer.Designer.cs
@@ -765,13 +765,13 @@
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("새굴림", 15F, System.Drawing.FontStyle.Bold);
+ this.labelFileName.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold);
this.labelFileName.ForeColor = System.Drawing.Color.White;
this.labelFileName.InitVisible = true;
this.labelFileName.LineSpacing = 0F;
- this.labelFileName.Location = new System.Drawing.Point(457, 35);
+ this.labelFileName.Location = new System.Drawing.Point(625, 34);
this.labelFileName.Name = "labelFileName";
- this.labelFileName.Size = new System.Drawing.Size(263, 25);
+ this.labelFileName.Size = new System.Drawing.Size(170, 25);
this.labelFileName.TabIndex = 169;
this.labelFileName.Text = "FileName";
this.labelFileName.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@@ -788,9 +788,9 @@
this.smartLabel9.ForeColor = System.Drawing.Color.White;
this.smartLabel9.InitVisible = true;
this.smartLabel9.LineSpacing = 0F;
- this.smartLabel9.Location = new System.Drawing.Point(457, 9);
+ this.smartLabel9.Location = new System.Drawing.Point(625, 8);
this.smartLabel9.Name = "smartLabel9";
- this.smartLabel9.Size = new System.Drawing.Size(180, 20);
+ this.smartLabel9.Size = new System.Drawing.Size(170, 20);
this.smartLabel9.TabIndex = 168;
this.smartLabel9.Text = "FileName :";
this.smartLabel9.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@@ -807,7 +807,7 @@
this.labelItemsCount.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelItemsCount.InitVisible = true;
this.labelItemsCount.LineSpacing = 0F;
- this.labelItemsCount.Location = new System.Drawing.Point(726, 7);
+ this.labelItemsCount.Location = new System.Drawing.Point(492, 539);
this.labelItemsCount.Name = "labelItemsCount";
this.labelItemsCount.Size = new System.Drawing.Size(70, 30);
this.labelItemsCount.TabIndex = 173;
@@ -827,7 +827,7 @@
this.labelRemainDataCount.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.labelRemainDataCount.InitVisible = true;
this.labelRemainDataCount.LineSpacing = 0F;
- this.labelRemainDataCount.Location = new System.Drawing.Point(726, 43);
+ this.labelRemainDataCount.Location = new System.Drawing.Point(492, 575);
this.labelRemainDataCount.Name = "labelRemainDataCount";
this.labelRemainDataCount.Size = new System.Drawing.Size(70, 20);
this.labelRemainDataCount.TabIndex = 174;
diff --git a/INT69DB_2A/Forms/FormDataViewer.cs b/INT69DB_2A/Forms/FormDataViewer.cs
index 36296ee..d5e3777 100644
--- a/INT69DB_2A/Forms/FormDataViewer.cs
+++ b/INT69DB_2A/Forms/FormDataViewer.cs
@@ -23,7 +23,8 @@ namespace INT69DB_2A.Forms
private int DataRemainCNT;
private int DataAllCNT;
public string PathDestinationFileName;
- private static int ViewerDataCount = 22;
+ private static int ViewerCount = 22;
+ private static int OnePixel = 18;
private FormMain m_ParentForm;
private Collection CollectionHistoryData; // 파일에서 읽은 데이터
@@ -230,10 +231,10 @@ namespace INT69DB_2A.Forms
private void UpdateDisplay()
{
int cnt = 0;
- if (this.ListTime.Count > ViewerDataCount)
+ if (this.ListTime.Count > ViewerCount)
{
- cnt = ViewerDataCount;
- this.DataRemainCNT = this.ListTime.Count - ViewerDataCount;
+ cnt = ViewerCount;
+ this.DataRemainCNT = this.ListTime.Count - ViewerCount;
}
else
cnt = this.ListTime.Count;
@@ -268,9 +269,9 @@ namespace INT69DB_2A.Forms
index = this.ListTime.Count - this.DataRemainCNT;
- if (this.DataRemainCNT > ViewerDataCount)
+ if (this.DataRemainCNT > ViewerCount)
{
- range = index + ViewerDataCount;
+ range = index + ViewerCount;
for (int i = index; i < range; i++)
{
//this.listBoxDate.AddItem(this.ListDate[i]);
@@ -283,7 +284,7 @@ namespace INT69DB_2A.Forms
this.listBoxType.AddItem(this.ListType[i]);
}
- this.DataRemainCNT = this.DataRemainCNT - ViewerDataCount;
+ this.DataRemainCNT = this.DataRemainCNT - ViewerCount;
}
else
{
@@ -364,7 +365,8 @@ namespace INT69DB_2A.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.UpdateListItem(this.ParentForm.CurrentDataViewerFilter);
// 화면 표시
@@ -453,7 +455,7 @@ namespace INT69DB_2A.Forms
if (this.StartIndex < 6)
this.ListBoxScrollUp();
else
- this.ListBoxScrollUp(ViewerDataCount);
+ this.ListBoxScrollUp(OnePixel);
}
private void buttonDown_Click(object sender, EventArgs e)
{
@@ -467,9 +469,14 @@ namespace INT69DB_2A.Forms
}
if (this.RemainCNT < 6)
+ {
this.ListBoxScrollDown();
+
+ if (this.listBoxTime.ViewRemainCount == 0)
+ this.ListBoxScrollDown(OnePixel);
+ }
else
- this.ListBoxScrollDown(ViewerDataCount);
+ this.ListBoxScrollDown(OnePixel);
}
private void listBox_SelectedIndexChanged(object sender, EventArgs e)
diff --git a/INT69DB_2A/Forms/FormMain.Designer.cs b/INT69DB_2A/Forms/FormMain.Designer.cs
index b1a7795..a4a043c 100644
--- a/INT69DB_2A/Forms/FormMain.Designer.cs
+++ b/INT69DB_2A/Forms/FormMain.Designer.cs
@@ -33,7 +33,6 @@
this.smartConfigs = new SmartX.SmartConfigs();
this.smartFileIO = new SmartX.SmartFile();
this.smartFileCommunicationLog = new SmartX.SmartFile();
- this.serialPort3 = new System.IO.Ports.SerialPort(this.components);
this.smartFileAdcLog = new SmartX.SmartFile();
this.timerAdcLog = new System.Windows.Forms.Timer();
this.smartSerialPortLink = new SmartX.SmartSerialPort();
@@ -68,10 +67,6 @@
//
this.smartFileCommunicationLog.FilePathName = null;
//
- // serialPort3
- //
- this.serialPort3.PortName = "COM3";
- //
// smartFileAdcLog
//
this.smartFileAdcLog.FilePathName = null;
@@ -170,7 +165,6 @@
public SmartX.SmartConfigs smartConfigs;
public SmartX.SmartFile smartFileIO;
public SmartX.SmartFile smartFileCommunicationLog;
- public System.IO.Ports.SerialPort serialPort3;
public SmartX.SmartFile smartFileAdcLog;
public System.Windows.Forms.Timer timerAdcLog;
private SmartX.SmartSerialPort smartSerialPortLink;
diff --git a/INT69DB_2A/Forms/FormMain.cs b/INT69DB_2A/Forms/FormMain.cs
index c3d8007..795bad3 100644
--- a/INT69DB_2A/Forms/FormMain.cs
+++ b/INT69DB_2A/Forms/FormMain.cs
@@ -700,10 +700,10 @@ namespace INT69DB_2A.Forms
#region Communication Protocol
public void PrintingHeadLine()
{
- this.serialPort3.Write("\n--------------------------------");
- this.serialPort3.Write(" NO LANE GRADE WEIGHT COUNT");
- this.serialPort3.Write("\n--------------------------------");
- this.serialPort3.Write("\n");
+ this.smartSerialPortCom3.WriteNoneFrame("\n--------------------------------", SmartSerialPort.CODETYPES.ASCIICODE);
+ this.smartSerialPortCom3.WriteNoneFrame(" NO LANE GRADE WEIGHT COUNT", SmartSerialPort.CODETYPES.ASCIICODE);
+ this.smartSerialPortCom3.WriteNoneFrame("\n--------------------------------", SmartSerialPort.CODETYPES.ASCIICODE);
+ this.smartSerialPortCom3.WriteNoneFrame("\n", SmartSerialPort.CODETYPES.ASCIICODE);
}
public string Protocol_OPT1(Collection datas)
diff --git a/INT69DB_2A/Forms/FormMain.resx b/INT69DB_2A/Forms/FormMain.resx
index 5221b95..1528af4 100644
--- a/INT69DB_2A/Forms/FormMain.resx
+++ b/INT69DB_2A/Forms/FormMain.resx
@@ -126,9 +126,6 @@
528, 8
-
- 295, 8
-
739, 8
diff --git a/INT69DB_2A/Forms/FormMainDisplay.cs b/INT69DB_2A/Forms/FormMainDisplay.cs
index 5b10af1..a6eda39 100644
--- a/INT69DB_2A/Forms/FormMainDisplay.cs
+++ b/INT69DB_2A/Forms/FormMainDisplay.cs
@@ -559,6 +559,10 @@ namespace INT69DB_2A.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();
@@ -3087,7 +3091,7 @@ namespace INT69DB_2A.Forms
else
{
this.ParentForm.SystemConfig.IsPrintPerProductEnable = false;
- this.ParentForm.serialPort3.Write("\n\n\n\n");
+ this.ParentForm.smartSerialPortCom3.WriteNoneFrame("\n\n\n\n", SmartSerialPort.CODETYPES.ASCIICODE);
this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Print, "OFF");
}
diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormMessage.resources b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormMessage.resources
index 681fe70..cd5b5ff 100644
Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormMessage.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormMessage.resources differ
diff --git a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormYesNo.resources b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormYesNo.resources
index 681fe70..cd5b5ff 100644
Binary files a/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormYesNo.resources and b/INT69DB_2A/obj/Release/INT69DB_2A.DialogForms.DialogFormYesNo.resources differ