Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added overrideEditable field into heads signalR push

Browse Source
This commit is contained in:
Lucio Maranta
2018-03-15 15:05:04 +01:00
parent fb908a8903
commit d94bcff103
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libs/CMS_CORE_Library.dll
BIN
View File
Binary file not shown.
Step.Model/DTOModels/DTOHeadModel.cs
+4
View File
@@ -6,6 +6,7 @@
public string Type;
public bool inWarning;
public bool inAlarm;
public bool OverrideEditable;
public byte Override;
public byte Process;
@@ -26,6 +27,9 @@
if (Override != item.Override)
return false;
if (OverrideEditable != item.OverrideEditable)
return false;
return true;
}
}
Step.NC/NcHandler.cs
+6 -3
View File
@@ -515,12 +515,13 @@ namespace Step.NC
Id = head.Id,
Process = head.Process,
Type = configuredHead.Type.ToString(),
ActualSpeed = head.ActualSpeed_Pressure,
inWarning = head.ActualSpeed_Pressure >= configuredHead.WarningLimit,
inAlarm = head.ActualSpeed_Pressure >= configuredHead.AlarmLimit,
OverrideEditable = head.OverrideEditable,
ActualSpeed = head.ActualSpeed_Pressure,
Load = head.Load_Abrasive,
MountedTool = head.MountedTool_Vacum,
Override = head.Override,
Override = head.Override
});
}
break;
@@ -531,9 +532,10 @@ namespace Step.NC
Id = head.Id,
Process = head.Process,
Type = configuredHead.Type.ToString(),
ActualPressure = head.ActualSpeed_Pressure,
inWarning = head.MountedTool_Vacum >= configuredHead.WarningLimit,
inAlarm = head.MountedTool_Vacum >= configuredHead.AlarmLimit,
OverrideEditable = head.OverrideEditable,
ActualPressure = head.ActualSpeed_Pressure,
Abrasive = head.Load_Abrasive,
Vacum = head.MountedTool_Vacum,
Override = head.Override
@@ -549,6 +551,7 @@ namespace Step.NC
Type = configuredHead.Type.ToString(),
inAlarm = false,
inWarning = false,
OverrideEditable = head.OverrideEditable,
Override = head.Override
});
}