From 8feeef663f8984c609cb3aa530d09ffcffda5709 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 19 Feb 2018 17:17:25 +0200 Subject: Working on new developer module... --- .../Tango.MachineStudio.Developer/Views/JobView.xaml.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs index a030cf885..41886357b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs @@ -55,18 +55,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 segments = new List(); - 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() { new BrushStop() @@ -136,5 +136,10 @@ namespace Tango.MachineStudio.Developer.Views { e.Handled = true; } + + private void OnSegmentDrop(object sender, DropEventArgs e) + { + _vm.OnDropSegment(e.Draggable.DataContext as Segment, e.Droppable.DataContext as Segment); + } } } -- cgit v1.3.1