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

1 files changed, 0 insertions, 10 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index a641c87b6..efbcaf5ad 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1448,8 +1448,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 IsJobRunning = true;
                 ShowJobStatus = true;
 
-                _eventLogger.Log(String.Format("Job '{0}' started...", ActiveJob.Name));
-
                 JobHandler.StatusChanged += (x, status) =>
                 {
                     if (IsJobRunning)
@@ -1469,25 +1467,21 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     if (!segment.IsInterSegment)
                     {
                         _speech.SpeakInfo(String.Format("Segment {0} Started.", segment.SegmentIndex));
-                        _eventLogger.Log(String.Format("Segment {0} Started.", segment.SegmentIndex) + Environment.NewLine + segment.ToJsonString());
                     }
                     else
                     {
                         _speech.SpeakInfo(String.Format("Inter Segment Started."));
-                        _eventLogger.Log("Inter Segment Started.");
                     }
                 };
 
                 JobHandler.UnitCompleted += (x, unit) =>
                 {
                     _speech.SpeakInfo(String.Format("{0} Units Completed.", unit + 1));
-                    _eventLogger.Log(String.Format("{0} Units Completed.", unit + 1));
                 };
 
                 JobHandler.Failed += (x, ex) =>
                 {
                     LogManager.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
-                    _eventLogger.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
                     SetJobFailed();
 
                     InvokeUI(() =>
@@ -1501,13 +1495,11 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 {
                     _speech.SpeakInfo("Finalizing job...");
                     LogManager.Log(String.Format("Finalizing job {0}.", RunningJob.Name));
-                    _eventLogger.Log(String.Format("Finalizing job {0}.", RunningJob.Name));
                 };
 
                 JobHandler.Completed += (x, e) =>
                 {
                     LogManager.Log(String.Format("Job {0} has completed.", RunningJob.Name));
-                    _eventLogger.Log(String.Format("Job {0} has completed.", RunningJob.Name));
                     SetJobCompleted();
                     StopRecordingIfInProgress();
                 };
@@ -1521,7 +1513,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     }
 
                     LogManager.Log(String.Format("Job {0} has been canceled.", RunningJob.Name));
-                    _eventLogger.Log(String.Format("Job {0} has been canceled.", RunningJob.Name));
                     StopRecordingIfInProgress();
                     //Finally Canceled..
                 };
@@ -1539,7 +1530,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
             catch (Exception ex)
             {
                 LogManager.Log(ex);
-                _eventLogger.Log(ex, "An error occurred while starting the job.");
                 _notification.ShowError("An error occurred while starting the job. " + Environment.NewLine + ex.Message);
                 SetJobFailed();
                 StopRecordingIfInProgress();