diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-12-30 18:18:27 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-12-30 18:18:27 +0200 |
| commit | 62abc03d76ecfd8ab16ffefe6a4f6a7b94f62203 (patch) | |
| tree | 58a7ce6bc30d7e049bf2b4c1aa272306796350eb /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs | |
| parent | 80221695b6c6fd48f7a3e2e70850e68788560b31 (diff) | |
| parent | 71e6a3ec2197eba8b5e1b295914653426064f745 (diff) | |
| download | Tango-62abc03d76ecfd8ab16ffefe6a4f6a7b94f62203.tar.gz Tango-62abc03d76ecfd8ab16ffefe6a4f6a7b94f62203.zip | |
BAD MERGE.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs | 42 |
1 files changed, 21 insertions, 21 deletions
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 6e9c62e74..94c1ed802 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 @@ -64,29 +64,29 @@ namespace Tango.MachineStudio.Developer.Views { if (_vm != null && _vm.ActiveJob != null) { - //List<Segment> segments = new List<Segment>(); - //foreach (var s in _vm.ActiveJob.OrderedSegments) - //{ - // segments.Add(s); + List<Segment> segments = new List<Segment>(); + foreach (var s in _vm.ActiveJob.OrderedSegments) + { + segments.Add(s); - // if (_vm.ActiveJob.EnableInterSegment && _vm.ActiveJob.OrderedSegments.IndexOf(s) != _vm.ActiveJob.OrderedSegments.Count - 1) - // { - // segments.Add(new Segment() - // { - // Length = _vm.ActiveJob.InterSegmentLength, - // BrushStops = new SynchronizedObservableCollection<BrushStop>() - // { - // new BrushStop() - // { - // ColorSpace = new ColorSpace(), - // Color = Colors.White, - // } - // }, - // }); - // } - //} + if (_vm.ActiveJob.EnableInterSegment && _vm.ActiveJob.OrderedSegments.IndexOf(s) != _vm.ActiveJob.OrderedSegments.Count - 1) + { + segments.Add(new Segment() + { + Length = _vm.ActiveJob.InterSegmentLength, + BrushStops = new SynchronizedObservableCollection<BrushStop>() + { + new BrushStop() + { + ColorSpace = new ColorSpace(), + Color = Colors.White, + } + }, + }); + } + } - //jobBrushList.ItemsSource = segments; + jobBrushList.ItemsSource = segments; UpdateGradientBrushDisplay(); } } |