Inks Extension Support.

1 files changed, 37 insertions, 63 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
index c567421aa..74db8e471 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -45,28 +45,22 @@
         </Style>
 
         <DataTemplate x:Key="CMYK_Template" DataType="{x:Type entities:BrushStop}">
-            <UniformGrid Rows="1" Columns="4" Height="Auto" MinWidth="180">
-                <StackPanel Orientation="Vertical">
-                    <Border Width="50" Height="50" Background="Cyan" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                    <TextBlock Margin="0 10 0 0" Text="C" FontSize="{StaticResource TangoDefaultFontSize}" HorizontalAlignment="Center"/>
-                    <TextBlock Margin="0 10 0 0" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding Cyan, StringFormat=0.##}" ></TextBlock>
-                </StackPanel>
-                <StackPanel Orientation="Vertical" Margin="0 0 0 0">
-                    <Border Width="50" Height="50" Background="Magenta" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                    <TextBlock Margin="0 10 0 0"  Text="M" FontSize="{StaticResource TangoDefaultFontSize}"  HorizontalAlignment="Center"/>
-                    <TextBlock Margin="0 10 0 0" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding Magenta, StringFormat=0.##}" ></TextBlock>
-                </StackPanel>
-                <StackPanel Orientation="Vertical" Margin="10 0 0 0">
-                    <Border Width="50" Height="50" Background="Yellow" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                    <TextBlock Margin="0 10 0 0"  Text="Y" FontSize="{StaticResource TangoDefaultFontSize}"  HorizontalAlignment="Center"/>
-                    <TextBlock Margin="0 10 0 0" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding Yellow, StringFormat=0.##}" ></TextBlock>
-                </StackPanel>
-                <StackPanel Orientation="Vertical" Margin="10 0 0 0">
-                    <Border Width="50" Height="50" Background="Black" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                    <TextBlock  Margin="0 10 0 0" Text="K" FontSize="{StaticResource TangoDefaultFontSize}"  HorizontalAlignment="Center"/>
-                    <TextBlock Margin="0 10 0 0" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding Black, StringFormat=0.##}"></TextBlock>
-                </StackPanel>
-            </UniformGrid>
+            <ItemsControl ItemsSource="{Binding LiquidVolumesOrderedPigmentedForStandardUser}" MinWidth="180" HorizontalAlignment="Left" Height="Auto">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <StackPanel Orientation="Horizontal"></StackPanel>
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Vertical" Margin="0 0 10 0">
+                            <Border Width="50" Height="50" Background="{Binding IdsPack.LiquidType.LiquidTypeBrush}" CornerRadius="16" HorizontalAlignment="Left"></Border>
+                            <TextBlock Margin="0 10 0 0" Text="{Binding IdsPack.LiquidType.ShortName}" FontSize="{StaticResource TangoDefaultFontSize}" HorizontalAlignment="Center"/>
+                            <TextBlock Margin="0 10 0 0" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding Volume, StringFormat=0.##}" ></TextBlock>
+                        </StackPanel>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
         </DataTemplate>
 
         <DataTemplate x:Key="RGB_Template" DataType="{x:Type entities:BrushStop}">
@@ -101,12 +95,12 @@
                 </StackPanel>
                 <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left" Margin="5 0 0 0">
                     <Border Width="50" Height="50" Background="red" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                    <TextBlock  Margin="0 10 0 0 " Text="a" FontSize="{StaticResource TangoDefaultFontSize}"  HorizontalAlignment="Center"/>
+                    <TextBlock  Margin="0 10 0 0 " Text="A" FontSize="{StaticResource TangoDefaultFontSize}"  HorizontalAlignment="Center"/>
                     <TextBlock Margin="0 10 0 0" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding A, StringFormat=0.##}" ></TextBlock>
                 </StackPanel>
                 <StackPanel Orientation="Vertical" Margin="10 0 0 0" Width="50">
                     <Border Width="50" Height="50" Background="Blue" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                    <TextBlock  Margin="0 10 0 0 " Text="b" FontSize="{StaticResource TangoDefaultFontSize}"  HorizontalAlignment="Center"/>
