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

1 files changed, 107 insertions, 26 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index 7c2acfdbb..3dff65fbc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -25,7 +25,7 @@ using Tango.MachineStudio.Technician.TechItems;
 using Tango.PMR.Diagnostics;
 using Tango.Settings;
 using Tango.SharedUI;
-using Tango.Integration.Services;
+using Tango.Integration.ExternalBridge;
 using Tango.BL.Enumerations;
 using Tango.BL;
 using Tango.MachineStudio.Common.EventLogging;
@@ -43,6 +43,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
     public class MachineTechViewVM : StudioViewModel<TechnicianModule>
     {
         private List<PropertyInfo> _diagnoticsMonitorsDataProperties;
+        private IDiagnosticsFrameProvider _diagnosticsFrameProvider;
         private Dictionary<SingleGraphItem, GraphController> _singleControllers;
         private Dictionary<MultiGraphItem, GraphMultiController> _multiControllers;
         private static object _elementsLock = new object();
@@ -149,6 +150,28 @@ namespace Tango.MachineStudio.Technician.ViewModels
             set { _currentDiagnosticsResponseSize = value; RaisePropertyChanged(nameof(CurrentDiagnosticsResponseSize)); }
         }
 
+        private int _graphsDurationSeconds;
+        /// <summary>
+        /// Gets or sets the graphs duration seconds.
+        /// </summary>
+        public int GraphsDurationSeconds
+        {
+            get { return _graphsDurationSeconds; }
+            set { _graphsDurationSeconds = value; RaisePropertyChangedAuto(); }
+        }
+
+        private int _tempGraphsDurationSeconds;
+        /// <summary>
+        /// Gets or sets the temporary graphs duration seconds.
+        /// </summary>
+        public int TempGraphsDurationSeconds
+        {
+            get { return _tempGraphsDurationSeconds; }
+            set { _tempGraphsDurationSeconds = value; RaisePropertyChangedAuto(); }
+        }
+
+
+
         #endregion
 
         #region Commands
@@ -183,6 +206,8 @@ namespace Tango.MachineStudio.Technician.ViewModels
         /// </summary>
         public RelayCommand ResetHardwareConfigurationCommand { get; set; }
 
+        public RelayCommand UpdateGraphsDurationCommand { get; set; }
+
         #endregion
 
         #region Constructors
@@ -192,10 +217,13 @@ namespace Tango.MachineStudio.Technician.ViewModels
         /// </summary>
         /// <param name="applicationManager">The application manager.</param>
         /// <param name="notificationProvider">The notification provider.</param>
-        public MachineTechViewVM(IStudioApplicationManager applicationManager, INotificationProvider notificationProvider, IDiagnosticsFrameProvider _diagnosticsFrameProvider, IEventLogger eventLogger)
+        public MachineTechViewVM(IStudioApplicationManager applicationManager, INotificationProvider notificationProvider, IDiagnosticsFrameProvider diagnosticsFrameProvider, IEventLogger eventLogger)
         {
             _settings = SettingsManager.Default.GetOrCreate<TechnicianModuleSettings>();
 
+            GraphsDurationSeconds = _settings.GraphsDuration;
+            TempGraphsDurationSeconds = GraphsDurationSeconds;
+
             _notification = notificationProvider;
             _eventLogger = eventLogger;
             _singleControllers = new Dictionary<SingleGraphItem, GraphController>();
@@ -217,14 +245,28 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
             if (File.Exists(_lastTechProjectFile))
             {
-                OpenProjectFile(_lastTechProjectFile);
+                try
+                {
+                    OpenProjectFile(_lastTechProjectFile);
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "Error loading last project file.");
+                }
             }
 
+            _diagnosticsFrameProvider = diagnosticsFrameProvider;
             _diagnosticsFrameProvider.FrameReceived += DiagnosticsFrameProvider_FrameReceived;
 
             UploadHardwareConfigurationCommand = new RelayCommand(UploadHardwareConfiguration);
             SyncHardwareConfigurationCommand = new RelayCommand(SyncHardwareConfiguration);
             ResetHardwareConfigurationCommand = new RelayCommand(() => ResetHardwareConfiguration());
