Revision of statistics and resumed jobs.

1 files changed, 36 insertions, 0 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 7646e91c0..184135c40 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,6 +22,8 @@ namespace Tango.MachineStudio.Statistics.Models
 
         public RmlModel Rml { get; set; }
 
+        public bool IsEureka { get; set; }
+
         public String Gen
         {
             get
@@ -30,6 +32,39 @@ namespace Tango.MachineStudio.Statistics.Models
             }
         }
 
+        public double ActualStartPosition
+        {
+            get { return IsEureka ? JobRun.ActualStartPosition * 4 : JobRun.ActualStartPosition; }
+        }
+
+        public double ActualEndPosition
+        {
+            get
+            {
+                if (JobRun.ActualEndPosition > 0)
+                {
+                    return IsEureka ? JobRun.ActualEndPosition * 4 : JobRun.ActualEndPosition;
+                }
+                else
+                {
+                    return IsEureka ? JobRun.EndPosition * 4 : JobRun.EndPosition;
+                }
+            }
+        }
+
+        public double Distance
+        {
+            get
+            {
+                return ActualEndPosition - ActualStartPosition;
+            }
+        }
+
+        public double ActualLength
+        {
+            get { return JobRun.JobLogicalLength; }
+        }
+
         public void Init()
         {
             if (JobRun.HeatingStartDate != null)
@@ -47,6 +82,7 @@ namespace Tango.MachineStudio.Statistics.Models
                 JobRun.JobLogicalLength *= 4;
                 JobRun.JobLength *= 4;
                 JobRun.EndPosition *= 4;
+                IsEureka = true;
             }
         }
     }