TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加SV和MV的模型数据

Browse Source
This commit is contained in:
Tyrone CT
2025-01-01 20:57:31 +08:00
parent f1cac2fb77
commit 6ff9103fa2
10 changed files with 287 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
CapMachine.Wpf/Models/LightChart/ChartRtSeries.cs
View File

@@ -40,12 +40,12 @@ namespace CapMachine.Wpf.Models.LightChart
AddSeries(configChart.Name!, configChart.ConfigChartYAxis!);
//初始化字符串
ValueEngValueStr = Math.Round(0.00, DecimalPoint).ToString();
LeftCursorEngValueStr = Math.Round(0.00, DecimalPoint).ToString();
RightCursorEngValueStr = Math.Round(0.00, DecimalPoint).ToString();
MinEngValueStr = Math.Round(0.00, DecimalPoint).ToString();
MaxEngValueStr = Math.Round(0.00, DecimalPoint).ToString();
AveEngValueStr = Math.Round(0.00, DecimalPoint).ToString();
ValueEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString();
LeftCursorEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString();
RightCursorEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString();
MinEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString();
MaxEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString();
AveEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString();
}
public ChartRtSeries(LightningChart Chart, ChartColor ChartColor, ObservableCollection<ChartRtSeries> listchartRtSeries, HistoryConfigChart configChart, ConfigService configService, short decimalPoint)
{
@@ -63,12 +63,12 @@ namespace CapMachine.Wpf.Models.LightChart
AddSeries(configChart.Name!, configChart.ConfigChartYAxis!);
//初始化字符串
ValueEngValueStr= Math.Round(0.00, DecimalPoint).ToString();
LeftCursorEngValueStr = Math.Round(0.00, DecimalPoint).ToString();
RightCursorEngValueStr = Math.Round(0.00, DecimalPoint).ToString();
MinEngValueStr = Math.Round(0.00, DecimalPoint).ToString();
MaxEngValueStr = Math.Round(0.00, DecimalPoint).ToString();
AveEngValueStr = Math.Round(0.00, DecimalPoint).ToString();
ValueEngPvValueStr= Math.Round(0.00, DecimalPoint).ToString();
LeftCursorEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString();
RightCursorEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString();
MinEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString();
MaxEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString();
AveEngPvValueStr = Math.Round(0.00, DecimalPoint).ToString();
}
@@ -98,18 +98,18 @@ namespace CapMachine.Wpf.Models.LightChart
{
_Value = value;
RaisePropertyChanged();
ValueEngValueStr = Math.Round(value, DecimalPoint).ToString();
ValueEngPvValueStr = Math.Round(value, DecimalPoint).ToString();
}
}
}
private string _ValueEngValueStr;
private string _ValueEngPvValueStr;
/// <summary>
/// ValueEngValueStr 值 工程值的字符串
/// ValueEngPvValueStr 值 工程值的字符串
/// </summary>
public string ValueEngValueStr
public string ValueEngPvValueStr
{
get { return _ValueEngValueStr; }
set { _ValueEngValueStr = value; RaisePropertyChanged(); }
get { return _ValueEngPvValueStr; }
set { _ValueEngPvValueStr = value; RaisePropertyChanged(); }
}
/// <summary>
@@ -171,18 +171,18 @@ namespace CapMachine.Wpf.Models.LightChart
{
_LeftCursorValue = value;
RaisePropertyChanged();
LeftCursorEngValueStr = Math.Round(value, DecimalPoint).ToString();
LeftCursorEngPvValueStr = Math.Round(value, DecimalPoint).ToString();
}
}
}
private string _LeftCursorEngValueStr;
private string _LeftCursorEngPvValueStr;
/// <summary>
/// LeftCursor 左游标值 工程值的字符串
/// </summary>
public string LeftCursorEngValueStr
public string LeftCursorEngPvValueStr
{
get { return _LeftCursorEngValueStr; }
set { _LeftCursorEngValueStr = value; RaisePropertyChanged(); }
get { return _LeftCursorEngPvValueStr; }
set { _LeftCursorEngPvValueStr = value; RaisePropertyChanged(); }
}
@@ -200,18 +200,18 @@ namespace CapMachine.Wpf.Models.LightChart
{
_RightCursorValue = value;
RaisePropertyChanged();
RightCursorEngValueStr = Math.Round(value, DecimalPoint).ToString();
RightCursorEngPvValueStr = Math.Round(value, DecimalPoint).ToString();
}
}
}
private string _RightCursorEngValueStr;
private string _RightCursorEngPvValueStr;
/// <summary>
/// RightCursor 右游标值 工程值的字符串
/// </summary>
public string RightCursorEngValueStr
public string RightCursorEngPvValueStr
{
get { return _RightCursorEngValueStr; }
set { _RightCursorEngValueStr = value; RaisePropertyChanged(); }
get { return _RightCursorEngPvValueStr; }
set { _RightCursorEngPvValueStr = value; RaisePropertyChanged(); }
}
@@ -229,18 +229,18 @@ namespace CapMachine.Wpf.Models.LightChart
{
_MinValue = value;
RaisePropertyChanged();
MinEngValueStr = Math.Round(value, DecimalPoint).ToString();
MinEngPvValueStr = Math.Round(value, DecimalPoint).ToString();
}
}
}
private string _MinEngValueStr;
private string _MinEngPvValueStr;
/// <summary>
/// Min 最小值 工程值的字符串
/// </summary>
public string MinEngValueStr
public string MinEngPvValueStr
{
get { return _MinEngValueStr; }
set { _MinEngValueStr = value; RaisePropertyChanged(); }
get { return _MinEngPvValueStr; }
set { _MinEngPvValueStr = value; RaisePropertyChanged(); }
}
private double _MaxValue;
@@ -256,18 +256,18 @@ namespace CapMachine.Wpf.Models.LightChart
{
_MaxValue = value;
RaisePropertyChanged();
MaxEngValueStr = Math.Round(value, DecimalPoint).ToString();
MaxEngPvValueStr = Math.Round(value, DecimalPoint).ToString();
}
}
}
private string _MaxEngValueStr;
private string _MaxEngPvValueStr;
/// <summary>
/// Max 最大值 工程值的字符串
/// </summary>
public string MaxEngValueStr
public string MaxEngPvValueStr
{
get { return _MaxEngValueStr; }
set { _MaxEngValueStr = value; RaisePropertyChanged(); }
get { return _MaxEngPvValueStr; }
set { _MaxEngPvValueStr = value; RaisePropertyChanged(); }
}
@@ -284,18 +284,18 @@ namespace CapMachine.Wpf.Models.LightChart
{
_AveValue = value;
RaisePropertyChanged();
AveEngValueStr = Math.Round(value, DecimalPoint).ToString();
AveEngPvValueStr = Math.Round(value, DecimalPoint).ToString();
}
}
}
private string _AveEngValueStr;
private string _AveEngPvValueStr;
/// <summary>
/// Ave 平均值 工程值的字符串
/// </summary>
public string AveEngValueStr
public string AveEngPvValueStr
{
get { return _AveEngValueStr; }
set { _AveEngValueStr = value; RaisePropertyChanged(); }
get { return _AveEngPvValueStr; }
set { _AveEngPvValueStr = value; RaisePropertyChanged(); }
}
#endregion

