提交整体修改
This commit is contained in:
@ -29,9 +29,15 @@ namespace DHSoftware.Views
|
||||
sltName.SelectedIndexChanged += SltName_SelectedIndexChanged;
|
||||
button_ok.Click += Button_ok_Click;
|
||||
button_cancel.Click += Button_cancel_Click;
|
||||
sltDataType.SelectedIndexChanged += SltDataType_SelectedIndexChanged;
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void SltDataType_SelectedIndexChanged(object sender, IntEventArgs e)
|
||||
{
|
||||
iptValue.Visible = e.Value != 3;
|
||||
sltValue.Visible = e.Value == 3;
|
||||
}
|
||||
|
||||
private void SltName_SelectedIndexChanged(object sender, IntEventArgs e)
|
||||
@ -64,7 +70,15 @@ namespace DHSoftware.Views
|
||||
plcItem.Name = sltName.Text;
|
||||
plcItem.Address = iptAddress.Text;
|
||||
plcItem.Type = (EnumPLCDataType)sltDataType.SelectedIndex;
|
||||
plcItem.Value=iptValue.Text;
|
||||
if (sltDataType.SelectedIndex != 3)
|
||||
{
|
||||
plcItem.Value = iptValue.Text;
|
||||
}
|
||||
else
|
||||
{
|
||||
plcItem.Value = sltValue.Text;
|
||||
}
|
||||
|
||||
plcItem.StartExecute = sltEnable.SelectedIndex != 0;
|
||||
submit = true;
|
||||
this.Dispose();
|
||||
@ -76,15 +90,24 @@ namespace DHSoftware.Views
|
||||
foreach (var item in plcItemList)
|
||||
{
|
||||
sltName.Items.Add(item.Name);
|
||||
sltDataType.Items.Add(item.Type);
|
||||
}
|
||||
|
||||
var PLCDataTypes = Enum.GetNames(typeof(EnumPLCDataType));
|
||||
foreach (var name in PLCDataTypes)
|
||||
{
|
||||
sltDataType.Items.Add(name);
|
||||
}
|
||||
|
||||
var boolNames = Enum.GetNames(typeof(EnumBool));
|
||||
foreach (var name in boolNames)
|
||||
{
|
||||
sltEnable.Items.Add(name);
|
||||
}
|
||||
|
||||
var bool1Names = Enum.GetNames(typeof(EnumBool1));
|
||||
foreach (var name in bool1Names)
|
||||
{
|
||||
sltValue.Items.Add(name);
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(plcItem.Name))
|
||||
{
|
||||
@ -92,7 +115,14 @@ namespace DHSoftware.Views
|
||||
iptAddress.Text = plcItem.Address;
|
||||
sltDataType.SelectedIndex = (int)plcItem.Type;
|
||||
sltEnable.SelectedIndex = plcItem.StartExecute ? 1 : 0;
|
||||
iptValue.Text = plcItem.Value;
|
||||
if (sltDataType.SelectedIndex != 3)
|
||||
{
|
||||
iptValue.Text = plcItem.Value;
|
||||
}
|
||||
else
|
||||
{
|
||||
sltValue.SelectedIndex=plcItem.Value=="True"?1:0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user