增加了初始弹窗,但是没有成功
更改了CAN和LIN协调 更改了配置程序的名称顺序
This commit is contained in:
@@ -202,7 +202,7 @@ namespace CapMachine.Shared.Controls
|
||||
if (control != null && control.IsChecked == true)
|
||||
{
|
||||
AutoStateMsg = "手动";
|
||||
IsHandValueShow= "Visible";
|
||||
IsHandValueShow = "Visible";
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -215,7 +215,7 @@ namespace CapMachine.Shared.Controls
|
||||
|
||||
|
||||
|
||||
private string _IsHandValueShow= "Hidden";
|
||||
private string _IsHandValueShow = "Hidden";
|
||||
/// <summary>
|
||||
/// 手动设置的是值是否显示
|
||||
/// </summary>
|
||||
@@ -275,6 +275,42 @@ namespace CapMachine.Shared.Controls
|
||||
public static readonly DependencyProperty HandValueSVParameterProperty = DependencyProperty.Register("HandValueSVParameter", typeof(object), typeof(Meter), new PropertyMetadata(0));
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 手自给值 临时输入用参数 SV
|
||||
/// </summary>
|
||||
public object HandValueTempSVParameter
|
||||
{
|
||||
get
|
||||
{
|
||||
return (object)base.GetValue(Meter.HandValueTempSVParameterProperty);
|
||||
}
|
||||
set
|
||||
{
|
||||
base.SetValue(Meter.HandValueTempSVParameterProperty, value);
|
||||
}
|
||||
}
|
||||
public static readonly DependencyProperty HandValueTempSVParameterProperty = DependencyProperty.Register("HandValueTempSVParameter", typeof(object), typeof(Meter), new PropertyMetadata(0));
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 手自给值 临时输入用参数 MV
|
||||
/// </summary>
|
||||
public object HandValueTempMVParameter
|
||||
{
|
||||
get
|
||||
{
|
||||
return (object)base.GetValue(Meter.HandValueTempMVParameterProperty);
|
||||
}
|
||||
set
|
||||
{
|
||||
base.SetValue(Meter.HandValueTempMVParameterProperty, value);
|
||||
}
|
||||
}
|
||||
public static readonly DependencyProperty HandValueTempMVParameterProperty = DependencyProperty.Register("HandValueTempMVParameter", typeof(object), typeof(Meter), new PropertyMetadata(0));
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 手动给值回车检测
|
||||
/// </summary>
|
||||
@@ -291,7 +327,7 @@ namespace CapMachine.Shared.Controls
|
||||
if (double.TryParse(HandValueMV.Text, out double Result))
|
||||
{
|
||||
//把整个控件打包发送过去,无法访问Textbox的值,那么直接传送模型的数据给ViewModel
|
||||
HandValueCommand.Execute(new MeterChannelValue() { Name = MeterName, Value = Result,Type="MV" });
|
||||
HandValueCommand.Execute(new MeterChannelValue() { Name = MeterName, Value = Result, Type = "MV" });
|
||||
}
|
||||
|
||||
}
|
||||
@@ -309,6 +345,7 @@ namespace CapMachine.Shared.Controls
|
||||
{
|
||||
if (HandValueCommand != null && HandValueCommand.CanExecute(HandValueSVParameter))
|
||||
{
|
||||
//HandValueTempSVParameter = HandValueSVParameter;
|
||||
//HandValueParameter 此时无法更新到最新的值(旧值),可能因为RaisePropertyChanged在ViewModel上,不受这边的控制了,所以直接取控件的数据
|
||||
//HandValueParameter 没有使用,直接取控件的值,HandValueParameter作为初始值使用
|
||||
if (double.TryParse(HandValueSV.Text, out double Result))
|
||||
@@ -316,8 +353,9 @@ namespace CapMachine.Shared.Controls
|
||||
//把整个控件打包发送过去,无法访问Textbox的值,那么直接传送模型的数据给ViewModel
|
||||
HandValueCommand.Execute(new MeterChannelValue() { Name = MeterName, Value = Result, Type = "SV" });
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user