+                    <TextBlock  Margin="0 10 0 0 " Text="B" FontSize="{StaticResource TangoDefaultFontSize}"  HorizontalAlignment="Center"/>
                     <TextBlock Margin="0 10 0 0" HorizontalAlignment="Center" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding B, StringFormat=0.##}" ></TextBlock>
                 </StackPanel>
             </UniformGrid>
@@ -910,12 +904,12 @@
                                         </StackPanel>
                                         <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left" Margin="5 0 0 0">
                                             <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
-                                            <TextBlock  Margin="0 10 0 0 " Text="a" FontSize="{StaticResource TangoSmallFontSize}"  HorizontalAlignment="Center"/>
+                                            <TextBlock  Margin="0 10 0 0 " Text="A" FontSize="{StaticResource TangoSmallFontSize}"  HorizontalAlignment="Center"/>
                                             <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
                                         </StackPanel>
                                         <StackPanel Orientation="Vertical" Margin="10 0 0 0" Width="50">
                                             <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
-                                            <TextBlock  Margin="0 10 0 0 " Text="b" FontSize="{StaticResource TangoSmallFontSize}"  HorizontalAlignment="Center"/>
+                                            <TextBlock  Margin="0 10 0 0 " Text="B" FontSize="{StaticResource TangoSmallFontSize}"  HorizontalAlignment="Center"/>
                                             <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
                                         </StackPanel>
                                     </UniformGrid>
@@ -989,43 +983,23 @@
                                             <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
                                         </StackPanel>
                                     </UniformGrid>
-                                    <UniformGrid Columns="7" Rows="1" Margin="0 20 0 0" Width="440" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                            <Border Width="50" Height="50" Background="Cyan" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">C</TextBlock>
-                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding CyanOutput}"></TextBlock>
-                                        </StackPanel>
-                                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                            <Border Width="50" Height="50" Background="LightCyan" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">LC</TextBlock>
-                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding LightCyanOutput}"></TextBlock>
-                                        </StackPanel>
-                                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                            <Border Width="50" Height="50" Background="Magenta" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">M</TextBlock>
-                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding MagentaOutput}"></TextBlock>
-                                        </StackPanel>
-                                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                            <Border Width="50" Height="50" Background="LightPink" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">LM</TextBlock>
-                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding LightMagentaOutput}"></TextBlock>
-                                        </StackPanel>
-                                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                            <Border Width="50" Height="50" Background="Yellow" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">Y</TextBlock>
-                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding YellowOutput}"></TextBlock>
-                                        </StackPanel>
-                                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                            <Border Width="50" Height="50" Background="LightYellow" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">LY</TextBlock>
-                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding LightYellowOutput}"></TextBlock>
-                                        </StackPanel>
-                                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                            <Border Width="50" Height="50" Background="Black" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">K</TextBlock>
-                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding BlackOutput}"></TextBlock>
-                                        </StackPanel>
-                                    </UniformGrid>
+
+                                    <ItemsControl ItemsSource="{Binding LiquidOutputs}" Margin="0 20 0 0" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <ItemsControl.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <StackPanel Orientation="Horizontal" />
+                                            </ItemsPanelTemplate>
+                                        </ItemsControl.ItemsPanel>
+                                        <ItemsControl.ItemTemplate>
+                                            <DataTemplate>
+                                                <StackPanel Margin="0 0 10 0" Orientation="Vertical" Width="50" HorizontalAlignment="Left">
+                                                    <Border Width="50" Height="50" Background="{Binding LiquidType.LiquidTypeBrush}" CornerRadius="16" HorizontalAlignment="Left"></Border>
+                                                    <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding LiquidType.ShortName}"></TextBlock>
+                                                    <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding Volume}"></TextBlock>
+                                                </StackPanel>
+                                            </DataTemplate>
+                                        </ItemsControl.ItemTemplate>
+                                    </ItemsControl>
                                 </StackPanel>
 
                             </Grid>