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(); }
}