Commit cd8fc64a authored by 潘栩锋's avatar 潘栩锋 🚴

科斯林V1 完成

parent ec4ddce2
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
StrokeThickness ="3" StrokeThickness ="3"
Stroke="{StaticResource Brushes.PVs}" Stroke="{StaticResource Brushes.PVs}"
Fill="Transparent" Fill="Transparent"
Values="{Binding PVs}" Values="{Binding Currs}"
Configuration="{Binding Mapper}"/> Configuration="{Binding Mapper}"/>
</lvc:CartesianChart.Series> </lvc:CartesianChart.Series>
<lvc:CartesianChart.AxisX> <lvc:CartesianChart.AxisX>
......
using System.ComponentModel;
namespace FLY.KSL.Common
{
public class Accessory : INotifyPropertyChanged
{
public Accessory()
{
}
#region 辅助代码生成
/// <summary>
/// 温度设定SV改变
/// </summary>
[Description("温度设定SV改变")]
public bool IsTempSVChanged{ get; set; }
#endregion
public event PropertyChangedEventHandler PropertyChanged;
}
}
...@@ -51,6 +51,12 @@ namespace FLY.KSL.Common ...@@ -51,6 +51,12 @@ namespace FLY.KSL.Common
[Description("自整定开关")] [Description("自整定开关")]
public bool IsSelfAdjustingOn{ get; set; } public bool IsSelfAdjustingOn{ get; set; }
/// <summary>
/// 温度设定SV改变
/// </summary>
[Description("温度设定SV改变")]
public bool IsTempSVChanged{ get; set; }
#endregion #endregion
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
} }
......
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
<Compile Include="Client\FeedbackHeatServiceClient.cs" /> <Compile Include="Client\FeedbackHeatServiceClient.cs" />
<Compile Include="Client\HeatBufServiceClient.cs" /> <Compile Include="Client\HeatBufServiceClient.cs" />
<Compile Include="Client\HeatCellServiceClient.cs" /> <Compile Include="Client\HeatCellServiceClient.cs" />
<Compile Include="Common\Accessory.cs" />
<Compile Include="Common\ERRNOs.cs" /> <Compile Include="Common\ERRNOs.cs" />
<Compile Include="Common\FeedbackHeatsMark.cs" /> <Compile Include="Common\FeedbackHeatsMark.cs" />
<Compile Include="Common\FlyData_FeedbackHeat.cs" /> <Compile Include="Common\FlyData_FeedbackHeat.cs" />
......
...@@ -16,11 +16,6 @@ namespace FLY.KSL.IService ...@@ -16,11 +16,6 @@ namespace FLY.KSL.IService
/// </summary> /// </summary>
ObservableCollection<FurnaceOfSubdivide> Fos { get; } ObservableCollection<FurnaceOfSubdivide> Fos { get; }
/// <summary>
/// 辅助设置
/// </summary>
Accessory Accessory { get; }
/// <summary> /// <summary>
/// PLC代理系统 /// PLC代理系统
/// </summary> /// </summary>
......
...@@ -398,8 +398,8 @@ namespace FLY.KSL.Server ...@@ -398,8 +398,8 @@ namespace FLY.KSL.Server
{ {
var heat = heats[i]; var heat = heats[i];
plc.Fos[i].TempSV = heat; plc.Fos[i].TempSV = heat;
plc.Fos[i].IsTempSVChanged = true;
} }
plc.Accessory.IsTempSVChanged = true;
} }
......
...@@ -22,11 +22,6 @@ namespace FLY.KSL.Server ...@@ -22,11 +22,6 @@ namespace FLY.KSL.Server
/// </summary> /// </summary>
public ObservableCollection<FurnaceOfSubdivide> Fos { get; } = new ObservableCollection<FurnaceOfSubdivide>(); public ObservableCollection<FurnaceOfSubdivide> Fos { get; } = new ObservableCollection<FurnaceOfSubdivide>();
/// <summary>
/// 辅助设置
/// </summary>
public Accessory Accessory { get; } = new Accessory();
/// <summary> /// <summary>
/// 区数 /// 区数
/// </summary> /// </summary>
...@@ -57,14 +52,12 @@ namespace FLY.KSL.Server ...@@ -57,14 +52,12 @@ namespace FLY.KSL.Server
List<string> props = new List<string> List<string> props = new List<string>
{ {
nameof(FurnaceOfSubdivide.TempPV), nameof(FurnaceOfSubdivide.TempPV),
nameof(FurnaceOfSubdivide.TempSV) nameof(FurnaceOfSubdivide.TempSV),
nameof(FurnaceOfSubdivide.IsTempSVChanged)
}; };
PLCos.SetPlan($"{nameof(Fos)}[{i}]", props, 0); PLCos.SetPlan($"{nameof(Fos)}[{i}]", props, 0);
} }
PLCos.SetPlan($"{nameof(Accessory)}", new string[] {
nameof(Accessory.IsTempSVChanged)
}, 0);
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
//last step PLC 更新计划服务初始化 //last step PLC 更新计划服务初始化
...@@ -98,7 +91,6 @@ namespace FLY.KSL.Server ...@@ -98,7 +91,6 @@ namespace FLY.KSL.Server
//objname 转 obj //objname 转 obj
Dictionary<string, INotifyPropertyChanged> objnames = new Dictionary<string, INotifyPropertyChanged>(); Dictionary<string, INotifyPropertyChanged> objnames = new Dictionary<string, INotifyPropertyChanged>();
objnames.Add(nameof(Accessory), Accessory);
for (int i = 0; i < FosCnt; i++) for (int i = 0; i < FosCnt; i++)
objnames.Add($"{nameof(Fos)}[{i}]", Fos[i]); objnames.Add($"{nameof(Fos)}[{i}]", Fos[i]);
return objnames; return objnames;
......
using System.ComponentModel;
namespace XXX.Common
{
public class Accessory : INotifyPropertyChanged
{
public Accessory()
{
}
#region 辅助代码生成
/// <summary>
/// 温度设定SV改变
/// </summary>
[Description("温度设定SV改变")]
public bool IsTempSVChanged{ get; set; }
#endregion
public event PropertyChangedEventHandler PropertyChanged;
}
}
...@@ -51,6 +51,12 @@ namespace XXX.Common ...@@ -51,6 +51,12 @@ namespace XXX.Common
[Description("自整定开关")] [Description("自整定开关")]
public bool IsSelfAdjustingOn{ get; set; } public bool IsSelfAdjustingOn{ get; set; }
/// <summary>
/// 温度设定SV改变
/// </summary>
[Description("温度设定SV改变")]
public bool IsTempSVChanged{ get; set; }
#endregion #endregion
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
} }
......
...@@ -1268,10 +1268,181 @@ ...@@ -1268,10 +1268,181 @@
{ {
"DeviceIndex": 0, "DeviceIndex": 0,
"Mode": "0", "Mode": "0",
"Addr": 1140, "Addr": 1080,
"Type": "bool", "Type": "bool",
"Scale": 1.0, "Scale": 1.0,
"OwnerName": "Accessory", "OwnerName": "Fos[0]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1080,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[1]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1080,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[2]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1080,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[3]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1080,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[4]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1080,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[5]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1080,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[6]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1080,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[7]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1100,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[8]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1100,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[9]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1100,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[10]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1100,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[11]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1100,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[12]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1100,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[13]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1100,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[14]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1100,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[15]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1120,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[16]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1120,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[17]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1120,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[18]",
"PropertyName": "IsTempSVChanged"
},
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 1120,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Fos[19]",
"PropertyName": "IsTempSVChanged" "PropertyName": "IsTempSVChanged"
} }
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment