diff options
Diffstat (limited to 'Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models')
| -rw-r--r-- | Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs index 527794e75..fe240f18d 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs @@ -29,7 +29,7 @@ namespace Tango.FSE.Statistics.Models public JobRunExtendedInfo ExtendedInfo { get; set; } public bool IsAdvancedMode { get; set; } public VectorFineTuningRunModel FineTuningModel { get; set; } - public bool IsEureka { get; set; } + public MachineTypes MachineType { get; set; } public bool IsFineTuning { @@ -135,7 +135,7 @@ namespace Tango.FSE.Statistics.Models { get { - var length = IsEureka ? JobRun.JobLogicalLength * 4 : JobRun.JobLogicalLength; + var length = MachineType == MachineTypes.Eureka ? JobRun.JobLogicalLength * 4 : JobRun.JobLogicalLength; return JobRun.NumberOfUnits > 1 ? $"{length} x{JobRun.NumberOfUnits}" : length.ToString(); } } @@ -144,23 +144,23 @@ namespace Tango.FSE.Statistics.Models { get { - return (IsEureka ? JobRun.JobLogicalLength * 4 : JobRun.JobLogicalLength); + return (MachineType == MachineTypes.Eureka ? JobRun.JobLogicalLength * 4 : JobRun.JobLogicalLength); } } public double JobLength { - get { return IsEureka ? JobRun.JobLength * 4 : JobRun.JobLength; } + get { return MachineType == MachineTypes.Eureka ? JobRun.JobLength * 4 : JobRun.JobLength; } } public double EndPosition { - get { return IsEureka ? JobRun.EndPosition * 4 : JobRun.EndPosition; } + get { return MachineType == MachineTypes.Eureka ? JobRun.EndPosition * 4 : JobRun.EndPosition; } } public double ActualStartPosition { - get { return IsEureka ? JobRun.ActualStartPosition * 4 : JobRun.ActualStartPosition; } + get { return MachineType == MachineTypes.Eureka ? JobRun.ActualStartPosition * 4 : JobRun.ActualStartPosition; } } public double ActualEndPosition @@ -169,11 +169,11 @@ namespace Tango.FSE.Statistics.Models { if (JobRun.ActualEndPosition > 0) { - return IsEureka ? JobRun.ActualEndPosition * 4 : JobRun.ActualEndPosition; + return MachineType == MachineTypes.Eureka ? JobRun.ActualEndPosition * 4 : JobRun.ActualEndPosition; } else { - return IsEureka ? JobRun.EndPosition * 4 : JobRun.EndPosition; + return MachineType == MachineTypes.Eureka ? JobRun.EndPosition * 4 : JobRun.EndPosition; } } } @@ -257,5 +257,6 @@ namespace Tango.FSE.Statistics.Models return ActualEndPosition - ActualStartPosition; } } + } } |