Compare commits

..

No commits in common. "ad573d032406cec77774a3d985b9f9e674409797" and "fb65aad5b2ea39881496e37d43d7043f855259a2" have entirely different histories.

7 changed files with 305 additions and 948 deletions

View File

@ -32,13 +32,14 @@
this.textBox = new System.Windows.Forms.TextBox(); this.textBox = new System.Windows.Forms.TextBox();
this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.smartKeyboard = new SmartX.SmartKeyboard(); this.smartKeyboard = new SmartX.SmartKeyboard();
this.labelTitle = new SmartX.SmartLabel();
this.pictureBoxImage = new System.Windows.Forms.PictureBox(); this.pictureBoxImage = new System.Windows.Forms.PictureBox();
this.SuspendLayout(); this.SuspendLayout();
// //
// textBox // textBox
// //
this.textBox.Font = new System.Drawing.Font("Arial", 25F, System.Drawing.FontStyle.Regular); this.textBox.Font = new System.Drawing.Font("Arial", 25F, System.Drawing.FontStyle.Regular);
this.textBox.Location = new System.Drawing.Point(143, 82); this.textBox.Location = new System.Drawing.Point(143, 99);
this.textBox.MaxLength = 20; this.textBox.MaxLength = 20;
this.textBox.Name = "textBox"; this.textBox.Name = "textBox";
this.textBox.Size = new System.Drawing.Size(489, 45); this.textBox.Size = new System.Drawing.Size(489, 45);
@ -88,6 +89,27 @@
this.smartKeyboard.OnXKeyClick += new System.EventHandler(this.smartKeyboard_OnXKeyClick); this.smartKeyboard.OnXKeyClick += new System.EventHandler(this.smartKeyboard_OnXKeyClick);
this.smartKeyboard.KeyDown += new System.Windows.Forms.KeyEventHandler(this.smartKeyboard_KeyDown); this.smartKeyboard.KeyDown += new System.Windows.Forms.KeyEventHandler(this.smartKeyboard_KeyDown);
// //
// labelTitle
//
this.labelTitle.BackColor = System.Drawing.Color.White;
this.labelTitle.BackPictureBox = null;
this.labelTitle.BackPictureBox1 = null;
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", 20F, System.Drawing.FontStyle.Bold);
this.labelTitle.ForeColor = System.Drawing.Color.Gray;
this.labelTitle.InitVisible = true;
this.labelTitle.LineSpacing = 0F;
this.labelTitle.Location = new System.Drawing.Point(143, 43);
this.labelTitle.Name = "labelTitle";
this.labelTitle.Size = new System.Drawing.Size(489, 50);
this.labelTitle.TabIndex = 180;
this.labelTitle.Text = "입력";
this.labelTitle.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle;
this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle;
this.labelTitle.Wordwrap = false;
//
// pictureBoxImage // pictureBoxImage
// //
this.pictureBoxImage.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxImage.Image"))); this.pictureBoxImage.Image = ((System.Drawing.Image)(resources.GetObject("pictureBoxImage.Image")));
@ -103,6 +125,7 @@
this.ClientSize = new System.Drawing.Size(710, 470); this.ClientSize = new System.Drawing.Size(710, 470);
this.ControlBox = false; this.ControlBox = false;
this.Controls.Add(this.pictureBoxImage); this.Controls.Add(this.pictureBoxImage);
this.Controls.Add(this.labelTitle);
this.Controls.Add(this.smartKeyboard); this.Controls.Add(this.smartKeyboard);
this.Controls.Add(this.textBox); this.Controls.Add(this.textBox);
this.Controls.Add(this.pictureBox1); this.Controls.Add(this.pictureBox1);
@ -118,6 +141,7 @@
private System.Windows.Forms.TextBox textBox; private System.Windows.Forms.TextBox textBox;
private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.PictureBox pictureBox1;
private SmartX.SmartKeyboard smartKeyboard; private SmartX.SmartKeyboard smartKeyboard;
private SmartX.SmartLabel labelTitle;
private System.Windows.Forms.PictureBox pictureBoxImage; private System.Windows.Forms.PictureBox pictureBoxImage;
} }
} }

View File

