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

更改了单位和屏蔽了一些功能

Browse Source
This commit is contained in:
Tyrone CT
2025-02-10 20:22:41 +08:00
parent 7b027a10ea
commit c22a8cc98f
12 changed files with 180 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CapMachine.Wpf/CapMachine.Wpf.csproj
View File

@@ -699,18 +699,23 @@
<ItemGroup> <ItemGroup>
<Reference Include="Arction.DirectX"> <Reference Include="Arction.DirectX">
<HintPath>C:\Program Files (x86)\Arction\LightningChart .NET SDK v.10\LibNET4\Arction.DirectX.dll</HintPath> <HintPath>C:\Program Files (x86)\Arction\LightningChart .NET SDK v.10\LibNET4\Arction.DirectX.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
<Reference Include="Arction.Licensing"> <Reference Include="Arction.Licensing">
<HintPath>C:\Program Files (x86)\Arction\LightningChart .NET SDK v.10\LibNET4\Arction.Licensing.dll</HintPath> <HintPath>C:\Program Files (x86)\Arction\LightningChart .NET SDK v.10\LibNET4\Arction.Licensing.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
<Reference Include="Arction.RenderingDefinitions"> <Reference Include="Arction.RenderingDefinitions">
<HintPath>C:\Program Files (x86)\Arction\LightningChart .NET SDK v.10\LibNET4\Arction.RenderingDefinitions.dll</HintPath> <HintPath>C:\Program Files (x86)\Arction\LightningChart .NET SDK v.10\LibNET4\Arction.RenderingDefinitions.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
<Reference Include="Arction.Wpf.Charting.LightningChart"> <Reference Include="Arction.Wpf.Charting.LightningChart">
<HintPath>C:\Program Files (x86)\Arction\LightningChart .NET SDK v.10\LibNET4\Arction.Wpf.Charting.LightningChart.dll</HintPath> <HintPath>C:\Program Files (x86)\Arction\LightningChart .NET SDK v.10\LibNET4\Arction.Wpf.Charting.LightningChart.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Models\ProModelPars\" />
<Folder Include="Tool\" /> <Folder Include="Tool\" />
<Folder Include="LocalDll\" /> <Folder Include="LocalDll\" />
</ItemGroup> </ItemGroup>

8
CapMachine.Wpf/Dtos/QuickMeterStepDto.cs
View File

