diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs index 38005f2bc..7f9d0e57d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/Models/JobRunModel.cs @@ -22,19 +22,17 @@ namespace Tango.MachineStudio.Statistics.Models public RmlModel Rml { get; set; } - public bool IsEureka { get; set; } - public String Gen { get { - return JobRun.MachineType == (int)MachineTypes.Eureka ? "X4" : "X1"; + return JobRun.MachineTypeEnum.ToShortName(); } } public double ActualStartPosition { - get { return IsEureka ? JobRun.ActualStartPosition * 4 : JobRun.ActualStartPosition; } + get { return JobRun.MachineTypeEnum == MachineTypes.Eureka ? JobRun.ActualStartPosition * 4 : JobRun.ActualStartPosition; } } public double ActualEndPosition @@ -43,11 +41,11 @@ namespace Tango.MachineStudio.Statistics.Models { if (JobRun.ActualEndPosition > 0) { - return IsEureka ? JobRun.ActualEndPosition * 4 : JobRun.ActualEndPosition; + return JobRun.MachineTypeEnum == MachineTypes.Eureka ? JobRun.ActualEndPosition * 4 : JobRun.ActualEndPosition; } else { - return IsEureka ? JobRun.EndPosition * 4 : JobRun.EndPosition; + return JobRun.MachineTypeEnum == MachineTypes.Eureka ? JobRun.EndPosition * 4 : JobRun.EndPosition; } } } @@ -64,7 +62,7 @@ namespace Tango.MachineStudio.Statistics.Models { get { - return (IsEureka ? JobRun.JobLogicalLength * 4 : JobRun.JobLogicalLength); + return (JobRun.MachineTypeEnum == MachineTypes.Eureka ? JobRun.JobLogicalLength * 4 : JobRun.JobLogicalLength); } } @@ -85,12 +83,11 @@ namespace Tango.MachineStudio.Statistics.Models HeatingDuration = JobRun.ActualStartDate - JobRun.HeatingStartDate; } - if (JobRun.MachineType == (int)MachineTypes.Eureka) + if (JobRun.MachineTypeEnum == MachineTypes.Eureka) { JobRun.JobLogicalLength *= 4; JobRun.JobLength *= 4; JobRun.EndPosition *= 4; - IsEureka = true; } } } |