+            UpdateGraphsDurationCommand = new RelayCommand(() => 
+            {
+                GraphsDurationSeconds = TempGraphsDurationSeconds;
+                _settings.GraphsDuration = GraphsDurationSeconds;
+                ClearAllGraphs();
+            });
         }
 
         #endregion
@@ -320,7 +362,16 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
                             if (_singleControllers.TryGetValue(graphItem, out controller))
                             {
-                                controller.PushData(GetDataArray(graphItem.TechMonitor, prop.GetValue(data.Monitors)));
+                                var points = GetDataArray(graphItem.TechMonitor, prop.GetValue(data.Monitors));
+
+                                int maxPoints = (int)(_diagnosticsFrameProvider.FrameRate * GraphsDurationSeconds * points.Count);
+
+                                InvokeUI(() =>
+                                {
+                                    graphItem.Editor.InnerGraph.InnerGraph.MaxPoints = maxPoints;
+                                });
+
+                                controller.PushData(points);
                             }
                         }
                     }
@@ -336,7 +387,19 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
                             if (_multiControllers.TryGetValue(graphItem, out controller))
                             {
-                                controller.PushData(GetDataMatrix(graphItem.TechMonitor, prop.GetValue(data.Monitors)));
+                                var points = GetDataMatrix(graphItem.TechMonitor, prop.GetValue(data.Monitors));
+
+                                if (points.Count > 0)
+                                {
+                                    int maxPoints = (int)(_diagnosticsFrameProvider.FrameRate * GraphsDurationSeconds * points[0].Count);
+
+                                    InvokeUI(() =>
+                                    {
+                                        graphItem.Editor.InnerGraph.InnerGraph.MaxPoints = maxPoints;
+                                    });
+                                }
+
+                                controller.PushData(points);
                             }
                         }
                     }
@@ -794,7 +857,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StartMotorJogging(new MotorJoggingRequest()
                         {
-                            Code = item.HardwareMotorType.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code,
                             Direction = MotorDirection.Forward,
                         });
                     }
@@ -802,14 +865,14 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StopMotorJogging(new MotorAbortJoggingRequest()
                         {
-                            Code = item.HardwareMotorType.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code,
                         });
                     }
                     else if (action == MotorActionType.BackwardPressed)
                     {
                         await MachineOperator.StartMotorJogging(new MotorJoggingRequest()
                         {
-                            Code = item.HardwareMotorType.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code,
                             Direction = MotorDirection.Backward,
                         });
                     }
@@ -817,7 +880,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StopMotorJogging(new MotorAbortJoggingRequest()
                         {
-                            Code = item.HardwareMotorType.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code,
                         });
                     }
                     else if (action == MotorActionType.HomingStarted)
@@ -828,7 +891,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
                         MachineOperator.StartMotorHoming(new MotorHomingRequest()
                         {
-                            Code = item.HardwareMotorType.Code
+                            MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code,
                         })
                         .Subscribe((response) =>
                         {
@@ -848,7 +911,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StopMotorHoming(new MotorAbortHomingRequest()
                         {
-                            Code = item.HardwareMotorType.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)item.HardwareMotorType.Code,
                         });
 
                         item.IsHoming = false;
@@ -878,7 +941,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StartDispenserJogging(new DispenserJoggingRequest()
                         {
-                            Code = item.TechDispenser.Code,
+                            Index = item.TechDispenser.Code,
                             Direction = MotorDirection.Forward,
                         });
                     }
@@ -886,14 +949,14 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StopDispenserJogging(new DispenserAbortJoggingRequest()
                         {
-                            Code = item.TechDispenser.Code,
+                            Index = item.TechDispenser.Code,
                         });
                     }
                     else if (action == MotorActionType.BackwardPressed)
                     {
                         await MachineOperator.StartDispenserJogging(new DispenserJoggingRequest()
                         {
-                            Code = item.TechDispenser.Code,
+                            Index = item.TechDispenser.Code,
                             Direction = MotorDirection.Backward,
                         });
                     }
