Merge branch 'eureka' of https://twinetfs.visualstudio.com/Tango/_git/Tango into eureka

2 files changed, 16 insertions, 5 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
index f40a89f42..17b676499 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
@@ -361,6 +361,9 @@ namespace Tango.PPC.UI.ViewModels
                         if (MachineProvider.MachineOperator.Status != MachineStatuses.Disconnected)
                             ResetMachine();
                         return;
+                    case PowerEurekaViewVM.PowerActionEnum.CloseApp:
+                        CloseApplication();
+                        return;
                     default:
                         return;
                 }
@@ -455,6 +458,14 @@ namespace Tango.PPC.UI.ViewModels
             }
         }
 
+        private async void CloseApplication()
+        {
+            if (await NotificationProvider.ShowQuestion("Are you sure you want to close the application?"))
+            {
+                ApplicationManager.ShutDown();
+            }
+        }
+
         /// <summary>
         /// Powers off the machine.
         /// </summary>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
index 103084e11..653c2368f 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
@@ -571,17 +571,17 @@ namespace Tango.PPC.UI.ViewModels
             IsDyeingProcess = (RunningJobStatus != null && RunningJobStatus.CurrentSegment != null);
             if (RunningJobStatus != null && RunningJobStatus.CurrentSegment != null)
             {
-                var segment = Job.Segments.FirstOrDefault(x => x.SegmentIndex == _runningJobStatus.CurrentSegment.SegmentIndex);
+                var currentSegmentIndex = Math.Max(_runningJobStatus.CurrentSegment.SegmentIndex - (Job.Segments.Count * RunningJobStatus.CurrentUnit), 0);
+                var segment = Job.Segments.FirstOrDefault(x => x.SegmentIndex == currentSegmentIndex);
+                // var segment = Job.Segments.FirstOrDefault(x => x.SegmentIndex == _runningJobStatus.CurrentSegment.SegmentIndex);
                 if (segment != null)
                 {
-
                     if (_handler.JobTicket.Segments.Count > 0)
                     {
                         JobBrushStop = _handler.JobTicket.Segments[Job.OrderedSegments.IndexOf(segment)].BrushStops.First();
-                    }
-
-                    CurrentBrushStop = segment.FirstBrushStop;
+                    }  
                 }
+                CurrentBrushStop = RunningJobStatus.CurrentSegment.FirstBrushStop;
             }
         }