From 5d6493443dfcf51e3bc944c0d684da5b9d853c2f Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 1 Jan 2019 15:16:34 +0200
Subject: Fixed issue with slow running job view on many segments.

---
 .../Views/MainView.xaml                            | 171 +--------------------
 1 file changed, 1 insertion(+), 170 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
index 68cd65ad4..429450370 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
@@ -131,168 +131,6 @@
                                                     <ItemsControl.ItemTemplate>
                                                         <DataTemplate>
                                                             <Grid ClipToBounds="False">
-                                                                <Grid.ToolTip>
-                                                                    <ToolTip Background="White" Padding="0" Visibility="{Binding IsInterSegment,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                                                                        <Border BorderThickness="1" BorderBrush="#202020" CornerRadius="3" Padding="5">
-                                                                            <StackPanel Background="White">
-                                                                                <ItemsControl ItemsSource="{Binding BrushStops[0].LiquidVolumes}" VerticalAlignment="Center">
-                                                                                    <ItemsControl.ItemsPanel>
-                                                                                        <ItemsPanelTemplate>
-                                                                                            <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
-                                                                                        </ItemsPanelTemplate>
-                                                                                    </ItemsControl.ItemsPanel>
-                                                                                    <ItemsControl.ItemTemplate>
-                                                                                        <DataTemplate>
-                                                                                            <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
-                                                                                                <ContentControl.Foreground>
-                                                                                                    <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
-                                                                                                </ContentControl.Foreground>
-                                                                                                <TextBlock Foreground="#202020" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Volume,StringFormat=0.00}"></TextBlock>
-                                                                                            </ContentControl>
-                                                                                        </DataTemplate>
-                                                                                    </ItemsControl.ItemTemplate>
-                                                                                </ItemsControl>
-
-                                                                                <DataGrid Margin="0 10 0 0" SelectedIndex="-1" IsReadOnly="True" ItemsSource="{Binding BrushStops[0].LiquidVolumes}" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" Background="Transparent" SelectionUnit="FullRow">
-                                                                                    <DataGrid.CellStyle>
-                                                                                        <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
-                                                                                            <Setter Property="BorderThickness" Value="0"/>
-                                                                                            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-                                                                                        </Style>
-                                                                                    </DataGrid.CellStyle>
-                                                                                    <DataGrid.Columns>
-                                                                                        <DataGridTemplateColumn Header="IDS PACK">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <Grid x:Name="t0">
-                                                                                                        <Polygon x:Name="t1" Points="0,0 15,0 0,15 0,0" Margin="-15 -11 0 0">
-                                                                                                            <Polygon.Fill>
-                                                                                                                <SolidColorBrush x:Name="t2" Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter},FallbackValue={StaticResource dummyColor}}" />
-                                                                                                            </Polygon.Fill>
-                                                                                                        </Polygon>
-                                                                                                        <TextBlock FontWeight="SemiBold" TextWrapping="Wrap" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding IdsPack.LiquidType.Name}"></TextBlock>
-                                                                                                    </Grid>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                        <DataGridTemplateColumn Header="D/F">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding IdsPack.DispenserType.NlPerPulse,StringFormat='0.0'}"></Run>
-                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
-                                                                                                    </TextBlock>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                        <DataGridTemplateColumn Header="STEP">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <ComboBox ItemsSource="{Binding Source={StaticResource dispenserDivisions}}" SelectedItem="{Binding DispenserStepDivision,UpdateSourceTrigger=PropertyChanged}">
-                                                                                                        <ComboBox.ItemContainerStyle>
-                                                                                                            <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
-                                                                                                                <Setter Property="Background" Value="#ECECEC"></Setter>
-                                                                                                            </Style>
-                                                                                                        </ComboBox.ItemContainerStyle>
-                                                                                                        <ComboBox.ItemTemplate>
-                                                                                                            <DataTemplate>
-                                                                                                                <TextBlock Text="{Binding Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock>
-                                                                                                            </DataTemplate>
-                                                                                                        </ComboBox.ItemTemplate>
-                                                                                                    </ComboBox>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                        <DataGridTemplateColumn Header="MAX NL / CM">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding LiquidMaxNanoliterPerCentimeter,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
-                                                                                                    </TextBlock>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                        <DataGridTemplateColumn Header="VOLUME">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding Volume,StringFormat='0.0'}"></Run>
-                                                                                                                        <Run Text="%" Foreground="Gray"></Run>
-                                                                                                    </TextBlock>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                        <DataGridTemplateColumn Header="FORMULA">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding IdsPack.IdsPackFormula.Name}"></Run>
-                                                                                                    </TextBlock>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                        <DataGridTemplateColumn Header="NL / CM">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding NanoliterPerCentimeter,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
-                                                                                                    </TextBlock>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                        <DataGridTemplateColumn Header="NL / SEC">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding NanoliterPerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
-                                                                                                    </TextBlock>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                        <DataGridTemplateColumn Header="PULSE / SEC">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <Label VerticalAlignment="Center">
-                                                                                                        <Label.Style>
-                                                                                                            <Style TargetType="Label">
-                                                                                                                <Setter Property="Content">
-                                                                                                                    <Setter.Value>
-                                                                                                                        <TextBlock>
-                                                                                                                                                 <Run Text="{Binding PulsePerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="Gray"></Run>
-                                                                                                                        </TextBlock>
-                                                                                                                    </Setter.Value>
-                                                                                                                </Setter>
-                                                                                                                <Style.Triggers>
-                                                                                                                    <DataTrigger Binding="{Binding DispenserStepDivision}" Value="{x:Static dispensing:DispenserStepDivisions.Auto}">
-                                                                                                                        <Setter Property="Content" Value="Auto"></Setter>
-                                                                                                                    </DataTrigger>
-                                                                                                                    <DataTrigger Binding="{Binding DispenserStepDivision,Converter={StaticResource IsNotConverter},ConverterParameter={x:Static dispensing:DispenserStepDivisions.Auto}}" Value="True">
-                                                                                                                        <Setter Property="Content">
-                                                                                                                            <Setter.Value>
-                                                                                                                                <TextBlock>
-                                                                                                                                                 <Run Text="{Binding PulsePerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="Gray"></Run>
-                                                                                                                                </TextBlock>
-                                                                                                                            </Setter.Value>
-                                                                                                                        </Setter>
-                                                                                                                    </DataTrigger>
-                                                                                                                </Style.Triggers>
-                                                                                                            </Style>
-                                                                                                        </Label.Style>
-                                                                                                    </Label>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                    </DataGrid.Columns>
-                                                                                </DataGrid>
-                                                                            </StackPanel>
-                                                                        </Border>
-                                                                    </ToolTip>
-                                                                </Grid.ToolTip>
                                                                 <Grid.Width>
                                                                     <MultiBinding Converter="{StaticResource SegmentLengthToWidthConverter}">
                                                                         <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.RunningJobStatus.CurrentUnitTotalProgress"></Binding>
@@ -317,14 +155,7 @@
                                                                         </materialDesign:PackIcon>
                                                                     </StackPanel>
 
-                                                                    <Rectangle Height="30" Margin="0 10 0 0" VerticalAlignment="Center">
-                                                                        <Rectangle.Fill>
-                                                                            <MultiBinding Converter="{StaticResource SegmentToBrushConverterMulti}">
-                                                                                <Binding Path="."></Binding>
-                                                                                <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.RunningJob"></Binding>
-                                                                                <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.RunningJob.Length"></Binding>
-                                                                            </MultiBinding>
-                                                                        </Rectangle.Fill>
+                                                                    <Rectangle Height="30" Margin="0 10 0 0" VerticalAlignment="Center" Fill="{Binding SegmentBrush}">
                                                                     </Rectangle>
 
                                                                     <Canvas Height="30" HorizontalAlignment="Center" Width="80">
-- 
cgit v1.3.1