@ -159,7 +159,6 @@ namespace INT69DC_7C.Forms
this.comboBoxMode.Items.Add("OPT3"); this.comboBoxMode.Items.Add("OPT3");
this.comboBoxMode.Items.Add("Modbus"); this.comboBoxMode.Items.Add("Modbus");
this.comboBoxMode.Items.Add("OPT5"); this.comboBoxMode.Items.Add("OPT5");
this.comboBoxMode.Items.Add("OPT6");
this.comboBoxMode.SelectedIndex = 0; this.comboBoxMode.SelectedIndex = 0;
this.comboBoxMode.SelectedIndexChanged += new EventHandler(this.comboBoxMode_SelectedIndexChanged); this.comboBoxMode.SelectedIndexChanged += new EventHandler(this.comboBoxMode_SelectedIndexChanged);
@ -181,7 +180,6 @@ namespace INT69DC_7C.Forms
this.comboBoxSerial3Mode.Items.Add("OPT4"); this.comboBoxSerial3Mode.Items.Add("OPT4");
this.comboBoxSerial3Mode.Items.Add("Printer"); this.comboBoxSerial3Mode.Items.Add("Printer");
this.comboBoxSerial3Mode.Items.Add("OPT5"); this.comboBoxSerial3Mode.Items.Add("OPT5");
this.comboBoxSerial3Mode.Items.Add("OPT6");
this.comboBoxSerial3Mode.SelectedIndex = 0; this.comboBoxSerial3Mode.SelectedIndex = 0;
this.comboBoxSerial3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial3_SelectedIndexChanged); this.comboBoxSerial3Mode.SelectedIndexChanged += new EventHandler(this.comboBoxSerial3_SelectedIndexChanged);
} }
@ -332,8 +330,6 @@ namespace INT69DC_7C.Forms
data = this.ParentForm.Protocol_OPT3(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData, this.ParentForm.CurrentProductItem); data = this.ParentForm.Protocol_OPT3(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData, this.ParentForm.CurrentProductItem);
else if (this.ParentForm.SystemConfig.EthernetMode == 4) else if (this.ParentForm.SystemConfig.EthernetMode == 4)
data = this.ParentForm.Protocol_OPT5(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData, this.ParentForm.CurrentProductItem); data = this.ParentForm.Protocol_OPT5(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData, this.ParentForm.CurrentProductItem);
else if(this.ParentForm.SystemConfig.EthernetMode == 5)
data = this.ParentForm.Protocol_OPT6(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData);
switch (this.ParentForm.SystemConfig.EthernetOperationMode) switch (this.ParentForm.SystemConfig.EthernetOperationMode)
{ {
@ -363,8 +359,6 @@ namespace INT69DC_7C.Forms
data = this.ParentForm.Protocol_OPT3(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData[lane - 1], lane, this.ParentForm.CurrentProductItem); data = this.ParentForm.Protocol_OPT3(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData[lane - 1], lane, this.ParentForm.CurrentProductItem);
else if (this.ParentForm.SystemConfig.EthernetMode == 4) else if (this.ParentForm.SystemConfig.EthernetMode == 4)
data = this.ParentForm.Protocol_OPT5(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData[lane - 1], lane, this.ParentForm.CurrentProductItem); data = this.ParentForm.Protocol_OPT5(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData[lane - 1], lane, this.ParentForm.CurrentProductItem);
else if (this.ParentForm.SystemConfig.EthernetMode == 5)
data = this.ParentForm.Protocol_OPT6(this.ParentForm.SystemConfig, this.ParentForm.CollectionWeightData[lane - 1], lane);
switch (this.ParentForm.SystemConfig.EthernetOperationMode) switch (this.ParentForm.SystemConfig.EthernetOperationMode)
{ {
@ -384,6 +378,158 @@ namespace INT69DC_7C.Forms
break; break;
} }
} }
private void UpdateProtocolDescriptionCom3Display()
{
if (this.comboBoxSerial3Mode.SelectedIndex == 1)
{
#region OPT1
this.labelProtocolDescriptionCOM3_1.Text = "Private use";
this.labelProtocolDescriptionCOM3_2.Text = "";
#endregion
}
else if (this.comboBoxSerial3Mode.SelectedIndex == 2)
{
#region OPT2
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3
|| this.ParentForm.SystemConfig.EquipmentMode == 7)
{
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],";
this.labelProtocolDescriptionCOM3_2.Text = "WEIGHT[6],ETX[1]";
}
}
else
{
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],";
this.labelProtocolDescriptionCOM3_2.Text = "WEIGHT[6],ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
}
#endregion
}
else if (this.comboBoxSerial3Mode.SelectedIndex == 3)
{
#region OPT3
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3
|| this.ParentForm.SystemConfig.EquipmentMode == 7)
{
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],";
this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],";
this.labelProtocolDescriptionCOM3_2.Text = "GRD[1],WEIGHT[6],ETX[1]";
}
}
else
{
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],";
this.labelProtocolDescriptionCOM3_2.Text = "GRD[1],WEIGHT[6],ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],";
this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
}
#endregion
}
else if (this.comboBoxSerial3Mode.SelectedIndex == 4)
{
#region OPT4
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3
|| this.ParentForm.SystemConfig.EquipmentMode == 7)
{
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionCOM3_2.Text = "{SIGN[1],WEIGHT[6]} * n,ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],";
this.labelProtocolDescriptionCOM3_2.Text = "SIGN[1],WEIGHT[6],ETX[1]";
}
}
else
{
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],";
this.labelProtocolDescriptionCOM3_2.Text = "SIGN[1],WEIGHT[6],ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionCOM3_2.Text = "{SIGN[1],WEIGHT[6]} * n,ETX[1]";
}
}
#endregion
}
else if (this.comboBoxSerial3Mode.SelectedIndex == 5)
{
#region Printer
this.labelProtocolDescriptionCOM3_1.Text = "NO[4], LANE[2], GRADE[1], WEIGHT[6],";
this.labelProtocolDescriptionCOM3_2.Text = "COUNT[9]";
#endregion
}
else if (this.comboBoxSerial3Mode.SelectedIndex == 6)
{
#region OPT5
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3
|| this.ParentForm.SystemConfig.EquipmentMode == 7)
{
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
}
}
else
{
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
}
#endregion
}
else
{
#region None
this.labelProtocolDescriptionCOM3_1.Text = "COM3 Protocol Description";
this.labelProtocolDescriptionCOM3_2.Text = "COM3 Protocol Description";
#endregion
}
}
private void LocalIPEnable(bool enable) private void LocalIPEnable(bool enable)
{ {
Color tempColor; Color tempColor;
@ -493,6 +639,35 @@ namespace INT69DC_7C.Forms
break; break;
} }
} }
private void UpdateDisplayFormat(int index)
{
if (index == 1)
{
#region OPT2
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
#endregion
}
else if (index == 2)
{
#region OPT3
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],";
this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
#endregion
}
else if (index == 4)
{
#region OPT5
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionEthernet_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
#endregion
}
else
{
this.labelProtocolDescriptionEthernet_1.Text = "";
this.labelProtocolDescriptionEthernet_2.Text = "";
}
}
public void DisplayLabelLocalPort(bool bValue) public void DisplayLabelLocalPort(bool bValue)
{ {
if (bValue == false) if (bValue == false)
@ -512,327 +687,6 @@ namespace INT69DC_7C.Forms
this.labelClientStatus.Text = value; this.labelClientStatus.Text = value;
} }
private void UpdateProtocolDescriptionEthernetDisplay(int index)
{
if (index == 1)
{
#region OPT2
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3
|| this.ParentForm.SystemConfig.EquipmentMode == 7)
{
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],";
this.labelProtocolDescriptionEthernet_2.Text = "WEIGHT[6],ETX[1]";
}
}
else
{
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],";
this.labelProtocolDescriptionEthernet_2.Text = "WEIGHT[6],ETX[1]";
}
else
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
}
#endregion
}
else if (index == 2)
{
#region OPT3
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3
|| this.ParentForm.SystemConfig.EquipmentMode == 7)
{
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],";
this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],";
this.labelProtocolDescriptionEthernet_2.Text = "GRD[1],WEIGHT[6],ETX[1]";
}
}
else
{
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],";
this.labelProtocolDescriptionEthernet_2.Text = "GRD[1],WEIGHT[6],ETX[1]";
}
else
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS[6],";
this.labelProtocolDescriptionEthernet_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
}
#endregion
}
else if (index == 4)
{
#region OPT5
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3
|| this.ParentForm.SystemConfig.EquipmentMode == 7)
{
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionEthernet_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionEthernet_2.Text = "TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
}
}
else
{
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionEthernet_2.Text = "TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
}
else
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionEthernet_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
}
#endregion
}
else if (index == 5)
{
#region OPT6
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3
|| this.ParentForm.SystemConfig.EquipmentMode == 7)
{
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],";
this.labelProtocolDescriptionEthernet_2.Text = "TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],";
this.labelProtocolDescriptionEthernet_2.Text = "TOTAL CNT[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]";
}
}
else
{
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],";
this.labelProtocolDescriptionEthernet_2.Text = "TOTAL CNT[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]";
}
else
{
this.labelProtocolDescriptionEthernet_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],";
this.labelProtocolDescriptionEthernet_2.Text = "TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
}
#endregion
}
else
{
this.labelProtocolDescriptionEthernet_1.Text = "";
this.labelProtocolDescriptionEthernet_2.Text = "";
}
}
private void UpdateProtocolDescriptionCom3Display()
{
if (this.comboBoxSerial3Mode.SelectedIndex == 1)
{
#region OPT1
this.labelProtocolDescriptionCOM3_1.Text = "Private use";
this.labelProtocolDescriptionCOM3_2.Text = "";
#endregion
}
else if (this.comboBoxSerial3Mode.SelectedIndex == 2)
{
#region OPT2
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3
|| this.ParentForm.SystemConfig.EquipmentMode == 7)
{
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],";
this.labelProtocolDescriptionCOM3_2.Text = "WEIGHT[6],ETX[1]";
}
}
else
{
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],GRD[1],";
this.labelProtocolDescriptionCOM3_2.Text = "WEIGHT[6],ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
}
#endregion
}
else if (this.comboBoxSerial3Mode.SelectedIndex == 3)
{
#region OPT3
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3
|| this.ParentForm.SystemConfig.EquipmentMode == 7)
{
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],";
this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],";
this.labelProtocolDescriptionCOM3_2.Text = "GRD[1],WEIGHT[6],ETX[1]";
}
}
else
{
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],LANE[2],";
this.labelProtocolDescriptionCOM3_2.Text = "GRD[1],WEIGHT[6],ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS[6],";
this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
}
#endregion
}
else if (this.comboBoxSerial3Mode.SelectedIndex == 4)
{
#region OPT4
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3
|| this.ParentForm.SystemConfig.EquipmentMode == 7)
{
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionCOM3_2.Text = "{SIGN[1],WEIGHT[6]} * n,ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],";
this.labelProtocolDescriptionCOM3_2.Text = "SIGN[1],WEIGHT[6],ETX[1]";
}
}
else
{
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],LANE[2],";
this.labelProtocolDescriptionCOM3_2.Text = "SIGN[1],WEIGHT[6],ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],";
this.labelProtocolDescriptionCOM3_2.Text = "{SIGN[1],WEIGHT[6]} * n,ETX[1]";
}
}
#endregion
}
else if (this.comboBoxSerial3Mode.SelectedIndex == 5)
{
#region Printer
this.labelProtocolDescriptionCOM3_1.Text = "NO[4], LANE[2], GRADE[1], WEIGHT[6],";
this.labelProtocolDescriptionCOM3_2.Text = "COUNT[9]";
#endregion
}
else if (this.comboBoxSerial3Mode.SelectedIndex == 6)
{
#region OPT5
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3
|| this.ParentForm.SystemConfig.EquipmentMode == 7)
{
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
}
}
else
{
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],LANE[2],GRD[1],WEIGHT[6],ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],";
this.labelProtocolDescriptionCOM3_2.Text = "TARE[6],{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
}
#endregion
}
else if (this.comboBoxSerial3Mode.SelectedIndex == 7)
{
#region OPT6
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3
|| this.ParentForm.SystemConfig.EquipmentMode == 7)
{
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],";
this.labelProtocolDescriptionCOM3_2.Text = "TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],";
this.labelProtocolDescriptionCOM3_2.Text = "TOTAL CNT[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]";
}
}
else
{
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],";
this.labelProtocolDescriptionCOM3_2.Text = "TOTAL CNT[9],LANE[2],GRD[1],WEIGHT[6],ETX[1]]";
}
else
{
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],";
this.labelProtocolDescriptionCOM3_2.Text = "TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]";
}
}
#endregion
}
else
{
#region None
this.labelProtocolDescriptionCOM3_1.Text = "COM3 Protocol Description";
this.labelProtocolDescriptionCOM3_2.Text = "COM3 Protocol Description";
#endregion
}
}
public void DisplayRefresh() public void DisplayRefresh()
{ {
string value = ""; string value = "";
@ -845,7 +699,7 @@ namespace INT69DC_7C.Forms
// Local IP // Local IP
this.UpdateLocalIPAddressDisplay(); this.UpdateLocalIPAddressDisplay();
// Format // Format
this.UpdateProtocolDescriptionEthernetDisplay(this.ParentForm.SystemConfig.EthernetMode); this.UpdateDisplayFormat(this.ParentForm.SystemConfig.EthernetMode);
// Setting Data visible // Setting Data visible
this.UpdateDisplaySettingData(this.ParentForm.SystemConfig.EthernetMode); this.UpdateDisplaySettingData(this.ParentForm.SystemConfig.EthernetMode);
@ -1094,7 +948,7 @@ namespace INT69DC_7C.Forms
this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig);
this.UpdateDisplaySettingData(this.ParentForm.SystemConfig.EthernetMode); this.UpdateDisplaySettingData(this.ParentForm.SystemConfig.EthernetMode);
this.UpdateProtocolDescriptionEthernetDisplay(this.ParentForm.SystemConfig.EthernetMode); this.UpdateDisplayFormat(this.ParentForm.SystemConfig.EthernetMode);
after = this.comboBoxMode.SelectedItem.ToString(); after = this.comboBoxMode.SelectedItem.ToString();
@ -1736,9 +1590,8 @@ namespace INT69DC_7C.Forms
} }
else if (this.ParentForm.SystemConfig.Serial3Mode == 6) else if (this.ParentForm.SystemConfig.Serial3Mode == 6)
{ {
#region OPT5
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3 if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3
|| this.ParentForm.SystemConfig.EquipmentMode == 7) || this.ParentForm.SystemConfig.EquipmentMode == 7)
{ {
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false) if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
this.ParentForm.SerialCH3OPT5(this.ParentForm.CollectionWeightData); this.ParentForm.SerialCH3OPT5(this.ParentForm.CollectionWeightData);
@ -1754,31 +1607,7 @@ namespace INT69DC_7C.Forms
this.ParentForm.SerialCH3OPT5(1, this.ParentForm.CollectionWeightData[0]); this.ParentForm.SerialCH3OPT5(1, this.ParentForm.CollectionWeightData[0]);
else else
this.ParentForm.SerialCH3OPT5(this.ParentForm.CollectionWeightData); this.ParentForm.SerialCH3OPT5(this.ParentForm.CollectionWeightData);
} }
#endregion
}
else if (this.ParentForm.SystemConfig.Serial3Mode == 7)
{
#region OPT6
if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3
|| this.ParentForm.SystemConfig.EquipmentMode == 7)
{
if (this.ParentForm.SystemConfig.IsIndividualTransmission == false)
this.ParentForm.SerialCH3OPT6(this.ParentForm.CollectionWeightData);
else
{
for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++)
this.ParentForm.SerialCH3OPT6(i + 1, this.ParentForm.CollectionWeightData[i]);
}
}
else if (this.ParentForm.SystemConfig.EquipmentMode == 2)
{
if (this.ParentForm.SystemConfig.IsIntegratedTransmission == false)
this.ParentForm.SerialCH3OPT6(1, this.ParentForm.CollectionWeightData[0]);
else
this.ParentForm.SerialCH3OPT6(this.ParentForm.CollectionWeightData);
}
#endregion
} }
} }
private void buttonSerialSave_Click(object sender, EventArgs e) private void buttonSerialSave_Click(object sender, EventArgs e)

