merge alarm handling from remote

2 files changed, 29 insertions, 160 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 1057f7c84..a5d137e67 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -432,7 +432,7 @@
 
     </UserControl.Resources>
 
-    <Grid>
+    <Grid IsEnabled="{Binding IsFree}">
         <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
@@ -865,9 +865,15 @@
                                                             </StackPanel>
 
                                                             <DockPanel>
-                                                                <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" VerticalAlignment="Center" Margin="0 0 15 0">
-                                                                    <ToggleButton IsChecked="{Binding EnableColorConversion}" />
-                                                                    <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Foreground="DimGray">Enable Color Conversion</TextBlock>
+                                                                <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" VerticalAlignment="Center" Margin="0 0 0 0">
+                                                                    <TextBlock VerticalAlignment="Center" Foreground="DimGray">Generate Gradient</TextBlock>
+                                                                    <ToggleButton Margin="10 0 0 0" IsChecked="{Binding ApplicationManager.ConnectedMachine.GradientGenerationConfiguration.IsEnabled,Mode=TwoWay}" />
+                                                                    <TextBlock Margin="10 0 0 0" VerticalAlignment="Center" Foreground="DimGray">Resolution:</TextBlock>
+                                                                    <mahapps:NumericUpDown HideUpDownButtons="True" Width="90" HorizontalAlignment="Left" FontSize="14" FontFamily="{StaticResource digital-7}" StringFormat="{}{0:N0} cm" Margin="5 1 0 0" Minimum="10" Maximum="1000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" BorderBrush="DimGray" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding MachineOperator.GradientGenerationConfiguration.ResolutionCM,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                                                        <mahapps:NumericUpDown.Resources>
+                                                                            <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
+                                                                        </mahapps:NumericUpDown.Resources>
+                                                                    </mahapps:NumericUpDown>
                                                                 </StackPanel>
                                                                 <Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Center" Height="15" Margin="200 0 10 0" StrokeThickness="1" Stroke="Gainsboro">
                                                                     <Rectangle.Fill>
@@ -962,11 +968,11 @@
                                                                                                                 <Run FontFamily="{StaticResource digital-7}" Text="{Binding OffsetPercent,StringFormat={}{0:F1}%}"></Run>
                                                                                                                 <Run FontSize="12" Foreground="Gray" Text="{Binding OffsetMeters,Mode=OneWay,StringFormat={}   ( {0:F1}m )}"></Run>
                                                                                                 </TextBlock>
-                                                                                                <Slider ValueChanged="Offset_Slider_ValueChanged" Style="{StaticResource GradientOffsetSlider}" SmallChange="0.1" IsSnapToTickEnabled="True" TickFrequency="0.1" Margin="0 20 0 0" HorizontalAlignment="Center" Width="300" Value="{Binding OffsetPercent}" IsEnabled="{Binding IsMiddle}">
+                                                                                                <Slider ValueChanged="Offset_Slider_ValueChanged" Style="{StaticResource GradientOffsetSlider}" SmallChange="0.1" IsSnapToTickEnabled="True" TickFrequency="0.1" Margin="0 20 0 0" HorizontalAlignment="Center" Width="300" Value="{Binding OffsetPercent}" IsEnabled="{Binding IsMiddle}" Minimum="0" Maximum="100">
                                                                                                     <Slider.Foreground>
                                                                                                         <SolidColorBrush Color="{Binding Color}"></SolidColorBrush>
                                                                                                     </Slider.Foreground>
-                                                                                                    <Slider.Minimum>
+                                                                                                    <!--<Slider.Minimum>
                                                                                                         <MultiBinding Converter="{StaticResource BrushStopToOffsetLimitConverter}" ConverterParameter="min">
                                                                                                             <Binding Path="."></Binding>
                                                                                                             <Binding RelativeSource="{RelativeSource AncestorType=UserControl,Mode=FindAncestor}" Path="DataContext.SelectedSegment"></Binding>
@@ -979,7 +985,7 @@
                                                                                                             <Binding RelativeSource="{RelativeSource AncestorType=UserControl,Mode=FindAncestor}" Path="DataContext.SelectedSegment"></Binding>
                                                                                                             <Binding Path="StopIndex"></Binding>
                                                                                                         </MultiBinding>
-                                                                                                    </Slider.Maximum>
+                                                                                                    </Slider.Maximum>-->
                                                                                                 </Slider>
                                                                                             </StackPanel>
                                                                                         </Grid>
@@ -1214,7 +1220,7 @@
                                     </Grid>
 
                                     <Grid DockPanel.Dock="Right" Margin="0 0 10 0">
-                                        <StackPanel Orientation="Horizontal" Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                        <StackPanel Orientation="Horizontal" Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityInverseConverter}}" IsEnabled="{Binding MachineOperator.CanPrint}">
                                             <Button Height="60" Width="280" Command="{Binding StartJobCommand}" Click="OnJobStartClick">
                                                 <StackPanel Orientation="Horizontal">
                                                     <materialDesign:PackIcon VerticalAlignment="Center" Width="32" Height="32" Kind="ClockFast" />
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>