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

1 files changed, 12 insertions, 0 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 adf85516e..e1fddac83 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
@@ -281,6 +281,12 @@ namespace Tango.MachineStudio.Technician.ViewModels
         /// Gets or sets the upload partial hardware configuration command.
         /// </summary>
         public RelayCommand UploadPartialHardwareConfigurationCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the reset command.
+        /// </summary>
+        public RelayCommand ResetGraphsCommand { get; set; }
+
         #endregion
 
         #region Constructors
@@ -356,6 +362,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
             RenameTabCommand = new RelayCommand(RenameTab);
             ImportProjectTabsCommand = new RelayCommand(ImportProjectTabs);
             UploadPartialHardwareConfigurationCommand = new RelayCommand(UploadPartialHardwareConfiguration);
+            ResetGraphsCommand = new RelayCommand(ClearAllGraphs);
         }
 
         #endregion
@@ -375,6 +382,8 @@ namespace Tango.MachineStudio.Technician.ViewModels
             {
                 ResetHardwareConfiguration(false);
             }
+
+            ClearAllGraphs();
         }
 
         /// <summary>
@@ -2462,6 +2471,9 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
         public void ClearAllGraphs()
         {
+            _start_time = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 0, 0, 0);
+            _last_time = DateTime.Now;
+
             foreach (var controller in _singleControllers)
             {
                 controller.Value.Clear();