15
CapMachine.Wpf/Models/Tag/ITag.cs
View File

@@ -34,12 +34,12 @@ namespace CapMachine.Wpf.Models.Tag
/// <summary>
/// 工程值 PV
/// </summary>
double EngValue { get; set; }
double EngPvValue { get; set; }
/// <summary>
/// 工程值的字符串 PV
/// </summary>
string EngValueStr { get; set; }
string EngPvValueStr { get; set; }
/// <summary>
/// 工程值 Sv
@@ -51,6 +51,17 @@ namespace CapMachine.Wpf.Models.Tag
/// </summary>
string EngSvValueStr { get; set; }
/// <summary>
/// 工程值 Mv
/// </summary>
double EngMvValue { get; set; }
/// <summary>
/// 工程值的字符串 Mv
/// </summary>
string EngMvValueStr { get; set; }
/// <summary>
/// MV
/// </summary>

55
CapMachine.Wpf/Models/Tag/Tag.cs
View File

@@ -177,16 +177,16 @@ namespace CapMachine.Wpf.Models.Tag
set { _AutoHandState = value; RaisePropertyChanged(); }
}
private double _EngSVValue;
private double _EngSvValue;
/// <summary>
/// 工程值 SV
/// </summary>
public double EngSVValue
public double EngSvValue
{
get { return _EngSVValue; }
get { return _EngSvValue; }
set
{
_EngSVValue = value;
_EngSvValue = value;
if (TagValue.IsShow)
{
RaisePropertyChanged();
@@ -206,32 +206,61 @@ namespace CapMachine.Wpf.Models.Tag
}
private double _EngValue;
private double _EngPvValue;
/// <summary>
/// 工程值 PV
/// </summary>
public double EngValue
public double EngPvValue
{
get { return _EngValue; }
get { return _EngPvValue; }
set
{
_EngValue = value;
_EngPvValue = value;
if (TagValue.IsShow)
{
RaisePropertyChanged();
}
EngValueStr = Math.Round(value, DecimalPoint).ToString();
EngPvValueStr = Math.Round(value, DecimalPoint).ToString();
}
}
private string _EngValueStr;
private string _EngPvValueStr;
/// <summary>
/// 工程值的字符串
/// </summary>
public string EngValueStr
public string EngPvValueStr
{
get { return _EngValueStr; }
set { _EngValueStr = value; RaisePropertyChanged(); }
get { return _EngPvValueStr; }
set { _EngPvValueStr = value; RaisePropertyChanged(); }
}
private double _EngMvValue;
/// <summary>
/// 工程值 MV
/// </summary>
public double EngMvValue
{
get { return _EngMvValue; }
set
{
_EngMvValue = value;
if (TagValue.IsShow)
{
RaisePropertyChanged();
}
EngMvValueStr = Math.Round(value, DecimalPoint).ToString();
}
}
private string _EngMvValueStr;
/// <summary>
/// 工程值的字符串 MV
/// </summary>
public string EngMvValueStr
{
get { return _EngMvValueStr; }
set { _EngMvValueStr = value; RaisePropertyChanged(); }
}

2
CapMachine.Wpf/Services/DataRecordService.cs
View File

@@ -434,7 +434,7 @@ namespace CapMachine.Wpf.Services
//CycleTimer.Stop(); //先关闭定时器
var DataInfo = MachineRtDataService.TagManger.DicTags
.ToDictionary(kvp => kvp.Key, kvp => (object)kvp.Value.EngValue);
.ToDictionary(kvp => kvp.Key, kvp => (object)kvp.Value.EngPvValue);
DataInfo.Add("创建时间", DateTime.Now);
var RecordData = new RecordChannelData()

18
CapMachine.Wpf/Services/MachineRtDataService.cs
View File

@@ -181,7 +181,7 @@ namespace CapMachine.Wpf.Services
Unit = "rpm",
PVAddress = "VW100",//地址信息
SVAddress = "VW200",
MVAddress = "VW250",
MVAddress = "VW242",
IsMeter = true,
AutoHandSwitchAddress = "VW240",
Precision = 1,
@@ -201,7 +201,7 @@ namespace CapMachine.Wpf.Services
Unit = "MpaA",
PVAddress = "VW102",//地址信息
SVAddress = "VW202",
MVAddress = "VW252",
MVAddress = "VW246",
IsMeter = true,
AutoHandSwitchAddress = "VW244",
Precision = 1000,
@@ -221,7 +221,7 @@ namespace CapMachine.Wpf.Services
Unit = "MpaA",
PVAddress = "VW104",//地址信息
SVAddress = "VW204",
MVAddress = "VW254",
MVAddress = "VW250",
IsMeter = true,
AutoHandSwitchAddress = "VW248",
Precision = 1000,
@@ -241,7 +241,7 @@ namespace CapMachine.Wpf.Services
Unit = "℃",
PVAddress = "VW106",//地址信息
SVAddress = "VW206",
MVAddress = "VW256",
MVAddress = "VW254",
IsMeter = true,
AutoHandSwitchAddress = "VW252",
Precision = 10,
@@ -281,7 +281,7 @@ namespace CapMachine.Wpf.Services
Unit = "℃",
PVAddress = "VW110",//地址信息
SVAddress = "VW210",
MVAddress = "VW260",
MVAddress = "VW262",
IsMeter = true,
AutoHandSwitchAddress = "VW260",
Precision = 10,
@@ -954,7 +954,7 @@ namespace CapMachine.Wpf.Services
{
//case ConstShortType:
// //TagManger.GetTagInfoValueByName<short>(itemTag.Value.Name)!.Value = SiemensDrive.ReadInt16(itemTag.Value.Address).Content;
// TagManger.GetTagByName<short>(itemTag.Value.Name).EngValue = TagManger.GetTagInfoValueByName<short>(itemTag.Value.Name)!.Value * 1.0 / TagManger.GetTagByName<short>(itemTag.Value.Name)!.Precision;
// TagManger.GetTagByName<short>(itemTag.Value.Name).EngPvValue = TagManger.GetTagInfoValueByName<short>(itemTag.Value.Name)!.Value * 1.0 / TagManger.GetTagByName<short>(itemTag.Value.Name)!.Precision;
// break;
case ConstShortType:
@@ -962,7 +962,7 @@ namespace CapMachine.Wpf.Services
////仿真数据
//TagManger.GetTagInfoValueByName<short>(itemTag.Value.Name)!.Value = (short)Random.Next(1, 100);
//TagManger.GetTagByName<short>(itemTag.Value.Name).EngValue = (short)Random.Next(1, 100) * 1.0 / TagManger.GetTagByName<short>(itemTag.Value.Name)!.Precision;
//TagManger.GetTagByName<short>(itemTag.Value.Name).EngPvValue = (short)Random.Next(1, 100) * 1.0 / TagManger.GetTagByName<short>(itemTag.Value.Name)!.Precision;
//LinkState = false;
//PLC 数据
@@ -972,7 +972,7 @@ namespace CapMachine.Wpf.Services
if (OperateResultShort.IsSuccess)
{
TagManger.GetTagInfoValueByName<short>(itemTag.Value.Name)!.Value = SiemensDrive.ReadInt16(itemTag.Value.PVAddress).Content;
TagManger.GetTagByName<short>(itemTag.Value.Name).EngValue = TagManger.GetTagInfoValueByName<short>(itemTag.Value.Name)!.Value * 1.0 / TagManger.GetTagByName<short>(itemTag.Value.Name)!.Precision;
TagManger.GetTagByName<short>(itemTag.Value.Name).EngPvValue = TagManger.GetTagInfoValueByName<short>(itemTag.Value.Name)!.Value * 1.0 / TagManger.GetTagByName<short>(itemTag.Value.Name)!.Precision;
LinkState = true;
}
else
@@ -987,7 +987,7 @@ namespace CapMachine.Wpf.Services
if (OperateResultSVShort.IsSuccess)
{
TagManger.GetTagInfoValueByName<short>(itemTag.Value.Name)!.Value = OperateResultSVShort.Content;
TagManger.GetTagByName<short>(itemTag.Value.Name).EngSVValue = TagManger.GetTagInfoValueByName<short>(itemTag.Value.Name)!.Value * 1.0 / TagManger.GetTagByName<short>(itemTag.Value.Name)!.Precision;
TagManger.GetTagByName<short>(itemTag.Value.Name).EngSvValue = TagManger.GetTagInfoValueByName<short>(itemTag.Value.Name)!.Value * 1.0 / TagManger.GetTagByName<short>(itemTag.Value.Name)!.Precision;
LinkState = true;
}
else

16
CapMachine.Wpf/Services/PPCService.cs
View File

@@ -195,21 +195,21 @@ namespace CapMachine.Wpf.Services
IRefProp64.WMOLdll(x, ref wm);
//p = Convert.ToDouble(textBox2.Text) * 1000.0;//textBox2 Comp.吸气压力（Mpa）
p = (InhPressTag.EngValue) * 1000.0;//textBox2 Comp.吸气压力（Mpa）
p = (InhPressTag.EngPvValue) * 1000.0;//textBox2 Comp.吸气压力（Mpa）
kph = 1;
p1 = (TxvFrPressTag.EngValue) * 1000.0;//textBox3 Evap.膨胀阀前压力（Mpa）
p1 = (TxvFrPressTag.EngPvValue) * 1000.0;//textBox3 Evap.膨胀阀前压力（Mpa）
//p1 = Convert.ToDouble(textBox3.Text) * 1000.0;//textBox3 Evap.膨胀阀前压力（Mpa）
IRefProp64.SATPdll(ref p, x, ref kph, ref te, ref Dl, ref Dv, xliq, xvap, ref iErr, ref herr, ref herrLen);
if (iErr == 0)
Superheat = InhTempTag.EngValue - (te - 273.15);
Superheat = InhTempTag.EngPvValue - (te - 273.15);
//textBox5.Text = String.Format("{0:n4}", Convert.ToDouble(textBox1.Text) - (te - 273.15));//textBox1 Comp.吸气温度（℃）
else
Superheat = 0;
IRefProp64.SATPdll(ref p1, x, ref kph, ref te1, ref Dl, ref Dv, xliq, xvap, ref iErr, ref herr, ref herrLen);
if (iErr == 0)
Subcool = TxvFrTempTag.EngValue - (te1 - 273.15);//textBox4 Evap.膨胀阀前温度（℃）
Subcool = TxvFrTempTag.EngPvValue - (te1 - 273.15);//textBox4 Evap.膨胀阀前温度（℃）
//GuoLengDu = (te1 - 273.15) - ListKRLogCellValue.Find(a => a.Name == "膨胀阀前温度").Value;//textBox4 Evap.膨胀阀前温度（℃）
//textBox6.Text = String.Format("{0:n4}", Convert.ToDouble(textBox4.Text) - (te1 - 273.15));//textBox4 Evap.膨胀阀前温度（℃）
else
@@ -294,11 +294,11 @@ namespace CapMachine.Wpf.Services
//p = Convert.ToDouble(textBox2.Text) * 1000.0;//textBox2 Comp.吸气压力（Mpa）
//p = (ListRtKPMeter.Find(a => a.MeterName == "吸入压力").RtPV) * 1000.0;//textBox2 Comp.吸气压力（Mpa）
p = (InhPressTag.EngValue) * 1000.0;//textBox2 Comp.吸气压力（Mpa）
p = (InhPressTag.EngPvValue) * 1000.0;//textBox2 Comp.吸气压力（Mpa）
kph = 1;
//p1 = (ListKRLogCellValue.Find(a => a.Name == "膨胀阀前压力").Value) * 1000.0;//textBox3 Evap.膨胀阀前压力（Mpa）
p1 = (TxvFrPressTag.EngValue) * 1000.0;//textBox3 Evap.膨胀阀前压力（Mpa）
p1 = (TxvFrPressTag.EngPvValue) * 1000.0;//textBox3 Evap.膨胀阀前压力（Mpa）
//p1 = Convert.ToDouble(textBox3.Text) * 1000.0;//textBox3 Evap.膨胀阀前压力（Mpa）
@@ -307,7 +307,7 @@ namespace CapMachine.Wpf.Services
if (iErr == 0)
//GuoReDu = ListRtKPMeter.Find(a => a.MeterName == "吸入温度").RtPV - (te - 273.15);
Superheat = InhTempTag.EngValue - (te - 273.15);
Superheat = InhTempTag.EngPvValue - (te - 273.15);
//textBox5.Text = String.Format("{0:n4}", Convert.ToDouble(textBox1.Text) - (te - 273.15));//textBox1 Comp.吸气温度（℃）
else
Superheat = 0;
@@ -315,7 +315,7 @@ namespace CapMachine.Wpf.Services
IRefProp64.SATPdll(ref p1, x, ref kph, ref te1, ref Dl, ref Dv, xliq, xvap, ref iErr, ref herr, ref herrLen);
if (iErr == 0)
//GuoLengDu = ListKRLogCellValue.Find(a => a.Name == "膨胀阀前温度").Value - (te1 - 273.15);//textBox4 Evap.膨胀阀前温度（℃）
Subcool = TxvFrTempTag.EngValue - (te1 - 273.15);//textBox4 Evap.膨胀阀前温度（℃）
Subcool = TxvFrTempTag.EngPvValue - (te1 - 273.15);//textBox4 Evap.膨胀阀前温度（℃）
//textBox6.Text = String.Format("{0:n4}", Convert.ToDouble(textBox4.Text) - (te1 - 273.15));//textBox4 Evap.膨胀阀前温度（℃）

96
CapMachine.Wpf/Views/HistoryDataView.xaml
View File

@@ -658,7 +658,7 @@
<GridView ColumnHeaderContainerStyle="{StaticResource myHeaderStyle1}">
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -686,23 +686,23 @@
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
Header="左游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
Header="右游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MinEngValueStr}"
DisplayMemberBinding="{Binding MinEngPvValueStr}"
Header="最小值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MaxEngValueStr}"
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
Header="最大值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding AveEngValueStr}"
DisplayMemberBinding="{Binding AveEngPvValueStr}"
Header="平均值" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -753,7 +753,7 @@
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -781,23 +781,23 @@
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
Header="左游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
Header="右游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MinEngValueStr}"
DisplayMemberBinding="{Binding MinEngPvValueStr}"
Header="最小值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MaxEngValueStr}"
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
Header="最大值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding AveEngValueStr}"
DisplayMemberBinding="{Binding AveEngPvValueStr}"
Header="平均值" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -912,7 +912,7 @@
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -940,23 +940,23 @@
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
Header="左游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
Header="右游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MinEngValueStr}"
DisplayMemberBinding="{Binding MinEngPvValueStr}"
Header="最小值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MaxEngValueStr}"
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
Header="最大值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding AveEngValueStr}"
DisplayMemberBinding="{Binding AveEngPvValueStr}"
Header="平均值" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -1071,7 +1071,7 @@
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -1099,23 +1099,23 @@
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
Header="左游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
Header="右游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MinEngValueStr}"
DisplayMemberBinding="{Binding MinEngPvValueStr}"
Header="最小值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MaxEngValueStr}"
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
Header="最大值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding AveEngValueStr}"
DisplayMemberBinding="{Binding AveEngPvValueStr}"
Header="平均值" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -1230,7 +1230,7 @@
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -1258,23 +1258,23 @@
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
Header="左游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
Header="右游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MinEngValueStr}"
DisplayMemberBinding="{Binding MinEngPvValueStr}"
Header="最小值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MaxEngValueStr}"
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
Header="最大值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding AveEngValueStr}"
DisplayMemberBinding="{Binding AveEngPvValueStr}"
Header="平均值" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -1389,7 +1389,7 @@
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -1417,23 +1417,23 @@
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
Header="左游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
Header="右游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MinEngValueStr}"
DisplayMemberBinding="{Binding MinEngPvValueStr}"
Header="最小值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MaxEngValueStr}"
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
Header="最大值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding AveEngValueStr}"
DisplayMemberBinding="{Binding AveEngPvValueStr}"
Header="平均值" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -1548,7 +1548,7 @@
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -1576,23 +1576,23 @@
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
Header="左游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
Header="右游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MinEngValueStr}"
DisplayMemberBinding="{Binding MinEngPvValueStr}"
Header="最小值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MaxEngValueStr}"
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
Header="最大值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding AveEngValueStr}"
DisplayMemberBinding="{Binding AveEngPvValueStr}"
Header="平均值" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -1707,7 +1707,7 @@
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -1735,23 +1735,23 @@
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
Header="左游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
Header="右游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MinEngValueStr}"
DisplayMemberBinding="{Binding MinEngPvValueStr}"
Header="最小值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MaxEngValueStr}"
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
Header="最大值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding AveEngValueStr}"
DisplayMemberBinding="{Binding AveEngPvValueStr}"
Header="平均值" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->

34
CapMachine.Wpf/Views/MonitorView.xaml
View File

@@ -169,7 +169,7 @@
AutoHandState="False"
HandValueCommand="{Binding Source={StaticResource Proxy}, Path=Data.HandValueCmd}"
MeterName="{Binding NameNoUnit}"
PVValue="{Binding EngValue}"
PVValue="{Binding EngPvValue}"
SVValue="{Binding EngSVValue}"
Unit="{Binding Unit}" />
</DataTemplate>
@@ -924,7 +924,7 @@
VerticalAlignment="Top"
CellTitle="转速"
CellUnit="{Binding SpeedTag.Unit}"
CellValue="{Binding SpeedTag.EngValueStr}" />
CellValue="{Binding SpeedTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="301"
Canvas.Top="120"
@@ -932,7 +932,7 @@
VerticalAlignment="Center"
CellTitle="电压"
CellUnit="{Binding ComCapBusVolTag.Unit}"
CellValue="{Binding ComCapBusVolTag.EngValueStr}" />
CellValue="{Binding ComCapBusVolTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="301"
Canvas.Top="170"
@@ -940,7 +940,7 @@
VerticalAlignment="Center"
CellTitle="电流"
CellUnit="{Binding ComCapBusCurTag.Unit}"
CellValue="{Binding ComCapBusCurTag.EngValueStr}" />
CellValue="{Binding ComCapBusCurTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="301"
Canvas.Top="220"
@@ -948,7 +948,7 @@
VerticalAlignment="Center"
CellTitle="功率"
CellUnit="{Binding ComCapPwTag.Unit}"
CellValue="{Binding ComCapPwTag.EngValueStr}" />
CellValue="{Binding ComCapPwTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="105"
Canvas.Top="147"
@@ -956,7 +956,7 @@
VerticalAlignment="Center"
CellTitle="排气口压力"
CellUnit="{Binding ExPressTag.Unit}"
CellValue="{Binding ExPressTag.EngValueStr}" />
CellValue="{Binding ExPressTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="106"
Canvas.Top="193"
@@ -964,7 +964,7 @@
VerticalAlignment="Center"
CellTitle="排气口温度"
CellUnit="{Binding ExTempTag.Unit}"
CellValue="{Binding ExTempTag.EngValueStr}" />
CellValue="{Binding ExTempTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="105"
Canvas.Top="292"
@@ -972,7 +972,7 @@
VerticalAlignment="Center"
CellTitle="吸气口压力"
CellUnit="{Binding InhPressTag.Unit}"
CellValue="{Binding InhPressTag.EngValueStr}" />
CellValue="{Binding InhPressTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="106"
Canvas.Top="338"
@@ -980,7 +980,7 @@
VerticalAlignment="Center"
CellTitle="吸气口温度"
CellUnit="{Binding InhTempTag.Unit}"
CellValue="{Binding InhTempTag.EngValueStr}" />
CellValue="{Binding InhTempTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="551"
Canvas.Top="272"
@@ -996,7 +996,7 @@
VerticalAlignment="Center"
CellTitle="阀前温度"
CellUnit="{Binding TxvFrTempTag.Unit}"
CellValue="{Binding TxvFrTempTag.EngValueStr}" />
CellValue="{Binding TxvFrTempTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="1003"
Canvas.Top="239"
@@ -1004,7 +1004,7 @@
VerticalAlignment="Center"
CellTitle="阀前压力"
CellUnit="{Binding TxvFrPressTag.Unit}"
CellValue="{Binding TxvFrPressTag.EngValueStr}" />
CellValue="{Binding TxvFrPressTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="635"
Canvas.Top="420"
@@ -1012,7 +1012,7 @@
VerticalAlignment="Top"
CellTitle="吸气混合器温度"
CellUnit="{Binding OS2TempTag.Unit}"
CellValue="{Binding OS2TempTag.EngValueStr}" />
CellValue="{Binding OS2TempTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="1190"
Canvas.Top="357"
@@ -1020,7 +1020,7 @@
VerticalAlignment="Center"
CellTitle="冷凝器进水温"
CellUnit="{Binding Cond1TempTag.Unit}"
CellValue="{Binding Cond1TempTag.EngValueStr}" />
CellValue="{Binding Cond1TempTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="1074"
Canvas.Top="357"
@@ -1028,7 +1028,7 @@
VerticalAlignment="Center"
CellTitle="冷凝器出水温"
CellUnit="{Binding CondInTempTag.Unit}"
CellValue="{Binding CondInTempTag.EngValueStr}" />
CellValue="{Binding CondInTempTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="1217"
Canvas.Top="136"
@@ -1079,12 +1079,12 @@
<ListView.View>
<GridView ColumnHeaderContainerStyle="{StaticResource myHeaderStyle1}">
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding EngValueStr}" Header="实时值" />
<!-- DisplayMemberBinding="{Binding EngValue, Converter={StaticResource ValuePrecisionConverter}, ConverterParameter={Binding Path=DecimalPoint}}" -->
<GridViewColumn DisplayMemberBinding="{Binding EngPvValueStr}" Header="实时值" />
<!-- DisplayMemberBinding="{Binding EngPvValue, Converter={StaticResource ValuePrecisionConverter}, ConverterParameter={Binding Path=DecimalPoint}}" -->
<!--<GridViewColumn Header="实时值">
<GridViewColumn.DisplayMemberBinding>
<MultiBinding Converter="{StaticResource ValuePrecisionConverter}">
<Binding Path="EngValue" />
<Binding Path="EngPvValue" />
<Binding Path="DecimalPoint" />
</MultiBinding>
</GridViewColumn.DisplayMemberBinding>

82
CapMachine.Wpf/Views/ProConfigView.xaml
View File

@@ -178,7 +178,7 @@
BorderBrush="Black"
BorderThickness="1">
<StackPanel>
<StackPanel>
<StackPanel Margin="0,3,0,0">
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
<Button
Width="50"
@@ -225,7 +225,10 @@
</StackPanel>
</StackPanel>
<Border Margin="2,5" Background="Gray">
<Border
Margin="2,5"
Background="Gray"
CornerRadius="3">
<TextBlock
FontSize="18"
Foreground="White"
@@ -335,17 +338,23 @@
VerticalAlignment="Center"
FontSize="20"
Text="工况名称:" />
<TextBox
Width="500"
<Border
Margin="2"
VerticalAlignment="Center"
Background="MediumSeaGreen"
Background="LightSlateGray"
BorderThickness="1"
FontSize="18"
Foreground="White"
IsReadOnly="True"
Text="{Binding SelectedProgramSeg.Name}"
TextAlignment="Center" />
CornerRadius="3">
<TextBox
Width="500"
Margin="2"
VerticalAlignment="Center"
BorderThickness="0"
FontSize="18"
Foreground="White"
IsReadOnly="True"
Text="{Binding SelectedProgramSeg.Name}"
TextAlignment="Center" />
</Border>
<TextBlock
Margin="5,0,0,0"
@@ -359,18 +368,22 @@
VerticalAlignment="Center"
FontSize="20"
Text="总循环次数:" />
<TextBox
Width="80"
<Border
Margin="2"
VerticalAlignment="Center"
Background="MediumSeaGreen"
Background="LightSlateGray"
BorderThickness="1"
FontSize="18"
Foreground="White"
IsReadOnly="True"
Text="{Binding SelectedProgramSeg.ProRepeat}"
TextAlignment="Center" />
CornerRadius="3">
<TextBox
Width="80"
Margin="2"
VerticalAlignment="Center"
BorderThickness="0"
FontSize="18"
Foreground="White"
IsReadOnly="True"
Text="{Binding SelectedProgramSeg.ProRepeat}"
TextAlignment="Center" />
</Border>
</StackPanel>
</Border>
@@ -408,17 +421,21 @@
FontSize="18"
Text="选中序号"
TextAlignment="Center" />
<TextBox
Width="60"
Margin="5,2"
VerticalAlignment="Center"
Background="MediumSeaGreen"
<Border
Margin="2"
Background="LightSlateGray"
BorderThickness="1"
FontSize="18"
Foreground="White"
Text="{Binding ProStepProNo}"
TextAlignment="Center" />
CornerRadius="3">
<TextBox
Width="60"
Margin="2"
VerticalAlignment="Center"
BorderThickness="0"
FontSize="18"
Foreground="White"
Text="{Binding ProStepProNo}"
TextAlignment="Center" />
</Border>
<!--<TextBlock
VerticalAlignment="Center"
FontSize="16"
@@ -2140,7 +2157,8 @@
Margin="-5,-6"
Background="LimeGreen"
BorderBrush="Blue"
BorderThickness="1">
BorderThickness="1"
CornerRadius="3">
<StackPanel>
<TextBlock
FontSize="16"

112
CapMachine.Wpf/Views/RealTimeChartView.xaml
View File

@@ -566,8 +566,8 @@
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding ValueEngValueStr}" Header="实时数据" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding ValueEngPvValueStr}" Header="实时数据" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
</GridView>
@@ -594,23 +594,23 @@
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
Header="左游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
Header="右游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MinEngValueStr}"
DisplayMemberBinding="{Binding MinEngPvValueStr}"
Header="最小值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MaxEngValueStr}"
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
Header="最大值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding AveEngValueStr}"
DisplayMemberBinding="{Binding AveEngPvValueStr}"
Header="平均值" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -725,8 +725,8 @@
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding ValueEngValueStr}" Header="实时数据" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding ValueEngPvValueStr}" Header="实时数据" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
</GridView>
@@ -753,23 +753,23 @@
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
Header="左游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
Header="右游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MinEngValueStr}"
DisplayMemberBinding="{Binding MinEngPvValueStr}"
Header="最小值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MaxEngValueStr}"
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
Header="最大值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding AveEngValueStr}"
DisplayMemberBinding="{Binding AveEngPvValueStr}"
Header="平均值" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -884,8 +884,8 @@
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding ValueEngValueStr}" Header="实时数据" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding ValueEngPvValueStr}" Header="实时数据" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
</GridView>
@@ -912,23 +912,23 @@
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
Header="左游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
Header="右游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MinEngValueStr}"
DisplayMemberBinding="{Binding MinEngPvValueStr}"
Header="最小值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MaxEngValueStr}"
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
Header="最大值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding AveEngValueStr}"
DisplayMemberBinding="{Binding AveEngPvValueStr}"
Header="平均值" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -1043,8 +1043,8 @@
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding ValueEngValueStr}" Header="实时数据" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding ValueEngPvValueStr}" Header="实时数据" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
</GridView>
@@ -1071,23 +1071,23 @@
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
Header="左游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
Header="右游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MinEngValueStr}"
DisplayMemberBinding="{Binding MinEngPvValueStr}"
Header="最小值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MaxEngValueStr}"
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
Header="最大值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding AveEngValueStr}"
DisplayMemberBinding="{Binding AveEngPvValueStr}"
Header="平均值" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -1202,8 +1202,8 @@
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding ValueEngValueStr}" Header="实时数据" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding ValueEngPvValueStr}" Header="实时数据" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
</GridView>
@@ -1230,23 +1230,23 @@
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
Header="左游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
Header="右游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MinEngValueStr}"
DisplayMemberBinding="{Binding MinEngPvValueStr}"
Header="最小值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MaxEngValueStr}"
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
Header="最大值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding AveEngValueStr}"
DisplayMemberBinding="{Binding AveEngPvValueStr}"
Header="平均值" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -1361,8 +1361,8 @@
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding ValueEngValueStr}" Header="实时数据" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding ValueEngPvValueStr}" Header="实时数据" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
</GridView>
@@ -1389,23 +1389,23 @@
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
Header="左游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
Header="右游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MinEngValueStr}"
DisplayMemberBinding="{Binding MinEngPvValueStr}"
Header="最小值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MaxEngValueStr}"
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
Header="最大值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding AveEngValueStr}"
DisplayMemberBinding="{Binding AveEngPvValueStr}"
Header="平均值" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -1520,8 +1520,8 @@
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding ValueEngValueStr}" Header="实时数据" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding ValueEngPvValueStr}" Header="实时数据" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
</GridView>
@@ -1548,23 +1548,23 @@
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
Header="左游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
Header="右游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MinEngValueStr}"
DisplayMemberBinding="{Binding MinEngPvValueStr}"
Header="最小值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MaxEngValueStr}"
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
Header="最大值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding AveEngValueStr}"
DisplayMemberBinding="{Binding AveEngPvValueStr}"
Header="平均值" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
@@ -1679,8 +1679,8 @@
<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding ValueEngValueStr}" Header="实时数据" />
<GridViewColumn DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}" Header="左游标" />
<GridViewColumn DisplayMemberBinding="{Binding ValueEngPvValueStr}" Header="实时数据" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->
</GridView>
@@ -1707,23 +1707,23 @@
<!--<GridViewColumn DisplayMemberBinding="{Binding Name}" Header="名称" />-->
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding LeftCursorEngValueStr}"
DisplayMemberBinding="{Binding LeftCursorEngPvValueStr}"
Header="左游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding RightCursorEngValueStr}"
DisplayMemberBinding="{Binding RightCursorEngPvValueStr}"
Header="右游标" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MinEngValueStr}"
DisplayMemberBinding="{Binding MinEngPvValueStr}"
Header="最小值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding MaxEngValueStr}"
DisplayMemberBinding="{Binding MaxEngPvValueStr}"
Header="最大值" />
<GridViewColumn
Width="60"
DisplayMemberBinding="{Binding AveEngValueStr}"
DisplayMemberBinding="{Binding AveEngPvValueStr}"
Header="平均值" />
<!--<GridViewColumn DisplayMemberBinding="{Binding Unit}" Header="单位" />-->