aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-02-19 17:17:25 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-02-19 17:17:25 +0200
commit8feeef663f8984c609cb3aa530d09ffcffda5709 (patch)
tree6b69a7a62ea1234ba5b16948dd3781078834a973 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs
parent95b4e14bc4e06ffb94199f5ec4e0d2d9bebceeff (diff)
downloadTango-8feeef663f8984c609cb3aa530d09ffcffda5709.tar.gz
Tango-8feeef663f8984c609cb3aa530d09ffcffda5709.zip
Working on new developer module...
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs
index e52a686bc..2bd36e449 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs
@@ -77,18 +77,18 @@ namespace Tango.MachineStudio.Developer.Views
private void _jobBrushTimer_Tick(object sender, EventArgs e)
{
- if (_vm != null && _vm.SelectedJob != null)
+ if (_vm != null && _vm.ActiveJob != null)
{
List<Segment> segments = new List<Segment>();
- foreach (var s in _vm.SelectedJob.Segments)
+ foreach (var s in _vm.ActiveJob.Segments)
{
segments.Add(s);
- if (_vm.SelectedJob.EnableInterSegment && _vm.SelectedJob.Segments.IndexOf(s) != _vm.SelectedJob.Segments.Count - 1)
+ if (_vm.ActiveJob.EnableInterSegment && _vm.ActiveJob.Segments.IndexOf(s) != _vm.ActiveJob.Segments.Count - 1)
{
segments.Add(new Segment()
{
- Length = _vm.SelectedJob.InterSegmentLength,
+ Length = _vm.ActiveJob.InterSegmentLength,
BrushStops = new System.Collections.ObjectModel.ObservableCollection<BrushStop>()
{
new BrushStop()