@@ -70,7 +70,7 @@ namespace CapMachine.Wpf.Dtos
/// <summary> /// <summary>
/// 吸气压力 信息 /// 吸气压力 信息
/// </summary> /// </summary>
[Column("吸气压力(MpaA)")] [Column("吸气压力(BarA)")]
public double InhPress public double InhPress
{ {
get { return _InhPress; } get { return _InhPress; }
@@ -81,7 +81,7 @@ namespace CapMachine.Wpf.Dtos
/// <summary> /// <summary>
/// 排气压力 信息 /// 排气压力 信息
/// </summary> /// </summary>
[Column("排气压力(MpaA)")] [Column("排气压力(BarA)")]
public double ExPress public double ExPress
{ {
get { return _ExPress; } get { return _ExPress; }
@@ -125,7 +125,7 @@ namespace CapMachine.Wpf.Dtos
/// <summary> /// <summary>
/// COND2压力 信息 /// COND2压力 信息
/// </summary> /// </summary>
[Column("COND2压力(MpaA)")] [Column("COND2压力(BarA)")]
public double Cond2Press public double Cond2Press
{ {
get { return _Cond2Press; } get { return _Cond2Press; }
@@ -158,7 +158,7 @@ namespace CapMachine.Wpf.Dtos
/// <summary> /// <summary>
/// 润滑油压力 信息 /// 润滑油压力 信息
/// </summary> /// </summary>
[Column("润滑油压力(MpaA)")] [Column("润滑油压力(BarA)")]
public double LubePress public double LubePress
{ {
get { return _LubePress; } get { return _LubePress; }

2
CapMachine.Wpf/Models/SeekData.cs
View File

@@ -69,7 +69,7 @@ namespace CapMachine.Wpf.Models
new ConfigChartYAxis(){ Index=2,Min=0,Max=8000,Name="转速",Unit="rpm"}, new ConfigChartYAxis(){ Index=2,Min=0,Max=8000,Name="转速",Unit="rpm"},
new ConfigChartYAxis(){ Index=3,Min=0,Max=100,Name="电压",Unit="V"}, new ConfigChartYAxis(){ Index=3,Min=0,Max=100,Name="电压",Unit="V"},
new ConfigChartYAxis(){ Index=4,Min=0,Max=100,Name="电流",Unit="A"}, new ConfigChartYAxis(){ Index=4,Min=0,Max=100,Name="电流",Unit="A"},
new ConfigChartYAxis(){ Index=5,Min=0,Max=5,Name="压力",Unit="MpaA"}, new ConfigChartYAxis(){ Index=5,Min=0,Max=5,Name="压力",Unit="BarA"},
new ConfigChartYAxis(){ Index=6,Min=0,Max=5,Name="流量",Unit="L/min"}, new ConfigChartYAxis(){ Index=6,Min=0,Max=5,Name="流量",Unit="L/min"},
new ConfigChartYAxis(){ Index=7,Min=0,Max=5,Name="功率",Unit="W"}, new ConfigChartYAxis(){ Index=7,Min=0,Max=5,Name="功率",Unit="W"},
}; };

BIN
CapMachine.Wpf/ReportFile/快速程序模版.xlsx
View File

Binary file not shown.

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

@@ -105,12 +105,12 @@ namespace CapMachine.Wpf.Services
new Columns(){ Name="Id",MapType="System.Int64",IsIdentity=true,IsPrimary=true}, new Columns(){ Name="Id",MapType="System.Int64",IsIdentity=true,IsPrimary=true},
new Columns(){ Name="工况",MapType="System.String",IsIdentity=false,IsPrimary=false,StringLength=100}, new Columns(){ Name="工况",MapType="System.String",IsIdentity=false,IsPrimary=false,StringLength=100},
new Columns(){ Name="转速[rpm]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="转速[rpm]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="排气压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="排气压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="吸气压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="吸气压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="吸气温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="吸气温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="COND1温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="COND1温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="润滑油压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="润滑油压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="COND2压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="COND2压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="OCR[%]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="OCR[%]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="HV[V]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="HV[V]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="HV[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="HV[A]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
@@ -126,10 +126,10 @@ namespace CapMachine.Wpf.Services
new Columns(){ Name="冷媒流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="冷媒流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="润滑油流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="润滑油流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="排气温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="排气温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="膨胀阀前压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="膨胀阀前压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="膨胀阀前温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="膨胀阀前温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="EVAP出口压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="EVAP出口压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="腔内压力[MpaA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="腔内压力[BarA]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="压缩机表面温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="压缩机表面温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="PTC流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="PTC流量[L/min]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
new Columns(){ Name="PTC入水温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false}, new Columns(){ Name="PTC入水温度[℃]",MapType=typeof(float).ToString(),IsIdentity=false,IsPrimary=false},
@@ -612,8 +612,6 @@ namespace CapMachine.Wpf.Services
IsRecord = false; IsRecord = false;
MessageBox.Show("当前试验信息未填写，无法开始记录数据", "提示", MessageBoxButton.OK, MessageBoxImage.Hand); MessageBox.Show("当前试验信息未填写，无法开始记录数据", "提示", MessageBoxButton.OK, MessageBoxImage.Hand);
} }
} }
/// <summary> /// <summary>

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

@@ -141,12 +141,12 @@ namespace CapMachine.Wpf.Services
////三电 Sample ////三电 Sample
TagManger.AddTag(new Tag<short>("转速", "转速[rpm]", "Speed", "程序", "VW15000", 100, 0, 1, "rpm", new ShortTagValue(), true) { DecimalPoint = 0 }); TagManger.AddTag(new Tag<short>("转速", "转速[rpm]", "Speed", "程序", "VW15000", 100, 0, 1, "rpm", new ShortTagValue(), true) { DecimalPoint = 0 });
TagManger.AddTag(new Tag<short>("排气压力", "排气压力[MpaA]", "ExPress", "程序", "VW15002", 100, 0, 100, "MpaA", new ShortTagValue(), true) { DecimalPoint = 2 }); TagManger.AddTag(new Tag<short>("排气压力", "排气压力[BarA]", "ExPress", "程序", "VW15002", 100, 0, 100, "BarA", new ShortTagValue(), true) { DecimalPoint = 2 });
TagManger.AddTag(new Tag<short>("吸气压力", "吸气压力[MpaA]", "InhPress", "程序", "VW15004", 100, 0, 100, "MpaA", new ShortTagValue(), true) { DecimalPoint = 2 }); TagManger.AddTag(new Tag<short>("吸气压力", "吸气压力[BarA]", "InhPress", "程序", "VW15004", 100, 0, 100, "BarA", new ShortTagValue(), true) { DecimalPoint = 2 });
TagManger.AddTag(new Tag<short>("吸气温度", "吸气温度[℃]", "InhTemp", "程序", "VW15006", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("吸气温度", "吸气温度[℃]", "InhTemp", "程序", "VW15006", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("COND1温度", "COND1温度[℃]", "Cond1Temp", "程序", "VW15008", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("COND1温度", "COND1温度[℃]", "Cond1Temp", "程序", "VW15008", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("润滑油压力", "润滑油压力[MpaA]", "LubePress", "程序", "VW15010", 100, 0, 100, "MpaA", new ShortTagValue(), true) { DecimalPoint = 2 }); TagManger.AddTag(new Tag<short>("润滑油压力", "润滑油压力[BarA]", "LubePress", "程序", "VW15010", 100, 0, 100, "BarA", new ShortTagValue(), true) { DecimalPoint = 2 });
TagManger.AddTag(new Tag<short>("COND2压力", "COND2压力[MpaA]", "Cond2Press", "程序", "VW15012", 100, 0, 100, "MpaA", new ShortTagValue(), false) { DecimalPoint = 2 }); TagManger.AddTag(new Tag<short>("COND2压力", "COND2压力[BarA]", "Cond2Press", "程序", "VW15012", 100, 0, 100, "BarA", new ShortTagValue(), false) { DecimalPoint = 2 });
TagManger.AddTag(new Tag<short>("OCR", "OCR[%]", "OCR", "程序", "VW15014", 100, 0, 10, "%", new ShortTagValue(), true) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("OCR", "OCR[%]", "OCR", "程序", "VW15014", 100, 0, 10, "%", new ShortTagValue(), true) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("HV[V]", "HV[V]", "HV", "程序", "VW15016", 100, 0, 10, "V", new ShortTagValue(), true) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("HV[V]", "HV[V]", "HV", "程序", "VW15016", 100, 0, 10, "V", new ShortTagValue(), true) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("HV[A]", "HV[A]", "HVCur", "程序", "VW15018", 100, 0, 1, "A", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("HV[A]", "HV[A]", "HVCur", "程序", "VW15018", 100, 0, 1, "A", new ShortTagValue(), false) { DecimalPoint = 1 });
@@ -156,7 +156,7 @@ namespace CapMachine.Wpf.Services
TagManger.AddTag(new Tag<short>("LV[A]", "LV[A]", "LVCur", "程序", "VW15024", 100, 0, 100, "A", new ShortTagValue(), false) { DecimalPoint = 2 }); TagManger.AddTag(new Tag<short>("LV[A]", "LV[A]", "LVCur", "程序", "VW15024", 100, 0, 100, "A", new ShortTagValue(), false) { DecimalPoint = 2 });
TagManger.AddTag(new Tag<short>("环境温度", "环境温度[℃]", "EnvTemp", "程序", "VW15026", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("环境温度", "环境温度[℃]", "EnvTemp", "程序", "VW15026", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 });
//TagManger.AddTag(new Tag<short>("环境湿度", "环境湿度[%]", "EnvRH", "程序", "VW15028", 100, 0, 10, "%", new ShortTagValue(), true) { DecimalPoint = 1 }); //TagManger.AddTag(new Tag<short>("环境湿度", "环境湿度[%]", "EnvRH", "程序", "VW15028", 100, 0, 10, "%", new ShortTagValue(), true) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("环境湿度", "环境湿度[%]", "EnvRH", "程序", "VW15028", 100, 0, 1, "%", new ShortTagValue(), true) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("环境湿度", "环境湿度[%]", "EnvRH", "程序", "VW15028", 100, 0, 10, "%", new ShortTagValue(), true) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("OS1温度", "OS1温度[℃]", "OS1Temp", "程序", "VW15030", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("OS1温度", "OS1温度[℃]", "OS1Temp", "程序", "VW15030", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("OS2温度", "OS2温度[℃]", "OS2Temp", "程序", "VW15032", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("OS2温度", "OS2温度[℃]", "OS2Temp", "程序", "VW15032", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("COND2温度", "COND2温度[℃]", "Cond2Temp", "程序", "VW15034", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("COND2温度", "COND2温度[℃]", "Cond2Temp", "程序", "VW15034", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
@@ -165,10 +165,10 @@ namespace CapMachine.Wpf.Services
TagManger.AddTag(new Tag<short>("冷媒流量", "冷媒流量[L/min]", "VRV", "程序", "VW15038", 100, 0, 10, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("冷媒流量", "冷媒流量[L/min]", "VRV", "程序", "VW15038", 100, 0, 10, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("润滑油流量", "润滑油流量[L/min]", "LubeFlow", "程序", "VW15040", 100, 0, 1, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("润滑油流量", "润滑油流量[L/min]", "LubeFlow", "程序", "VW15040", 100, 0, 1, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("排气温度", "排气温度[℃]", "ExTemp", "程序", "VW15042", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("排气温度", "排气温度[℃]", "ExTemp", "程序", "VW15042", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("膨胀阀前压力", "膨胀阀前压力[MpaA]", "TxvFrPress", "程序", "VW15044", 100, 0, 100, "MpaA", new ShortTagValue(), false) { DecimalPoint = 2 }); TagManger.AddTag(new Tag<short>("膨胀阀前压力", "膨胀阀前压力[BarA]", "TxvFrPress", "程序", "VW15044", 100, 0, 100, "BarA", new ShortTagValue(), false) { DecimalPoint = 2 });
TagManger.AddTag(new Tag<short>("膨胀阀前温度", "膨胀阀前温度[℃]", "TxvFrTemp", "程序", "VW15046", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("膨胀阀前温度", "膨胀阀前温度[℃]", "TxvFrTemp", "程序", "VW15046", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("EVAP出口压力", "EVAP出口压力[MpaA]", "EVAPExpPress", "程序", "VW15048", 100, 0, 100, "MpaA", new ShortTagValue(), false) { DecimalPoint = 2 }); TagManger.AddTag(new Tag<short>("EVAP出口压力", "EVAP出口压力[BarA]", "EVAPExpPress", "程序", "VW15048", 100, 0, 100, "BarA", new ShortTagValue(), false) { DecimalPoint = 2 });
TagManger.AddTag(new Tag<short>("腔内压力", "腔内压力[MpaA]", "IntrplPress", "程序", "VW15050", 100, 0, 100, "MpaA", new ShortTagValue(), false) { DecimalPoint = 2 }); TagManger.AddTag(new Tag<short>("腔内压力", "腔内压力[BarA]", "IntrplPress", "程序", "VW15050", 100, 0, 100, "BarA", new ShortTagValue(), false) { DecimalPoint = 2 });
TagManger.AddTag(new Tag<short>("压缩机表面温度", "压缩机表面温度[℃]", "CapSurfTemp", "程序", "VW15052", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("压缩机表面温度", "压缩机表面温度[℃]", "CapSurfTemp", "程序", "VW15052", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("PTC流量", "PTC流量[L/min]", "PTCFlow", "程序", "VW15054", 100, 0, 1, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("PTC流量", "PTC流量[L/min]", "PTCFlow", "程序", "VW15054", 100, 0, 1, "L/min", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("PTC入水温度", "PTC入水温度[℃]", "PTCEntTemp", "程序", "VW15056", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 }); TagManger.AddTag(new Tag<short>("PTC入水温度", "PTC入水温度[℃]", "PTCEntTemp", "程序", "VW15056", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
@@ -192,7 +192,7 @@ namespace CapMachine.Wpf.Services
#region SongZhi #region SongZhi
////【SongZhi】 ////【SongZhi】
//TagManger.AddTag(new Tag<short>(new ShortTagValue()) //TagManger.AddTag(new Tag<short>(new ShortTagValue())
//{ //{
// Name = "转速[rpm]",//名称带单位 // Name = "转速[rpm]",//名称带单位
@@ -884,6 +884,9 @@ namespace CapMachine.Wpf.Services
/// <returns></returns> /// <returns></returns>
public bool SysReset() public bool SysReset()
{ {
return true;
//取消XXX
var FindData = ListHandSwitchData.Where(a => a.Name == "复位"); var FindData = ListHandSwitchData.Where(a => a.Name == "复位");
if (FindData.Count() > 0) if (FindData.Count() > 0)
{ {
@@ -906,6 +909,9 @@ namespace CapMachine.Wpf.Services
/// <returns></returns> /// <returns></returns>
public bool SysMute() public bool SysMute()
{ {
return true;
//取消XXX
var FindData = ListHandSwitchData.Where(a => a.Name == "消音"); var FindData = ListHandSwitchData.Where(a => a.Name == "消音");
if (FindData.Count() > 0) if (FindData.Count() > 0)
{ {
@@ -929,15 +935,18 @@ namespace CapMachine.Wpf.Services
/// <returns></returns> /// <returns></returns>
public bool SysStart() public bool SysStart()
{ {
var Result = SiemensDrive.Write("M0.4", true); return true;
if (Result.IsSuccess)
{ //取消XXX
return true; //var Result = SiemensDrive.Write("M0.4", true);
} //if (Result.IsSuccess)
else //{
{ // return true;
return false; //}
} //else
//{
// return false;
//}
} }
@@ -947,6 +956,9 @@ namespace CapMachine.Wpf.Services
/// <returns></returns> /// <returns></returns>
public bool SysEnd() public bool SysEnd()
{ {
return true;
//取消XXX
var Result = SiemensDrive.Write("M0.7", true); var Result = SiemensDrive.Write("M0.7", true);
if (Result.IsSuccess) if (Result.IsSuccess)
{ {
@@ -966,6 +978,9 @@ namespace CapMachine.Wpf.Services
/// <returns></returns> /// <returns></returns>
public bool SysPause() public bool SysPause()
{ {
return true;
//取消XXX
var StateResult = SiemensDrive.ReadBool("M0.6"); var StateResult = SiemensDrive.ReadBool("M0.6");
if (StateResult.IsSuccess) if (StateResult.IsSuccess)
{ {
@@ -1170,13 +1185,13 @@ namespace CapMachine.Wpf.Services
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin) switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
{ {
case CanLinEnum.Can: case CanLinEnum.Can:
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
SiemensDrive.Write(itemTag.Value.PVAddress, (short)CanDriveService.GetDbcSpeedValueBySpeedName("通讯转速")); //SiemensDrive.Write(itemTag.Value.PVAddress, (short)CanDriveService.GetDbcSpeedValueBySpeedName("通讯转速"));
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
case CanLinEnum.Lin: case CanLinEnum.Lin:
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
SiemensDrive.Write(itemTag.Value.PVAddress, (short)LinDriveService.GetLdfSpeedValueBySpeedName("通讯转速")); //SiemensDrive.Write(itemTag.Value.PVAddress, (short)LinDriveService.GetLdfSpeedValueBySpeedName("通讯转速"));
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
default: default:
@@ -1188,13 +1203,13 @@ namespace CapMachine.Wpf.Services
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin) switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
{ {
case CanLinEnum.Can: case CanLinEnum.Can:
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯母线电压") * itemTag.Value.Precision)); //SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯母线电压") * itemTag.Value.Precision));
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
case CanLinEnum.Lin: case CanLinEnum.Lin:
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯母线电压") * itemTag.Value.Precision)); //SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯母线电压") * itemTag.Value.Precision));
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
default: default:
@@ -1206,13 +1221,13 @@ namespace CapMachine.Wpf.Services
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin) switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
{ {
case CanLinEnum.Can: case CanLinEnum.Can:
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯母线电流") * itemTag.Value.Precision)); //SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯母线电流") * itemTag.Value.Precision));
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
case CanLinEnum.Lin: case CanLinEnum.Lin:
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯母线电流") * itemTag.Value.Precision)); //SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯母线电流") * itemTag.Value.Precision));
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
default: default:
@@ -1224,13 +1239,13 @@ namespace CapMachine.Wpf.Services
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin) switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
{ {
case CanLinEnum.Can: case CanLinEnum.Can:
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯相电流") * itemTag.Value.Precision)); //SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯相电流") * itemTag.Value.Precision));
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
case CanLinEnum.Lin: case CanLinEnum.Lin:
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯相电流") * itemTag.Value.Precision)); //SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯相电流") * itemTag.Value.Precision));
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
default: default:
@@ -1242,13 +1257,13 @@ namespace CapMachine.Wpf.Services
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin) switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
{ {
case CanLinEnum.Can: case CanLinEnum.Can:
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯功率") * itemTag.Value.Precision)); //SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯功率") * itemTag.Value.Precision));
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
case CanLinEnum.Lin: case CanLinEnum.Lin:
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯功率") * itemTag.Value.Precision)); //SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯功率") * itemTag.Value.Precision));
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
default: default:
@@ -1260,13 +1275,13 @@ namespace CapMachine.Wpf.Services
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin) switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
{ {
case CanLinEnum.Can: case CanLinEnum.Can:
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯芯片温度") * itemTag.Value.Precision)); //SiemensDrive.Write(itemTag.Value.PVAddress, (short)(CanDriveService.GetDbcValueByName("通讯芯片温度") * itemTag.Value.Precision));
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
case CanLinEnum.Lin: case CanLinEnum.Lin:
//通信转速 Dbc中间配置名称的转速数据读取出来 给PLC //通信转速 Dbc中间配置名称的转速数据读取出来 给PLC 取消XXX
SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯芯片温度") * itemTag.Value.Precision)); //SiemensDrive.Write(itemTag.Value.PVAddress, (short)(LinDriveService.GetLdfValueByName("通讯芯片温度") * itemTag.Value.Precision));
//itemTag.Value.EngPvValue = 0; //itemTag.Value.EngPvValue = 0;
break; break;
default: default:
@@ -1368,10 +1383,10 @@ namespace CapMachine.Wpf.Services
} }
} }
//手自动切换按钮条件 ////手自动切换按钮条件 取消XXX
AutoHandSwtichConditionState.AlarmStateResult = SiemensDrive.ReadBool(AutoHandSwtichConditionState.AlarmAddress); //AutoHandSwtichConditionState.AlarmStateResult = SiemensDrive.ReadBool(AutoHandSwtichConditionState.AlarmAddress);
AutoHandSwtichConditionState.HandStateResult = SiemensDrive.ReadBool(AutoHandSwtichConditionState.HandStateAddress); //AutoHandSwtichConditionState.HandStateResult = SiemensDrive.ReadBool(AutoHandSwtichConditionState.HandStateAddress);
AutoHandSwtichConditionState.SumResult(); //AutoHandSwtichConditionState.SumResult();
break; break;
default: default:
@@ -1383,55 +1398,60 @@ namespace CapMachine.Wpf.Services
//Console.WriteLine("Add Elapsed output runTime:{0}", stopwatch.Elapsed.TotalSeconds.ToString()); //Console.WriteLine("Add Elapsed output runTime:{0}", stopwatch.Elapsed.TotalSeconds.ToString());
//stopwatch.Reset(); //stopwatch.Reset();
OperateResultAlarm = SiemensDrive.ReadBool("V0.0", 15); ////读取报警信息 取消报警XXX
if (OperateResultAlarm.IsSuccess) //OperateResultAlarm = SiemensDrive.ReadBool("V0.0", 15);
{ //if (OperateResultAlarm.IsSuccess)
foreach (var item in AlarmService.ListAlarmRunCell) //{
{ // foreach (var item in AlarmService.ListAlarmRunCell)
item.UpdateBoolValue(OperateResultAlarm.Content[item.Index]); // {
} // item.UpdateBoolValue(OperateResultAlarm.Content[item.Index]);
} // }
//}
//循环读取手自动切换 ////循环读取手自动切换 取消XXX
foreach (var item in ListHandSwitchData) //foreach (var item in ListHandSwitchData)
{ //{
item.StateOperateResult = SiemensDrive.ReadBool(item.StateAddress); // item.StateOperateResult = SiemensDrive.ReadBool(item.StateAddress);
if (item.StateOperateResult.IsSuccess) // if (item.StateOperateResult.IsSuccess)
{ // {
item.State = item.StateOperateResult.Content; // item.State = item.StateOperateResult.Content;
//根据PLC得到执行的步骤数据，更新到CAN和LIN的数据 // //根据PLC得到执行的步骤数据，更新到CAN和LIN的数据
if (item.Name!.Equals("使能")) // if (item.Name!.Equals("使能"))
{ // {
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin) // switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
{ // {
case CanLinEnum.Can: // case CanLinEnum.Can:
//获取PLC的使能状态，更新到CAN的使能状态 // //获取PLC的使能状态，更新到CAN的使能状态
CanDriveService.UpdateCapEnableCmdData(item.State); // CanDriveService.UpdateCapEnableCmdData(item.State);
//itemTag.Value.EngPvValue = 0; // //itemTag.Value.EngPvValue = 0;
break; // break;
case CanLinEnum.Lin: // case CanLinEnum.Lin:
//获取PLC的使能状态，更新到LIN的使能状态 // //获取PLC的使能状态，更新到LIN的使能状态
LinDriveService.UpdateCapEnableCmdData(item.State); // LinDriveService.UpdateCapEnableCmdData(item.State);
//itemTag.Value.EngPvValue = 0; // //itemTag.Value.EngPvValue = 0;
break; // break;
default: // default:
break; // break;
} // }
} // }
} // }
} //}
//拓展信息的展示
foreach (var itemQuickTag in CurSysExdInfo.QuickTags) ////拓展信息的展示 取消XXX
{ //foreach (var itemQuickTag in CurSysExdInfo.QuickTags)
itemQuickTag.OperateResultSource = SiemensDrive.Read(itemQuickTag.ValueAddress, itemQuickTag.ByteLength); //{
} // itemQuickTag.OperateResultSource = SiemensDrive.Read(itemQuickTag.ValueAddress, itemQuickTag.ByteLength);
CurSysExdInfo.SumRunTime(); //}
//布尔拓展信息的展示
foreach (var itemQuickTag in SysExdBoolInfos.QuickTags)
{ //CurSysExdInfo.SumRunTime();
itemQuickTag.OperateResultSource = SiemensDrive.Read(itemQuickTag.ValueAddress, itemQuickTag.ByteLength);
} ////布尔拓展信息的展示 取消XXX
//foreach (var itemQuickTag in SysExdBoolInfos.QuickTags)
//{
// itemQuickTag.OperateResultSource = SiemensDrive.Read(itemQuickTag.ValueAddress, itemQuickTag.ByteLength);
//}
} }
catch (Exception ex) catch (Exception ex)

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

@@ -54,16 +54,16 @@ namespace CapMachine.Wpf.Services
TagManager = MachineRtDataService.TagManger; TagManager = MachineRtDataService.TagManger;
//SpeedTag = TagManager.DicTags.GetValueOrDefault("转速[rpm]"); //SpeedTag = TagManager.DicTags.GetValueOrDefault("转速[rpm]");
//ExPressTag = TagManager.DicTags.GetValueOrDefault("排气压力[MpaA]"); //ExPressTag = TagManager.DicTags.GetValueOrDefault("排气压力[BarA]");
//ExTempTag = TagManager.DicTags.GetValueOrDefault("排气温度[℃]"); //ExTempTag = TagManager.DicTags.GetValueOrDefault("排气温度[℃]");
InhPressTag = TagManager.DicTags.GetValueOrDefault("吸气压力[MpaA]")!; InhPressTag = TagManager.DicTags.GetValueOrDefault("吸气压力[BarA]")!;
InhTempTag = TagManager.DicTags.GetValueOrDefault("吸气温度[℃]")!; InhTempTag = TagManager.DicTags.GetValueOrDefault("吸气温度[℃]")!;
//ComCapBusVolTag = TagManager.DicTags.GetValueOrDefault("通讯母线电压[V]"); //ComCapBusVolTag = TagManager.DicTags.GetValueOrDefault("通讯母线电压[V]");
//ComCapBusCurTag = TagManager.DicTags.GetValueOrDefault("通讯母线电流[A]"); //ComCapBusCurTag = TagManager.DicTags.GetValueOrDefault("通讯母线电流[A]");
//ComCapPwTag = TagManager.DicTags.GetValueOrDefault("通讯功率[W]"); //ComCapPwTag = TagManager.DicTags.GetValueOrDefault("通讯功率[W]");
//OS2TempTag = TagManager.DicTags.GetValueOrDefault("吸气混合器温度[℃]"); //OS2TempTag = TagManager.DicTags.GetValueOrDefault("吸气混合器温度[℃]");
TxvFrTempTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前温度[℃]")!; TxvFrTempTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前温度[℃]")!;
TxvFrPressTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前压力[MpaA]")!; TxvFrPressTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前压力[BarA]")!;
//Cond1TempTag = TagManager.DicTags.GetValueOrDefault("冷凝器出口水温[℃]"); //Cond1TempTag = TagManager.DicTags.GetValueOrDefault("冷凝器出口水温[℃]");
//CondInTempTag = TagManager.DicTags.GetValueOrDefault("冷凝器进口温度[℃]"); //CondInTempTag = TagManager.DicTags.GetValueOrDefault("冷凝器进口温度[℃]");

25
CapMachine.Wpf/Services/ProRuntimeService.cs Normal file
View File

@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CapMachine.Wpf.Services
{
/// <summary>
/// 程序运行时服务
/// 负责程序的解析、运行、调度等功能
/// </summary>
public class ProRuntimeService
{
/// <summary>
/// 实例化函数
/// </summary>
public ProRuntimeService()
{
}
}
}

6
CapMachine.Wpf/ViewModels/MonitorViewModel.cs
View File

@@ -51,16 +51,16 @@ namespace CapMachine.Wpf.ViewModels
ListMeterTag = TagManager.DicTags.Values.Where(a => a.IsMeter == true).ToList(); ListMeterTag = TagManager.DicTags.Values.Where(a => a.IsMeter == true).ToList();
SpeedTag = TagManager.DicTags.GetValueOrDefault("转速[rpm]"); SpeedTag = TagManager.DicTags.GetValueOrDefault("转速[rpm]");
ExPressTag = TagManager.DicTags.GetValueOrDefault("排气压力[MpaA]"); ExPressTag = TagManager.DicTags.GetValueOrDefault("排气压力[BarA]");
ExTempTag = TagManager.DicTags.GetValueOrDefault("排气温度[℃]"); ExTempTag = TagManager.DicTags.GetValueOrDefault("排气温度[℃]");
InhPressTag = TagManager.DicTags.GetValueOrDefault("吸气压力[MpaA]"); InhPressTag = TagManager.DicTags.GetValueOrDefault("吸气压力[BarA]");
InhTempTag = TagManager.DicTags.GetValueOrDefault("吸气温度[℃]"); InhTempTag = TagManager.DicTags.GetValueOrDefault("吸气温度[℃]");
ComCapBusVolTag = TagManager.DicTags.GetValueOrDefault("通讯母线电压[V]"); ComCapBusVolTag = TagManager.DicTags.GetValueOrDefault("通讯母线电压[V]");
ComCapBusCurTag = TagManager.DicTags.GetValueOrDefault("通讯母线电流[A]"); ComCapBusCurTag = TagManager.DicTags.GetValueOrDefault("通讯母线电流[A]");
ComCapPwTag = TagManager.DicTags.GetValueOrDefault("通讯功率[W]"); ComCapPwTag = TagManager.DicTags.GetValueOrDefault("通讯功率[W]");
OS2TempTag = TagManager.DicTags.GetValueOrDefault("吸气混合器温度[℃]"); OS2TempTag = TagManager.DicTags.GetValueOrDefault("吸气混合器温度[℃]");
TxvFrTempTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前温度[℃]"); TxvFrTempTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前温度[℃]");
TxvFrPressTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前压力[MpaA]"); TxvFrPressTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前压力[BarA]");
Cond1TempTag = TagManager.DicTags.GetValueOrDefault("冷凝器出口水温[℃]"); Cond1TempTag = TagManager.DicTags.GetValueOrDefault("冷凝器出口水温[℃]");
CondInTempTag = TagManager.DicTags.GetValueOrDefault("冷凝器进口温度[℃]"); CondInTempTag = TagManager.DicTags.GetValueOrDefault("冷凝器进口温度[℃]");

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

@@ -170,6 +170,7 @@
HandValueCommand="{Binding Source={StaticResource Proxy}, Path=Data.HandValueCmd}" HandValueCommand="{Binding Source={StaticResource Proxy}, Path=Data.HandValueCmd}"
HandValueMVParameter="{Binding EngMvValue}" HandValueMVParameter="{Binding EngMvValue}"
HandValueSVParameter="{Binding EngSvValue}" HandValueSVParameter="{Binding EngSvValue}"
IsEnabled="False"
MeterName="{Binding NameNoUnit}" MeterName="{Binding NameNoUnit}"
PVValue="{Binding EngPvValue}" PVValue="{Binding EngPvValue}"
SVValue="{Binding EngSvValue}" SVValue="{Binding EngSvValue}"
@@ -837,7 +838,7 @@
</StackPanel> </StackPanel>
</Grid>--> </Grid>-->
<materialDesign:Card Margin="0,0" materialDesign:ElevationAssist.Elevation="Dp2"> <materialDesign:Card Margin="0,0" materialDesign:ElevationAssist.Elevation="Dp2">
<ItemsControl ItemsSource="{Binding ListHandSwitchData}"> <ItemsControl IsEnabled="False" ItemsSource="{Binding ListHandSwitchData}">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel Orientation="Vertical" /> <StackPanel Orientation="Vertical" />
@@ -867,7 +868,7 @@
<!--<svg1:SVGImage Grid.Column="1" Source="E:\图库资源\SVGEdit\CapMachineOutput.svg" RenderTransformOrigin="0.5,0.5" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Margin="3" />--> <!--<svg1:SVGImage Grid.Column="1" Source="E:\图库资源\SVGEdit\CapMachineOutput.svg" RenderTransformOrigin="0.5,0.5" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Margin="3" />-->
<!-- inkscape --> <!-- inkscape -->
<Canvas Grid.Column="1"> <Canvas Grid.Column="1" Visibility="Visible">
<Canvas.Background> <Canvas.Background>
<ImageBrush ImageSource="\Assets\Images\CapMachineOutput1.png" /> <ImageBrush ImageSource="\Assets\Images\CapMachineOutput1.png" />
</Canvas.Background> </Canvas.Background>
@@ -1002,15 +1003,15 @@
CellTitle="吸气口温度" CellTitle="吸气口温度"
CellUnit="{Binding InhTempTag.Unit}" CellUnit="{Binding InhTempTag.Unit}"
CellValue="{Binding InhTempTag.EngPvValueStr}" /> CellValue="{Binding InhTempTag.EngPvValueStr}" />
<Controls:ValueShow <!--<Controls:ValueShow
Canvas.Left="551" Canvas.Left="551"
Canvas.Top="272" Canvas.Top="272"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Top" VerticalAlignment="Top"
CellTitle="吸气压力MV" CellTitle="吸气压力MV"
CellUnit="%" CellUnit="%"
CellValue="{Binding InhPressTag.EngMvValue}" /> CellValue="{Binding InhPressTag.EngMvValue}" />-->
<Controls:ValueShow <!--<Controls:ValueShow
Canvas.Left="1003" Canvas.Left="1003"
Canvas.Top="152" Canvas.Top="152"
HorizontalAlignment="Left" HorizontalAlignment="Left"
@@ -1065,7 +1066,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
CellTitle="吸气温度MV" CellTitle="吸气温度MV"
CellUnit="%" CellUnit="%"
CellValue="{Binding InhTempTag.EngMvValue}" /> CellValue="{Binding InhTempTag.EngMvValue}" />-->
<Label <Label
Canvas.Left="1339" Canvas.Left="1339"
Canvas.Top="225" Canvas.Top="225"

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

@@ -621,7 +621,7 @@
<DataGridTemplateColumn> <DataGridTemplateColumn>
<DataGridTemplateColumn.Header> <DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="排气压力&#x0A;(MpaA)" /> <TextBlock FontWeight="Bold" Text="排气压力&#x0A;(BarA)" />
</DataGridTemplateColumn.Header> </DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
@@ -632,7 +632,7 @@
<DataGridTemplateColumn> <DataGridTemplateColumn>
<DataGridTemplateColumn.Header> <DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="吸气压力&#x0A;(MpaA)" /> <TextBlock FontWeight="Bold" Text="吸气压力&#x0A;(BarA)" />
</DataGridTemplateColumn.Header> </DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
@@ -676,7 +676,7 @@
<!--<DataGridTemplateColumn> <!--<DataGridTemplateColumn>
<DataGridTemplateColumn.Header> <DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="润滑油压力&#x0A;(MpaA)" /> <TextBlock FontWeight="Bold" Text="润滑油压力&#x0A;(BarA)" />
</DataGridTemplateColumn.Header> </DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
@@ -687,7 +687,7 @@
<DataGridTemplateColumn> <DataGridTemplateColumn>
<DataGridTemplateColumn.Header> <DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="COND2压力&#x0A;(MpaA)" /> <TextBlock FontWeight="Bold" Text="COND2压力&#x0A;(BarA)" />
</DataGridTemplateColumn.Header> </DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate> <DataGridTemplateColumn.CellTemplate>
<DataTemplate> <DataTemplate>
@@ -1371,7 +1371,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="12" FontSize="12"
FontWeight="Bold" FontWeight="Bold"
Text="排气压力&#10;(MpaA)" /> Text="排气压力&#10;(BarA)" />
</StackPanel> </StackPanel>
</TabItem.Header> </TabItem.Header>
<Controls:MeterConfig <Controls:MeterConfig
@@ -1405,7 +1405,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="12" FontSize="12"
FontWeight="Bold" FontWeight="Bold"
Text="吸气压力&#10;(MpaA)" /> Text="吸气压力&#10;(BarA)" />
</StackPanel> </StackPanel>
</TabItem.Header> </TabItem.Header>
<Controls:MeterConfig <Controls:MeterConfig
@@ -1508,7 +1508,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="12" FontSize="12"
FontWeight="Bold" FontWeight="Bold"
Text="润滑油压力&#10;(MpaA)" /> Text="润滑油压力&#10;(BarA)" />
</StackPanel> </StackPanel>
</TabItem.Header> </TabItem.Header>
<Controls:MeterConfig <Controls:MeterConfig
@@ -1576,7 +1576,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="12" FontSize="12"
FontWeight="Bold" FontWeight="Bold"
Text="COND2压力&#10;(MpaA)" /> Text="COND2压力&#10;(BarA)" />
</StackPanel> </StackPanel>
</TabItem.Header> </TabItem.Header>
<Controls:MeterConfig <Controls:MeterConfig

8
CapMachine.Wpf/Views/QuickMeterStepView.xaml
View File

@@ -167,11 +167,11 @@
MappingName="Speed" MappingName="Speed"
NumberDecimalDigits="0" /> NumberDecimalDigits="0" />
<syncfusion:GridNumericColumn <syncfusion:GridNumericColumn
HeaderText="排气压力(MpaA)" HeaderText="排气压力(BarA)"
MappingName="ExPress" MappingName="ExPress"
NumberDecimalDigits="2" /> NumberDecimalDigits="2" />
<syncfusion:GridNumericColumn <syncfusion:GridNumericColumn
HeaderText="吸气压力(MpaA)" HeaderText="吸气压力(BarA)"
MappingName="InhPress" MappingName="InhPress"
NumberDecimalDigits="2" /> NumberDecimalDigits="2" />
<syncfusion:GridNumericColumn <syncfusion:GridNumericColumn
@@ -184,11 +184,11 @@
MappingName="Cond1Temp" MappingName="Cond1Temp"
NumberDecimalDigits="1" /> NumberDecimalDigits="1" />
<syncfusion:GridNumericColumn <syncfusion:GridNumericColumn
HeaderText="润滑油压力(MpaA)" HeaderText="润滑油压力(BarA)"
MappingName="LubePress" MappingName="LubePress"
NumberDecimalDigits="2" /> NumberDecimalDigits="2" />
<syncfusion:GridNumericColumn <syncfusion:GridNumericColumn
HeaderText="COND2压力(MpaA)" HeaderText="COND2压力(BarA)"
MappingName="Cond2Press" MappingName="Cond2Press"
NumberDecimalDigits="2" /> NumberDecimalDigits="2" />
<syncfusion:GridNumericColumn <syncfusion:GridNumericColumn