View File

@ -143,7 +143,6 @@ namespace INT69DC_7C.Forms
private void DefaultSetting() private void DefaultSetting()
{ {
this.labelDisplayVer.Text = "12.3.0"; this.labelDisplayVer.Text = "12.3.0";
if(this.ParentForm.SystemConfig.EquipmentMode == 7) if(this.ParentForm.SystemConfig.EquipmentMode == 7)
this.labelTitleMainboardName.Text = "INT68M-2A"; this.labelTitleMainboardName.Text = "INT68M-2A";
else else

File diff suppressed because it is too large Load Diff

View File

@ -162,7 +162,7 @@
this.smartLabel6.LineSpacing = 0F; this.smartLabel6.LineSpacing = 0F;
this.smartLabel6.Location = new System.Drawing.Point(503, 340); this.smartLabel6.Location = new System.Drawing.Point(503, 340);
this.smartLabel6.Name = "smartLabel6"; this.smartLabel6.Name = "smartLabel6";
this.smartLabel6.Size = new System.Drawing.Size(450, 25); this.smartLabel6.Size = new System.Drawing.Size(420, 25);
this.smartLabel6.TabIndex = 233; this.smartLabel6.TabIndex = 233;
this.smartLabel6.Text = "※ Print ON : activate [Data Statistics]"; this.smartLabel6.Text = "※ Print ON : activate [Data Statistics]";
this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.smartLabel6.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;
@ -233,7 +233,7 @@
this.smartLabel3.LineSpacing = 0F; this.smartLabel3.LineSpacing = 0F;
this.smartLabel3.Location = new System.Drawing.Point(503, 387); this.smartLabel3.Location = new System.Drawing.Point(503, 387);
this.smartLabel3.Name = "smartLabel3"; this.smartLabel3.Name = "smartLabel3";
this.smartLabel3.Size = new System.Drawing.Size(450, 25); this.smartLabel3.Size = new System.Drawing.Size(420, 25);
this.smartLabel3.TabIndex = 230; this.smartLabel3.TabIndex = 230;
this.smartLabel3.Text = "※ Part11 ON : activate [Login], [Data backup], [Statistics]"; this.smartLabel3.Text = "※ Part11 ON : activate [Login], [Data backup], [Statistics]";
this.smartLabel3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left; this.smartLabel3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Left;

View File

@ -58,53 +58,17 @@ namespace INT69DC_7C.Forms
{ {
ImageDll images = new ImageDll(); ImageDll images = new ImageDll();
switch (this.ParentForm.SystemConfig.Language) if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.English)
{ {
case DataStore.LanguageID.Korean: this.labelTitle.Text = "Group Editor";
this.labelTitle.Text = "그룹 에디터";
break;
case DataStore.LanguageID.English:
this.labelTitle.Text = "Group Editor";
this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engSaveDisable)); this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackDisable));
this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engSaveDown)); this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackDown));
this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engSaveUp)); this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackUp));
this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackDisable)); }
this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackDown)); else
this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.engBackUp)); {
break; this.labelTitle.Text = "그룹 에디터";
case DataStore.LanguageID.Chinese:
this.labelTitle.Text = "组编辑";
this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnSaveDisable));
this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnSaveDown));
this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnSaveUp));
this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnBackDisable));
this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnBackDown));
this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.chnBackUp));
break;
case DataStore.LanguageID.Czech:
this.labelTitle.Text = "Group Editor";
this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeSaveDisable));
this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeSaveDown));
this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeSaveUp));
this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeBackDisable));
this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeBackDown));
this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.czeBackUp));
break;
case DataStore.LanguageID.German:
this.labelTitle.Text = "Group Editor";
this.buttonSave.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerSaveDisable));
this.buttonSave.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerSaveDown));
this.buttonSave.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerSaveUp));
this.buttonBack.DisableImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDisable));
this.buttonBack.DownImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackDown));
this.buttonBack.UpImage = new Bitmap(images.GetImage(ImageDll.ButtonImages.gerBackUp));
break;
default:
break;
} }
} }
private void DefaultSetting() private void DefaultSetting()

View File

@ -31,17 +31,6 @@
Serial callback 수정(string) Serial callback 수정(string)
serialRcvPacketStrMsgCallback serialRcvPacketStrMsgCallback
serialRcvErrPacketStrMsgCallback serialRcvErrPacketStrMsgCallback
@ Ver 12.2.2 by LSJ
- 2025.02.04
- Ver 12.2.1 Modify
- Framework : SmartX Framework V3.2.4(update: 2021.01.20)
- 영문 버그 수정
유저설정 - 테스트 설정 팝업 '입력' 한글 버그
유저그룹설정 - 저장 버튼 한글 버그
- 영테크팩 요청 프로토콜 추가
수량 데이터 추가(totalPass, totalNG, totalAll)
OPT6 : STX[1],ID[5],NO[4],PASS CNT[7],NG CNT[7],TOTAL CNT[9],{GRD[1],WEIGHT[6]} * n,ETX[1]
@ Ver 12.2.1 by LSJ @ Ver 12.2.1 by LSJ
- 2025.01.02 - 2025.01.02