|
@@ -128,13 +128,13 @@ namespace FurnaceUI.Views.Editors.ELK
|
|
|
return "#FFB0D1F1";
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- public bool IsDPRON { get; set; }
|
|
|
+ [Subscription("PM1.ValveAV93.DeviceData")]
|
|
|
+ public AITValveData ValveDPR { get; set; }
|
|
|
public string ValveDPRBrush
|
|
|
{
|
|
|
get
|
|
|
{
|
|
|
- if (IsDPRON)
|
|
|
+ if (ValveDPR != null && ValveDPR.VirtualFeedback)
|
|
|
{
|
|
|
return "Green";
|
|
|
}
|
|
@@ -1231,7 +1231,7 @@ namespace FurnaceUI.Views.Editors.ELK
|
|
|
if (ValveBWR != null) InvokeClient.Instance.Service.DoOperation($"{ValveBWR.UniqueName}.{AITValveOperation.GVVirtualTurnValve}", item.Value);
|
|
|
break;
|
|
|
case "ValveAV93":
|
|
|
- //if (ValveDPR != null) InvokeClient.Instance.Service.DoOperation($"{ValveDPR.UniqueName}.{AITValveOperation.GVVirtualTurnValve}", item.Value);
|
|
|
+ if (ValveDPR != null) InvokeClient.Instance.Service.DoOperation($"{ValveDPR.UniqueName}.{AITValveOperation.GVVirtualTurnValve}", item.Value);
|
|
|
break;
|
|
|
case "HMNT":
|
|
|
if (HMNT != null) InvokeClient.Instance.Service.DoOperation($"{HMNT.UniqueName}.{AITValveOperation.GVVirtualTurnValve}", item.Value);
|
|
@@ -1252,7 +1252,7 @@ namespace FurnaceUI.Views.Editors.ELK
|
|
|
if (CZERO != null) InvokeClient.Instance.Service.DoOperation($"{CZERO.UniqueName}.{AITValveOperation.GVVirtualTurnValve}", item.Value);
|
|
|
break;
|
|
|
case "DPR":
|
|
|
- IsDPRON = item.Value;
|
|
|
+ if (ValveDPR != null) InvokeClient.Instance.Service.DoOperation($"{ValveDPR.UniqueName}.{AITValveOperation.GVVirtualTurnValve}", item.Value);
|
|
|
break;
|
|
|
case "CEXH":
|
|
|
IsCEXHOn = item.Value;
|
|
@@ -1428,10 +1428,10 @@ namespace FurnaceUI.Views.Editors.ELK
|
|
|
item.Value = ValveBWR.VirtualFeedback;
|
|
|
break;
|
|
|
case "ValveAV93":
|
|
|
- //item.Value = ValveDPR.VirtualFeedback;
|
|
|
+ item.Value = ValveDPR.VirtualFeedback;
|
|
|
break;
|
|
|
case "DPR":
|
|
|
- item.Value = IsDPRON;
|
|
|
+ item.Value = ValveDPR.VirtualFeedback;
|
|
|
break;
|
|
|
case "CEXH":
|
|
|
item.Value = IsCEXHOn;
|
|
@@ -1488,10 +1488,10 @@ namespace FurnaceUI.Views.Editors.ELK
|
|
|
setCmd = "BWR";
|
|
|
break;
|
|
|
case "DPR":
|
|
|
- IsDPRON = !IsDPRON;
|
|
|
- setValue = IsDPRON;
|
|
|
- SelectedStep.ValveSets.FirstOrDefault(x => x.Name == "DPR").SetValue(IsDPRON);
|
|
|
- setCmd = "DPR";
|
|
|
+ var valveDpr = !ValveDPR.VirtualFeedback;
|
|
|
+ setValue = valveDpr;
|
|
|
+ InvokeClient.Instance.Service.DoOperation($"{ValveDPR.UniqueName}.{AITValveOperation.GVVirtualTurnValve}", valveDpr);
|
|
|
+ setCmd = "ValveAV93";
|
|
|
//var valveDpr = !ValveDPR.VirtualFeedback;
|
|
|
//setValue = valveDpr;
|
|
|
//SelectedStep.ValveSets.FirstOrDefault(x => x.Name == "ValveAV93").SetValue(valveDpr);
|