diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-09 16:19:47 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-09 16:19:47 +0300 |
| commit | df7dff9855ae205ce0a02d8fd460cd3399c5e362 (patch) | |
| tree | 2ce98e89b13956e21674c39cae36d26ba6dbcdc5 /Software/Visual_Studio/MachineStudio | |
| parent | 4147c287ad90a05eae551d4ccfdccc707bebd86f (diff) | |
| download | Tango-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')
4 files changed, 10 insertions, 10 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Controls/DbTableView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Controls/DbTableView.xaml index d0f6b045a..6602d8973 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Controls/DbTableView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Controls/DbTableView.xaml @@ -5,7 +5,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" mc:Ignorable="d" - d:DesignHeight="720" d:DesignWidth="1300"> + d:DesignHeight="720" d:DesignWidth="1300" BorderThickness="1" BorderBrush="{StaticResource AccentColorBrush}"> <Grid> <Grid> 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) { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MdiContainerControl.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MdiContainerControl.xaml index b248a4aec..50c2aaf46 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MdiContainerControl.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/MdiContainerControl.xaml @@ -31,9 +31,6 @@ <ItemsControl.ItemTemplate> <DataTemplate> <Grid> - <Grid.Effect> - <DropShadowEffect ShadowDepth="0" BlurRadius="10" /> - </Grid.Effect> <Grid> <Grid.RowDefinitions> <RowDefinition Height="25"/> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt index 4ab3e3519..3a3a449ca 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt @@ -1 +1 @@ -Mon 07/09/2018 15:24:42.63 +Mon 07/09/2018 16:10:08.89 |