Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

9 files changed, 334 insertions, 155 deletions

diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk
index 8e5483aaf..ef854af85 100644
--- a/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk
+++ b/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk
diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
index b3a55c2f1..ed1da5b24 100644
--- a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
+++ b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
diff --git a/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk b/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk
index 15b821e21..8264c04b0 100644
--- a/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk
+++ b/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk
diff --git a/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk b/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk
index 4965e9917..00f4779a7 100644
--- a/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk
+++ b/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk
diff --git a/Software/Visual_Studio/Build/Shortcuts/Transport Router.lnk b/Software/Visual_Studio/Build/Shortcuts/Transport Router.lnk
index e979f10c5..c82e7cff2 100644
--- a/Software/Visual_Studio/Build/Shortcuts/Transport Router.lnk
+++ b/Software/Visual_Studio/Build/Shortcuts/Transport Router.lnk
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs
new file mode 100644
index 000000000..ee570ac34
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs
@@ -0,0 +1,285 @@
+using MaterialDesignThemes.Wpf;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using Tango.PMR.Printing;
+
+namespace Tango.MachineStudio.Developer.Controls
+{
+    public class JobOutlineControl : Control
+    {
+        #region members
+        private Size _sizeControl = new Size(0, 0);
+        ScrollViewer _parentScrollViewer = null;
+        public struct LevelOffset
+        {
+            public const double level_0 = 0.0;
+            public const double level_1 = 10.0;
+            public const double level_2 = 20.0;
+            public const double level_3 = 37.0;
+            public const double level_4 = 50.0;
+            public const double level_5 = 60.0;
+            public const double level_6 = 77.0;
+            public const double level_7 = 90.0;
+            public const double level_8 = 100.0;
+        }
+        private double _verticalOffset = 0;
+        private double _viewportHeight = 0;
+        private const double HEADER_FONT_HEIGHT = 35;
+        private const double TITLE_FONT_HEIGHT = 22;
+        private const double SUB_TITLE_FONT_HEIGHT = 19;
+        private const double NORMAL_FONT_HEIGHT = 17;
+        private const double WIDTH = 330;
+
+        #endregion members
+
+        public JobOutlineControl() : base()
+        {
+            Unloaded += JobOutlineControl_Unloaded;
+            DataContextChanged += JobOutlineControl_DataContextChanged;
+            Width = WIDTH;
+        }
+
+        private void JobOutlineControl_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            if (_parentScrollViewer != null)
+            {
+                _parentScrollViewer.ScrollToTop();
+            }
+
+            InvalidateVisual();
+        }
+
+        #region events
+        private void JobOutlineControl_Unloaded(object sender, RoutedEventArgs e)
+        {
+            if (_parentScrollViewer == null)
+            {
+                _parentScrollViewer.ScrollChanged -= ScrollViewer_ScrollChanged;
+            }
+        }
+
+        private void ScrollViewer_ScrollChanged(object sender, ScrollChangedEventArgs e)
+        {
+            if (e.VerticalChange == 0.0)
+                return;
+
+            _verticalOffset = _parentScrollViewer.VerticalOffset;
+            _viewportHeight = _parentScrollViewer.ViewportHeight;
+            InvalidateVisual();
+        }
+        #endregion events
+        #region render
+        protected override void OnRender(DrawingContext drawingContext)
+        {
+            base.OnRender(drawingContext);
+
+            if (!(DataContext is JobTicket job)) return;
+            if (_parentScrollViewer == null)
+            {
+                _parentScrollViewer = this.FindAncestor<ScrollViewer>();
+                _parentScrollViewer.ScrollChanged += ScrollViewer_ScrollChanged;
+            }
+            else if (_viewportHeight == 0)
+            {
+                _viewportHeight = _parentScrollViewer.ActualHeight;
+            }
+            _sizeControl = new Size();
+            _sizeControl.Height += 10;
+            DrawHeaderText(drawingContext, "JOB OUTLINE", 30, LevelOffset.level_0);
+            _sizeControl.Height += HEADER_FONT_HEIGHT;
+
+            _sizeControl.Height += 20;
+            DrawHeaderText(drawingContext, "BASIC", 17, LevelOffset.level_0);
+            _sizeControl.Height += TITLE_FONT_HEIGHT;
+            _sizeControl.Height += 5.0;
+            var basicProps = GetNameValueList(job);
+            foreach (var prop in basicProps)
+            {
+                DrawNameValueText(drawingContext, prop, LevelOffset.level_1, PackIconKind.Pencil);
+                _sizeControl.Height += NORMAL_FONT_HEIGHT;
+            }
+            //JobTicket.Spool
+            if (job.Spool != null)
+            {
+                _sizeControl.Height += 20;
+                DrawHeaderText(drawingContext, "SPOOL", 17, LevelOffset.level_0);
+                _sizeControl.Height += TITLE_FONT_HEIGHT;
+                _sizeControl.Height += 5.0;
+                basicProps = GetNameValueList(job.Spool);
+                foreach (var prop in basicProps)
+                {
+                    DrawNameValueText(drawingContext, prop, LevelOffset.level_1, PackIconKind.Pencil);
+                    _sizeControl.Height += NORMAL_FONT_HEIGHT;
+                }
+            }
+            //JobTicket.ProcessParameters
+            if (job.ProcessParameters != null)
+            {
+                _sizeControl.Height += 20;
+                DrawHeaderText(drawingContext, "PROCESS PARAMETERS", 17, LevelOffset.level_0);
+                _sizeControl.Height += TITLE_FONT_HEIGHT;
+                _sizeControl.Height += 5.0;
+                basicProps = GetNameValueList(job.ProcessParameters);
+                foreach (var prop in basicProps)
+                {
+                    DrawNameValueText(drawingContext, prop, LevelOffset.level_1, PackIconKind.Settings);
+                    _sizeControl.Height += NORMAL_FONT_HEIGHT;
+                }
+            }
+            //JobTicket.Segments
+            if (job.Segments != null)
+            {
+                _sizeControl.Height += 20;
+                DrawHeaderText(drawingContext, "SEGMENTS", 17, LevelOffset.level_0);
+                _sizeControl.Height += TITLE_FONT_HEIGHT;
+                _sizeControl.Height += 10.0;
+                int index = 0;
+                foreach (JobSegment seg in job.Segments)
+                {
+                    DrawHeaderText(drawingContext, string.Format("#{0} SEGMENT", ++index), 14, LevelOffset.level_1);
+                    _sizeControl.Height += SUB_TITLE_FONT_HEIGHT;
+                    basicProps = GetNameValueList(seg);
+                    foreach (var prop in basicProps)
+                    {
+                        DrawNameValueText(drawingContext, prop, LevelOffset.level_2, PackIconKind.Pencil);
+                        _sizeControl.Height += NORMAL_FONT_HEIGHT;
+                    }
+                    //BrushStops
+                    DrawHeaderText(drawingContext, "BRUSH STOPS", 12, LevelOffset.level_3);
+                    _sizeControl.Height += NORMAL_FONT_HEIGHT;
+                    int indexBrush = 0;
+                    foreach (JobBrushStop brushstop in seg.BrushStops)
+                    {
+                        _sizeControl.Height += 5.0;
+                        DrawHeaderText(drawingContext, string.Format("#{0} STOP", ++indexBrush), 11, LevelOffset.level_4);
+                        _sizeControl.Height += NORMAL_FONT_HEIGHT;
+                        var brushStops = GetNameValueList(brushstop);
+                        foreach (var brushstopprop in brushStops)
+                        {
+                            DrawNameValueText(drawingContext, brushstopprop, LevelOffset.level_5, PackIconKind.Pencil);
+                            _sizeControl.Height += NORMAL_FONT_HEIGHT;
+                        }
+                        DrawHeaderText(drawingContext, "DISPENSERS", 12, LevelOffset.level_6);
+                        _sizeControl.Height += NORMAL_FONT_HEIGHT;
+                        _sizeControl.Height += 5.0;
+                        int indexDispenser = 0;
+                        foreach (JobDispenser disp in brushstop.Dispensers)
+                        {
+                            DrawHeaderText(drawingContext, string.Format("#{0} DISPENSER", ++indexDispenser), 11, LevelOffset.level_6);
+                            _sizeControl.Height += NORMAL_FONT_HEIGHT;
+                            var dispProperties = GetNameValueList(disp);
+                            foreach (var dispprop in dispProperties)
+                            {
+                                DrawNameValueText(drawingContext, dispprop, LevelOffset.level_7, PackIconKind.ArrowRightBoldCircle);
+                                _sizeControl.Height += NORMAL_FONT_HEIGHT;
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (Height != _sizeControl.Height)
+            {
+                Height = _sizeControl.Height;
+            }
+        }
+        public IEnumerable<Tuple<String, String>> GetNameValueList(object value)
+        {
+            if (value != null)
+            {
+                var properties = value.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => (!x.PropertyType.IsClass && !typeof(IEnumerable).IsAssignableFrom(x.PropertyType)) || x.PropertyType == typeof(String)).ToList();
+                return properties.Select(x => new Tuple<string, string>(x.Name, x.GetValue(value).ToString()));
+            }
+            else
+            {
+                return null;
+            }
+        }
+        #endregion render
+        #region drawing
+        protected void DrawNameValueText(DrawingContext drawingContext, Tuple<string, string> text, double levelOfOffset, PackIconKind? icon)
+        {
+            if (IsInViewPort())
+            {
+                FormattedText formattedName = new FormattedText(text.Item1 + ": ", System.Globalization.CultureInfo.InvariantCulture, System.Windows.FlowDirection.LeftToRight, new Typeface(this.FontFamily, FontStyles.Normal, FontWeights.Normal, FontStretches.Normal),
+                    12, Foreground);
+                DrawIconTextIfVisible(drawingContext, levelOfOffset, formattedName, icon);
+                double widthOfNameText = formattedName.WidthIncludingTrailingWhitespace + 17 + levelOfOffset;//17 pix for draw icon before text
+
+                FormattedText formattedValue = new FormattedText(text.Item2, System.Globalization.CultureInfo.InvariantCulture, System.Windows.FlowDirection.LeftToRight, new Typeface(this.FontFamily, FontStyles.Normal, FontWeights.SemiBold, FontStretches.Normal),
+                    12, Foreground);
+                DrawIconTextIfVisible(drawingContext, widthOfNameText, formattedValue);
+                _sizeControl.Width = Math.Max(_sizeControl.Width, (widthOfNameText + formattedValue.WidthIncludingTrailingWhitespace));
+            }
+        }
+
+        private bool IsInViewPort()
+        {
+            return (_sizeControl.Height >= _verticalOffset && _sizeControl.Height <= (_verticalOffset + _viewportHeight + 5));
+        }
+
+        protected void DrawHeaderText(DrawingContext drawingContext, string text, int fontSize, double levelOfOffset)
+        {
+            if (IsInViewPort())
+            {
+                FormattedText formattedtext = new FormattedText(text, System.Globalization.CultureInfo.InvariantCulture, System.Windows.FlowDirection.LeftToRight, new Typeface(this.FontFamily, FontStyles.Normal, FontWeights.SemiBold, FontStretches.Normal),
+                    fontSize, Foreground);
+                DrawIconTextIfVisible(drawingContext, levelOfOffset, formattedtext);
+                _sizeControl.Width = Math.Max(_sizeControl.Width, (formattedtext.Width + levelOfOffset));
+            }
+        }
+
+        private void DrawIconTextIfVisible(DrawingContext drawingContext, double levelOfOffset, FormattedText formattedText, PackIconKind? icon = null)
+        {
+            if (icon is PackIconKind)
+            {
+                DrawIcon(drawingContext, (PackIconKind)icon, new Point(levelOfOffset, _sizeControl.Height));
+                levelOfOffset += 17;
+            }
+            drawingContext.DrawText(formattedText, new Point(levelOfOffset, _sizeControl.Height));
+        }
+        private void DrawIcon(DrawingContext drawingContext, PackIconKind kind, Point point)
+        {
+            GeometryGroup group = GetGeometryByIcon(kind);
+            SetGeometryPosition(group, point);
+            drawingContext.DrawGeometry(Foreground, new Pen(Brushes.White, 1), group);
+
+        }
+        private GeometryGroup GetGeometryByIcon(PackIconKind kind)
+        {
+            PackIcon icon = new PackIcon { Kind = kind };
+            Geometry geometry = Geometry.Parse(icon.Data);
+            GeometryGroup group = new GeometryGroup();
+            group.Children.Add(geometry);
+
+            TransformGroup tg = new TransformGroup();
+            tg.Children.Add(new ScaleTransform()
+            {
+                ScaleX = 10d / geometry.Bounds.Width,
+                ScaleY = 10d / geometry.Bounds.Height,
+            });
+            tg.Children.Add(new TranslateTransform() { });
+
+            group.Transform = tg;
+            return group;
+        }
+        private void SetGeometryPosition(GeometryGroup group, Point point)
+        {
+            TransformGroup tg = group.Transform as TransformGroup;
+            (tg.Children[1] as TranslateTransform).X = point.X;
+            (tg.Children[1] as TranslateTransform).Y = point.Y + 1;
+        }
+        #endregion drawing
+
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/StringToEllipsisConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/StringToEllipsisConverter.cs
new file mode 100644
index 000000000..2a14bce1e
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/StringToEllipsisConverter.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace Tango.MachineStudio.Developer.Converters
+{
+    public class StringToEllipsisConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            String text = value as String;
+            int length = 0;
+
+            if (text != null && parameter != null && int.TryParse(parameter.ToString(), out length))
+            {
+                return text.Ellipsis(length);
+            }
+
+            return String.Empty;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
index c2bdf669c..190e8d0fe 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
@@ -93,6 +93,7 @@
     <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
+    <Compile Include="Controls\JobOutlineControl.cs" />
     <Compile Include="Converters\BrushStopLabToColorConverter.cs" />
     <Compile Include="Converters\BrushStopCMYKToColorConverter.cs" />
     <Compile Include="Converters\BrushStopToColorConverter.cs" />
@@ -112,6 +113,7 @@
     <Compile Include="Converters\SegmentToBrushConverterMulti.cs" />
     <Compile Include="Converters\SegmentToGradientStopsConverterMulti.cs" />
     <Compile Include="Converters\SegmentToGradientStopsConverter.cs" />
+    <Compile Include="Converters\StringToEllipsisConverter.cs" />
     <Compile Include="DeveloperModule.cs" />
     <Compile Include="DeveloperModuleSettings.cs" />
     <Compile Include="Navigation\DeveloperNavigationManager.cs" />
@@ -337,9 +339,7 @@
   <ItemGroup>
     <Resource Include="Images\black-screen.jpg" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Controls\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <Resource Include="Images\thread.png" />
   </ItemGroup>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
index 16d312da4..dbe0d835b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
@@ -8,6 +8,7 @@
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:vm="clr-namespace:Tango.MachineStudio.Developer.ViewModels"
              xmlns:global="clr-namespace:Tango.MachineStudio.Developer"
+             xmlns:controls="clr-namespace:Tango.MachineStudio.Developer.Controls"
              xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
              mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
@@ -16,6 +17,7 @@
         <converters:DateTimeUTCToStringConverter x:Key="DateTimeUTCToStringConverter" />
         <localConverters:ObjectToPropertiesConverter x:Key="ObjectToPropertiesConverter" />
         <converters:MathOperatorConverter x:Key="MathOperatorConverter" />
+        <localConverters:StringToEllipsisConverter x:Key="StringToEllipsisConverter" />
     </UserControl.Resources>
 
     <Grid>
@@ -192,13 +194,7 @@
                                 <DataGridTextColumn SortDirection="Descending" Header="DATE TIME" Binding="{Binding DateTime,Converter={StaticResource DateTimeUTCToStringConverter},ConverterParameter='MM/dd/yyyy HH:mm:ss.fff'}" />
                                 <DataGridTextColumn Header="GROUP" Binding="{Binding EventType.Group}" />
                                 <DataGridTextColumn Header="EVENT" Binding="{Binding EventType.Title}" />
-                                <DataGridTemplateColumn Header="MESSAGE" Width="1*">
-                                    <DataGridTemplateColumn.CellTemplate>
-                                        <DataTemplate>
-                                            <TextBlock Text="{Binding Description}" TextTrimming="CharacterEllipsis"></TextBlock>
-                                        </DataTemplate>
-                                    </DataGridTemplateColumn.CellTemplate>
-                                </DataGridTemplateColumn>
+                                <DataGridTextColumn Header="MESSAGE" Width="1*" Binding="{Binding Description,Converter={StaticResource StringToEllipsisConverter},ConverterParameter=100}" />
                             </DataGrid.Columns>
                         </DataGrid>
                     </Grid>
@@ -207,158 +203,25 @@
         </Grid>
 
         <Grid HorizontalAlignment="Right">
-            <ContentControl>
+            <ContentControl Content="{Binding}">
                 <ContentControl.Style>
                     <Style TargetType="ContentControl">
                         <Setter Property="Visibility" Value="Collapsed"></Setter>
-                        <Setter Property="Content" Value="{x:Null}"></Setter>
+                        <Setter Property="ContentTemplate" Value="{x:Null}"></Setter>
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding ElementName=toggleOutline,Path=IsChecked}" Value="True">
                                 <Setter Property="Visibility" Value="Visible"></Setter>
-                                <Setter Property="Content">
+                                <Setter Property="ContentTemplate">
                                     <Setter.Value>
-                                        <Border BorderBrush="Gray" BorderThickness="1 0 0 0" Background="White">
-                                            <Grid>
-                                                <ScrollViewer Padding="20" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" VirtualizingPanel.VirtualizationMode="Recycling" VirtualizingPanel.IsVirtualizing="True">
-                                                    <StackPanel>
-                                                        <TextBlock Text="JOB OUTLINE" HorizontalAlignment="Center" Margin="0 10 0 0" FontSize="30"></TextBlock>
-
-                                                        <TextBlock FontSize="17" FontWeight="SemiBold" Margin="0 20 0 0">BASIC</TextBlock>
-                                                        <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding JobHandler.JobTicket,Converter={StaticResource ObjectToPropertiesConverter}}" VirtualizingPanel.IsVirtualizing="True">
-                                                            <ItemsControl.ItemTemplate>
-                                                                <DataTemplate>
-                                                                    <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
-                                                                        <materialDesign:PackIcon Kind="Pencil" Width="12" Height="12" VerticalAlignment="Center" />
-                                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
-                                        <Run Text="{Binding Name,Mode=OneWay}"></Run><Run>:</Run>
-                                        <Run Text="{Binding Value,Mode=OneWay}" FontWeight="SemiBold"></Run>
-                                                                        </TextBlock>
-                                                                    </StackPanel>
-                                                                </DataTemplate>
-                                                            </ItemsControl.ItemTemplate>
-                                                        </ItemsControl>
-
-                                                        <TextBlock FontSize="17" FontWeight="SemiBold" Margin="0 20 0 0">SPOOL</TextBlock>
-                                                        <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding JobHandler.JobTicket.Spool,Converter={StaticResource ObjectToPropertiesConverter}}" VirtualizingPanel.IsVirtualizing="True">
-                                                            <ItemsControl.ItemTemplate>
-                                                                <DataTemplate>
-                                                                    <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
-                                                                        <materialDesign:PackIcon Kind="Pencil" Width="12" Height="12" VerticalAlignment="Center" />
-                                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
-                                        <Run Text="{Binding Name,Mode=OneWay}"></Run><Run>:</Run>
-                                        <Run Text="{Binding Value,Mode=OneWay}" FontWeight="SemiBold"></Run>
-                                                                        </TextBlock>
-                                                                    </StackPanel>
-                                                                </DataTemplate>
-                                                            </ItemsControl.ItemTemplate>
-                                                        </ItemsControl>
-
-                                                        <TextBlock FontSize="17" FontWeight="SemiBold" Margin="0 20 0 0">PROCESS PARAMETERS</TextBlock>
-                                                        <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding JobHandler.JobTicket.ProcessParameters,Converter={StaticResource ObjectToPropertiesConverter}}" VirtualizingPanel.IsVirtualizing="True">
-                                                            <ItemsControl.ItemTemplate>
-                                                                <DataTemplate>
-                                                                    <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
-                                                                        <materialDesign:PackIcon Kind="Settings" Width="12" Height="12" VerticalAlignment="Center" />
-                                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
-                                        <Run Text="{Binding Name,Mode=OneWay}"></Run><Run>:</Run>
-                                        <Run Text="{Binding Value,Mode=OneWay}" FontWeight="SemiBold"></Run>
-                                                                        </TextBlock>
-                                                                    </StackPanel>
-                                                                </DataTemplate>
-                                                            </ItemsControl.ItemTemplate>
-                                                        </ItemsControl>
-
-                                                        <TextBlock FontSize="17" FontWeight="SemiBold" Margin="0 20 0 0">SEGMENTS</TextBlock>
-                                                        <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding JobHandler.JobTicket.Segments}" AlternationCount="10000" VirtualizingPanel.IsVirtualizing="True">
-                                                            <ItemsControl.ItemTemplate>
-                                                                <DataTemplate>
-                                                                    <Expander IsExpanded="False" Background="Transparent">
-                                                                        <Expander.Header>
-                                                                            <TextBlock FontSize="14" FontWeight="SemiBold">
-                                                    <Run>#</Run><Run Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(ItemsControl.AlternationIndex),Mode=OneWay,Converter={StaticResource MathOperatorConverter},ConverterParameter='+1'}"></Run>
-                                                    <Run Text="SEGMENT"></Run>
-                                                                            </TextBlock>
-                                                                        </Expander.Header>
-                                                                        <StackPanel>
-
-                                                                            <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding Converter={StaticResource ObjectToPropertiesConverter}}" VirtualizingPanel.IsVirtualizing="True">
-                                                                                <ItemsControl.ItemTemplate>
-                                                                                    <DataTemplate>
-                                                                                        <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
-                                                                                            <materialDesign:PackIcon Kind="Pencil" Width="12" Height="12" VerticalAlignment="Center" />
-                                                                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
-                                        <Run Text="{Binding Name,Mode=OneWay}"></Run><Run>:</Run>
-                                        <Run Text="{Binding Value,Mode=OneWay}" FontWeight="SemiBold"></Run>
-                                                                                            </TextBlock>
-                                                                                        </StackPanel>
-                                                                                    </DataTemplate>
-                                                                                </ItemsControl.ItemTemplate>
-                                                                            </ItemsControl>
-
-                                                                            <TextBlock FontSize="12" FontWeight="SemiBold" Margin="27 10 0 0">BRUSH STOPS</TextBlock>
-                                                                            <ItemsControl Margin="40 0 0 0" ItemsSource="{Binding BrushStops}" AlternationCount="10000" VirtualizingPanel.IsVirtualizing="True">
-                                                                                <ItemsControl.ItemTemplate>
-                                                                                    <DataTemplate>
-                                                                                        <StackPanel>
-                                                                                            <TextBlock FontSize="11" FontWeight="SemiBold" Margin="0 5 0 0">
-                                                    <Run>#</Run><Run Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(ItemsControl.AlternationIndex),Mode=OneWay,Converter={StaticResource MathOperatorConverter},ConverterParameter='+1'}"></Run>
-                                                    <Run Text="STOP"></Run>
-                                                                                            </TextBlock>
-
-                                                                                            <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding Converter={StaticResource ObjectToPropertiesConverter}}" VirtualizingPanel.IsVirtualizing="True">
-                                                                                                <ItemsControl.ItemTemplate>
-                                                                                                    <DataTemplate>
-                                                                                                        <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
-                                                                                                            <materialDesign:PackIcon Kind="Pencil" Width="12" Height="12" VerticalAlignment="Center" />
-                                                                                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
-                                        <Run Text="{Binding Name,Mode=OneWay}"></Run><Run>:</Run>
-                                        <Run Text="{Binding Value,Mode=OneWay}" FontWeight="SemiBold"></Run>
-                                                                                                            </TextBlock>
-                                                                                                        </StackPanel>
-                                                                                                    </DataTemplate>
-                                                                                                </ItemsControl.ItemTemplate>
-                                                                                            </ItemsControl>
-
-                                                                                            <TextBlock FontSize="12" FontWeight="SemiBold" Margin="27 10 0 0">DISPENSERS</TextBlock>
-                                                                                            <ItemsControl Margin="40 0 0 0" ItemsSource="{Binding Dispensers}" AlternationCount="10000" VirtualizingPanel.IsVirtualizing="True">
-                                                                                                <ItemsControl.ItemTemplate>
-                                                                                                    <DataTemplate>
-                                                                                                        <StackPanel>
-                                                                                                            <TextBlock FontSize="11" FontWeight="SemiBold" Margin="0 5 0 0">
-                                                    <Run>#</Run><Run Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(ItemsControl.AlternationIndex),Mode=OneWay,Converter={StaticResource MathOperatorConverter},ConverterParameter='+1'}"></Run>
-                                                    <Run Text="DISPENSER"></Run>
-                                                                                                            </TextBlock>
-
-                                                                                                            <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding Converter={StaticResource ObjectToPropertiesConverter}}" VirtualizingPanel.IsVirtualizing="True">
-                                                                                                                <ItemsControl.ItemTemplate>
-                                                                                                                    <DataTemplate>
-                                                                                                                        <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
-                                                                                                                            <materialDesign:PackIcon Kind="ArrowRightBoldCircle" Width="12" Height="12" VerticalAlignment="Center" />
-                                                                                                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
-                                        <Run Text="{Binding Name,Mode=OneWay}"></Run><Run>:</Run>
-                                        <Run Text="{Binding Value,Mode=OneWay}" FontWeight="SemiBold"></Run>
-                                                                                                                            </TextBlock>
-                                                                                                                        </StackPanel>
-                                                                                                                    </DataTemplate>
-                                                                                                                </ItemsControl.ItemTemplate>
-                                                                                                            </ItemsControl>
-                                                                                                        </StackPanel>
-                                                                                                    </DataTemplate>
-                                                                                                </ItemsControl.ItemTemplate>
-                                                                                            </ItemsControl>
-                                                                                        </StackPanel>
-                                                                                    </DataTemplate>
-                                                                                </ItemsControl.ItemTemplate>
-                                                                            </ItemsControl>
-                                                                        </StackPanel>
-                                                                    </Expander>
-                                                                </DataTemplate>
-                                                            </ItemsControl.ItemTemplate>
-                                                        </ItemsControl>
-                                                    </StackPanel>
-                                                </ScrollViewer>
-                                            </Grid>
-                                        </Border>
+                                        <DataTemplate>
+                                            <Border BorderBrush="Gray" BorderThickness="1 0 0 0" Background="White">
+                                                <Grid>
+                                                    <ScrollViewer Padding="20" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
+                                                       <controls:JobOutlineControl HorizontalAlignment="Left" DataContext="{Binding JobHandler.JobTicket}" VirtualizingStackPanel.IsVirtualizing="True"/>
+                                                    </ScrollViewer>
+                                                </Grid>
+                                            </Border>
+                                        </DataTemplate>
                                     </Setter.Value>
                                 </Setter>
                             </DataTrigger>