aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-07-09 16:19:47 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-07-09 16:19:47 +0300
commitdf7dff9855ae205ce0a02d8fd460cd3399c5e362 (patch)
tree2ce98e89b13956e21674c39cae36d26ba6dbcdc5 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels
parent4147c287ad90a05eae551d4ccfdccc707bebd86f (diff)
downloadTango-df7dff9855ae205ce0a02d8fd460cd3399c5e362.tar.gz
Tango-df7dff9855ae205ce0a02d8fd460cd3399c5e362.zip
Fixed an issue with MS DB Module table scrolling lagging.
Added new event type for embedded job status message.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs13
1 files changed, 8 insertions, 5 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 9c6fa6239..35221c460 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
@@ -635,7 +635,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
LogManager.Log("Initializing relay commands...");
- TangoIOC.Default.GetInstanceWhenAvailable<DataCapture.ViewModels.MainViewVM>((vm) =>
+ TangoIOC.Default.GetInstanceWhenAvailable<DataCapture.ViewModels.MainViewVM>((vm) =>
{
_dataCaptureVM = vm;
_dataCaptureVM.RelayCommandsInvalidated += (_, __) => StartJobAndRecordCommand.RaiseCanExecuteChanged();
@@ -998,8 +998,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
}
JobEvents.Clear();
- //RunningJobRemainingTime = TimeSpan.Zero;
- //RunningJobProgress = 0;
IsJobFailed = false;
IsJobCanceled = false;
IsJobCompleted = false;
@@ -1020,15 +1018,20 @@ namespace Tango.MachineStudio.Developer.ViewModels
_eventLogger.Log(String.Format("Job '{0}' started...", ActiveJob.Name));
- _jobHandler.StatusChanged += (x, status) =>
+ _jobHandler.StatusChanged += (x, status) =>
{
if (IsJobRunning)
{
RunningJobStatus = status;
+
+ if (status.Message != null)
+ {
+ _eventLogger.Log(BL.Enumerations.EventTypes.JobStatus, status.Message);
+ }
}
};
- _jobHandler.SegmentStarted += (x, segment) =>
+ _jobHandler.SegmentStarted += (x, segment) =>
{
if (!segment.IsInterSegment)
{