@@ -901,7 +964,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StopDispenserJogging(new DispenserAbortJoggingRequest()
                         {
-                            Code = item.TechDispenser.Code,
+                            Index = item.TechDispenser.Code,
                         });
                     }
                     else if (action == MotorActionType.HomingStarted)
@@ -912,7 +975,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
                         MachineOperator.StartDispenserHoming(new DispenserHomingRequest()
                         {
-                            Code = item.TechDispenser.Code
+                            Index = item.TechDispenser.Code
                         })
                         .Subscribe((response) =>
                         {
@@ -932,7 +995,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await MachineOperator.StopDispenserHoming(new DispenserAbortHomingRequest()
                         {
-                            Code = item.TechDispenser.Code,
+                            Index = item.TechDispenser.Code,
                         });
 
                         item.IsHoming = false;
@@ -1044,7 +1107,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await Task.WhenAll(item.TechMotors.Select(motor => MachineOperator.StartMotorJogging(new MotorJoggingRequest()
                         {
-                            Code = motor.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)motor.Code,
                             Direction = MotorDirection.Forward,
                         })));
                     }
@@ -1052,14 +1115,14 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await Task.WhenAll(item.TechMotors.Select(motor => MachineOperator.StopMotorJogging(new MotorAbortJoggingRequest()
                         {
-                            Code = motor.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)motor.Code,
                         })));
                     }
                     else if (action == MotorActionType.BackwardPressed)
                     {
                         await Task.WhenAll(item.TechMotors.Select(motor => MachineOperator.StartMotorJogging(new MotorJoggingRequest()
                         {
-                            Code = motor.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)motor.Code,
                             Direction = MotorDirection.Backward,
                         })));
                     }
@@ -1067,7 +1130,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         await Task.WhenAll(item.TechMotors.Select(motor => MachineOperator.StopMotorJogging(new MotorAbortJoggingRequest()
                         {
-                            Code = motor.Code,
+                            MotorType = (PMR.Hardware.HardwareMotorType)motor.Code,
                         })));
                     }
                     //else if (action == MotorActionType.HomingStarted)
@@ -1179,7 +1242,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                         catch (Exception ex)
                         {
                             String msg = "Error uploading process parameters:" + Environment.NewLine + parameters.ToJsonString();
-                            _eventLogger.Log(ex,msg);
+                            _eventLogger.Log(ex, msg);
                             LogManager.Log(ex, msg);
                             _notification.ShowError("Could not upload process parameters." + Environment.NewLine + ex.Message);
                         }
@@ -1199,7 +1262,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
         /// <exception cref="NotImplementedException"></exception>
         private void InitJobRunnerItem(JobRunnerItem item)
         {
-            item.StartJob += () => 
+            item.StartJob += () =>
             {
                 try
                 {
@@ -1209,23 +1272,24 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
                     item.JobHandler = handler;
 
-                    handler.StatusChanged += (x, status) => 
+                    handler.StatusChanged += (x, status) =>
                     {
                         item.RunningJobStatus = status;
                     };
 
-                    handler.Stopped += (x,e) => 
+                    handler.Stopped += (x, e) =>
                     {
                         item.IsJobStarted = false;
                     };
                 }
                 catch (Exception ex)
                 {
+                    item.IsJobStarted = false;
                     _notification.ShowError(ex.Message);
                 }
             };
 
-            item.StopJob += () => 
+            item.StopJob += () =>
             {
                 if (item.JobHandler != null)
                 {
@@ -1596,5 +1660,22 @@ namespace Tango.MachineStudio.Technician.ViewModels
         }
 
         #endregion
+
+        #region Graphs
+
+        public void ClearAllGraphs()
+        {
+            foreach (var controller in _singleControllers)
+            {
+                controller.Value.Clear();
+            }
+
+            foreach (var controller in _multiControllers)
+            {
+                controller.Value.Clear();
+            }
+        }
+
+        #endregion
     }
 }