8.9.0 -> 8.8.1 버젼 변경
parent
a026eef9c4
commit
c4e2f5693a
|
|
@ -680,6 +680,38 @@ namespace INT63DC_2C.Forms
|
||||||
this.labelEmptyWeight.Text = Helper.StringToDecimalPlaces(value, this.ParentForm.SystemConfig.DecimalPlaces);
|
this.labelEmptyWeight.Text = Helper.StringToDecimalPlaces(value, this.ParentForm.SystemConfig.DecimalPlaces);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void COM3ProtocolDescription()
|
||||||
|
{
|
||||||
|
if (this.comboBoxSerial3Mode.SelectedIndex == 1)
|
||||||
|
{
|
||||||
|
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],{GRD[1],WEIGHT[6]} * n,ETX[1]";
|
||||||
|
this.labelProtocolDescriptionCOM3_2.Text = "";
|
||||||
|
}
|
||||||
|
else if (this.comboBoxSerial3Mode.SelectedIndex == 2)
|
||||||
|
{
|
||||||
|
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6]";
|
||||||
|
this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
|
||||||
|
}
|
||||||
|
else if (this.comboBoxSerial3Mode.SelectedIndex == 3)
|
||||||
|
{
|
||||||
|
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6]";
|
||||||
|
this.labelProtocolDescriptionCOM3_2.Text = "PASS CNT[7],NG CNT[7],{GRD[1],WEIGHT[6]} * n,ETX[1]";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese)
|
||||||
|
{
|
||||||
|
this.labelProtocolDescriptionCOM3_1.Text = "COM3协议说明";
|
||||||
|
this.labelProtocolDescriptionCOM3_2.Text = "COM3协议说明";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
this.labelProtocolDescriptionCOM3_1.Text = "COM3 Protocol Description";
|
||||||
|
this.labelProtocolDescriptionCOM3_2.Text = "COM3 Protocol Description";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void UpdateZeroParameterRangeDisplay(DataStore.EquipmentStatus status, Collection<string> values)
|
public void UpdateZeroParameterRangeDisplay(DataStore.EquipmentStatus status, Collection<string> values)
|
||||||
{
|
{
|
||||||
if (values == null || values.Count == 0)
|
if (values == null || values.Count == 0)
|
||||||
|
|
@ -838,6 +870,8 @@ namespace INT63DC_2C.Forms
|
||||||
value = this.ParentForm.SystemConfig.EmptyWeight;
|
value = this.ParentForm.SystemConfig.EmptyWeight;
|
||||||
|
|
||||||
this.labelEmptyWeight.Text = Helper.StringToDecimalPlaces(value, this.ParentForm.SystemConfig.DecimalPlaces);
|
this.labelEmptyWeight.Text = Helper.StringToDecimalPlaces(value, this.ParentForm.SystemConfig.DecimalPlaces);
|
||||||
|
|
||||||
|
this.COM3ProtocolDescription();
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
@ -1079,34 +1113,7 @@ namespace INT63DC_2C.Forms
|
||||||
|
|
||||||
private void comboBoxSerial3_SelectedIndexChanged(object sender, EventArgs e)
|
private void comboBoxSerial3_SelectedIndexChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
if (this.comboBoxSerial3Mode.SelectedIndex == 1)
|
this.COM3ProtocolDescription();
|
||||||
{
|
|
||||||
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],{GRD[1],WEIGHT[6]} * n,ETX[1]";
|
|
||||||
this.labelProtocolDescriptionCOM3_2.Text = "";
|
|
||||||
}
|
|
||||||
else if (this.comboBoxSerial3Mode.SelectedIndex == 2)
|
|
||||||
{
|
|
||||||
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6]";
|
|
||||||
this.labelProtocolDescriptionCOM3_2.Text = "{GRD[1],WEIGHT[6]} * n,ETX[1]";
|
|
||||||
}
|
|
||||||
else if (this.comboBoxSerial3Mode.SelectedIndex == 3)
|
|
||||||
{
|
|
||||||
this.labelProtocolDescriptionCOM3_1.Text = "STX[1],ID[5],NO[4],UNDER[6],PASS[6],OVER[6],TARE[6]";
|
|
||||||
this.labelProtocolDescriptionCOM3_2.Text = "PASS CNT[7],NG CNT[7],{GRD[1],WEIGHT[6]} * n,ETX[1]";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese)
|
|
||||||
{
|
|
||||||
this.labelProtocolDescriptionCOM3_1.Text = "COM3协议说明";
|
|
||||||
this.labelProtocolDescriptionCOM3_2.Text = "COM3协议说明";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
this.labelProtocolDescriptionCOM3_1.Text = "COM3 Protocol Description";
|
|
||||||
this.labelProtocolDescriptionCOM3_2.Text = "COM3 Protocol Description";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.buttonSave3.Enabled = true;
|
this.buttonSave3.Enabled = true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -153,7 +153,7 @@ namespace INT63DC_2C.Forms
|
||||||
}
|
}
|
||||||
private void DefaultSetting()
|
private void DefaultSetting()
|
||||||
{
|
{
|
||||||
this.labelDisplayVer.Text = "8.9.0";
|
this.labelDisplayVer.Text = "8.8.1";
|
||||||
this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber;
|
this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber;
|
||||||
this.textBoxSerialNo.Location = new Point(395, 225);
|
this.textBoxSerialNo.Location = new Point(395, 225);
|
||||||
this.textBoxSerialNo.Visible = false;
|
this.textBoxSerialNo.Visible = false;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue