From 9816804779f673d122aef78d9ba969ee2e2f98f5 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Wed, 5 Feb 2020 17:25:34 +0200
Subject: Dropped IsTransparent from PPC jobs. Add full support for IsWhite on
 PPC and integration.

---
 .../Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs  | 2 +-
 Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Modules')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index 1b80eed35..f07c20aa9 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -671,7 +671,7 @@ namespace Tango.PPC.Jobs.ViewModels
         {
             return
                 Job != null && Job.Validate(_db) &&
-                !Job.Segments.SelectMany(x => x.BrushStops).Where(x => !x.IsTransparent).ToList().Exists(x => x.IsOutOfGamut);
+                !Job.Segments.SelectMany(x => x.BrushStops).Where(x => !x.IsTransparent && !x.IsWhite).ToList().Exists(x => x.IsOutOfGamut);
         }
 
         #endregion
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
index 793385b27..c04c13ea1 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
@@ -201,7 +201,7 @@
 
                 <StackPanel Orientation="Horizontal" Margin="0 0 -130 0" HorizontalAlignment="Right" VerticalAlignment="Top">
                     <StackPanel Orientation="Horizontal" Visibility="{Binding ElementName=toggleEdit,Path=IsChecked,IsAsync=True,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                        <touch:TouchToggleIconButton Padding="15" Width="60" Height="60" CornerRadius="30" Icon="EyeOutline" CheckedIcon="EyeOffOutline" Foreground="{StaticResource TangoGrayBrush}" CheckedForeground="{StaticResource TangoGrayBrush}" IsChecked="{Binding IsTransparent,IsAsync=True}"></touch:TouchToggleIconButton>
+                        <!--<touch:TouchToggleIconButton Padding="15" Width="60" Height="60" CornerRadius="30" Icon="EyeOutline" CheckedIcon="EyeOffOutline" Foreground="{StaticResource TangoGrayBrush}" CheckedForeground="{StaticResource TangoGrayBrush}" IsChecked="{Binding IsTransparent,IsAsync=True}"></touch:TouchToggleIconButton>-->
                         <touch:TouchImageButton Command="{Binding ElementName=view,Path=DataContext.ReplaceBrushStopCommand,IsAsync=True}" CommandParameter="{Binding}" Visibility="{Binding ColorSpace,Converter={StaticResource ColorSpaceToVisibilityConverter},IsAsync=True}" Width="50" Height="50" Padding="10" Image="{StaticResource Image_Replace_Color}" CornerRadius="30"></touch:TouchImageButton>
                     </StackPanel>
                     <touch:TouchIconButton Margin="0 0 50 0" Visibility="{Binding ElementName=toggleEdit,Path=IsChecked,Converter={StaticResource BooleanToVisibilityConverter}}" Command="{Binding ElementName=view,Path=DataContext.RemoveBrushStopCommand,IsAsync=True}" CommandParameter="{Binding}" EnableDropShadow="False" Icon="TrashAltRegular" Padding="12" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="50" Height="50" RippleBrush="{StaticResource TangoRippleDarkBrush}" CornerRadius="30" />
@@ -419,7 +419,7 @@
                                                 </Style>
                                             </StackPanel.Style>
 
-                                            <touch:TouchToggleIconButton Padding="15" Width="60" Height="60" CornerRadius="30" Icon="EyeOutline" CheckedIcon="EyeOffOutline" Foreground="{StaticResource TangoGrayBrush}" CheckedForeground="{StaticResource TangoGrayBrush}" IsChecked="{Binding BrushStops[0].IsTransparent,IsAsync=True}"></touch:TouchToggleIconButton>
+                                            <!--<touch:TouchToggleIconButton Padding="15" Width="60" Height="60" CornerRadius="30" Icon="EyeOutline" CheckedIcon="EyeOffOutline" Foreground="{StaticResource TangoGrayBrush}" CheckedForeground="{StaticResource TangoGrayBrush}" IsChecked="{Binding BrushStops[0].IsTransparent,IsAsync=True}"></touch:TouchToggleIconButton>-->
 
                                             <touch:TouchImageButton Visibility="{Binding BrushStops[0].ColorSpace,Converter={StaticResource ColorSpaceToVisibilityConverter},IsAsync=True}" Command="{Binding ElementName=view,Path=DataContext.ReplaceBrushStopCommand}" CommandParameter="{Binding BrushStops[0]}" Width="50" Height="50" Padding="10" Image="{StaticResource Image_Replace_Color}" CornerRadius="30"></touch:TouchImageButton>
                                         </StackPanel>
-- 
cgit v1.3.1


From 42f6e5e39ba83531adf8712155ca0015346bd662 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Wed, 5 Feb 2020 21:27:37 +0200
Subject: Added scrollviewer in system view.

---
 .../Tango.PPC.Technician/Views/SystemView.xaml     | 529 +++++++++++----------
 1 file changed, 265 insertions(+), 264 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Modules')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml
index 910bd2fc9..52abfc239 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml
@@ -30,282 +30,283 @@
             <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold">System</TextBlock>
         </Border>
 
-        <Grid Grid.Row="1" Margin="20">
-
-            <DockPanel>
-
-                <StackPanel Margin="30 0 30 0" DockPanel.Dock="Bottom" VerticalAlignment="Center">
-
-                    <StackPanel.Resources>
-                        <Style TargetType="touch:TouchButton" x:Key="ButtonMenu">
-                            <Setter Property="Padding" Value="10"></Setter>
-                            <Setter Property="HorizontalContentAlignment" Value="Left"></Setter>
-                            <Setter Property="Height" Value="100"></Setter>
-                            <Setter Property="Background" Value="Transparent"></Setter>
-                            <Setter Property="BorderBrush" Value="{StaticResource TangoDarkForegroundBrush}"></Setter>
-                            <Setter Property="BorderThickness" Value="1"></Setter>
-                            <Setter Property="Foreground" Value="{StaticResource TangoDarkForegroundBrush}"></Setter>
-                            <Setter Property="EnableDropShadow" Value="False"></Setter>
-                            <Setter Property="CornerRadius" Value="5"></Setter>
-                            <Setter Property="Margin" Value="0 0 0 20"></Setter>
-                            <Setter Property="RippleBrush" Value="#4BB8B8B8"></Setter>
-                        </Style>
-                    </StackPanel.Resources>
-
-                    <touch:TouchButton Command="{Binding ResetDeviceCommand}"  Style="{StaticResource ButtonMenu}">
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                            <Image Source="../Images/circuit-board.png" Width="60" Height="60" />
-                            <StackPanel Margin="10 0 0 0">
-                                <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Reset Embedded Device</TextBlock>
-                                <TextBlock Foreground="{StaticResource TangoGrayTextBrush}">
+        <Grid Grid.Row="1">
+
+            <touch:LightTouchScrollViewer>
+                <DockPanel Margin="20">
+                    <StackPanel Margin="30 40 30 0" DockPanel.Dock="Bottom" VerticalAlignment="Center">
+
+                        <StackPanel.Resources>
+                            <Style TargetType="touch:TouchButton" x:Key="ButtonMenu">
+                                <Setter Property="Padding" Value="10"></Setter>
+                                <Setter Property="HorizontalContentAlignment" Value="Left"></Setter>
+                                <Setter Property="Height" Value="100"></Setter>
+                                <Setter Property="Background" Value="Transparent"></Setter>
+                                <Setter Property="BorderBrush" Value="{StaticResource TangoDarkForegroundBrush}"></Setter>
+                                <Setter Property="BorderThickness" Value="1"></Setter>
+                                <Setter Property="Foreground" Value="{StaticResource TangoDarkForegroundBrush}"></Setter>
+                                <Setter Property="EnableDropShadow" Value="False"></Setter>
+                                <Setter Property="CornerRadius" Value="5"></Setter>
+                                <Setter Property="Margin" Value="0 0 0 20"></Setter>
+                                <Setter Property="RippleBrush" Value="#4BB8B8B8"></Setter>
+                            </Style>
+                        </StackPanel.Resources>
+
+                        <touch:TouchButton Command="{Binding ResetDeviceCommand}"  Style="{StaticResource ButtonMenu}">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                <Image Source="../Images/circuit-board.png" Width="60" Height="60" />
+                                <StackPanel Margin="10 0 0 0">
+                                    <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Reset Embedded Device</TextBlock>
+                                    <TextBlock Foreground="{StaticResource TangoGrayTextBrush}">
                                       Resets the embedded device using the DFU channel.
-                                </TextBlock>
+                                    </TextBlock>
+                                </StackPanel>
                             </StackPanel>
-                        </StackPanel>
-                    </touch:TouchButton>
-
-                    <touch:TouchButton Command="{Binding RestartCommand}" Style="{StaticResource ButtonMenu}">
-                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                            <Image Source="../Images/mobile-phone.png" Width="60" Height="60" />
-                            <StackPanel Margin="10 0 0 0">
-                                <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Restart Panel PC</TextBlock>
-                                <TextBlock Foreground="{StaticResource TangoGrayTextBrush}">
+                        </touch:TouchButton>
+
+                        <touch:TouchButton Command="{Binding RestartCommand}" Style="{StaticResource ButtonMenu}">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                <Image Source="../Images/mobile-phone.png" Width="60" Height="60" />
+                                <StackPanel Margin="10 0 0 0">
+                                    <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Restart Panel PC</TextBlock>
+                                    <TextBlock Foreground="{StaticResource TangoGrayTextBrush}">
                                       Restarts the panel PC operation system.
-                                </TextBlock>
+                                    </TextBlock>
+                                </StackPanel>
                             </StackPanel>
-                        </StackPanel>
-                    </touch:TouchButton>
-                    <touch:TouchButton Command="{Binding ShutdownCommand}" Style="{StaticResource ButtonMenu}">
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                            <Image Source="../Images/shutdown.png" Width="60" Height="60" />
-                            <StackPanel Margin="10 0 0 0">
-                                <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Shutdown Panel PC</TextBlock>
-                                <TextBlock Foreground="{StaticResource TangoGrayTextBrush}">
+                        </touch:TouchButton>
+                        <touch:TouchButton Command="{Binding ShutdownCommand}" Style="{StaticResource ButtonMenu}">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                <Image Source="../Images/shutdown.png" Width="60" Height="60" />
+                                <StackPanel Margin="10 0 0 0">
+                                    <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Shutdown Panel PC</TextBlock>
+                                    <TextBlock Foreground="{StaticResource TangoGrayTextBrush}">
                                       Turns off the panel PC (requires turning on from reset button).
-                                </TextBlock>
+                                    </TextBlock>
+                                </StackPanel>
                             </StackPanel>
-                        </StackPanel>
-                    </touch:TouchButton>
-                    <touch:TouchButton Command="{Binding FactoryResetCommand}" Style="{StaticResource ButtonMenu}">
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                            <Image Source="../Images/conveyor.png" Width="60" Height="60" />
-                            <StackPanel Margin="10 0 0 0">
-                                <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Factory Reset</TextBlock>
-                                <TextBlock Foreground="{StaticResource TangoGrayTextBrush}">
+                        </touch:TouchButton>
+                        <touch:TouchButton Command="{Binding FactoryResetCommand}" Style="{StaticResource ButtonMenu}">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                <Image Source="../Images/conveyor.png" Width="60" Height="60" />
+                                <StackPanel Margin="10 0 0 0">
+                                    <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Factory Reset</TextBlock>
+                                    <TextBlock Foreground="{StaticResource TangoGrayTextBrush}">
                                       Removes all data associated with this machine and installs the latest version.
-                                </TextBlock>
+                                    </TextBlock>
+                                </StackPanel>
                             </StackPanel>
-                        </StackPanel>
-                    </touch:TouchButton>
-                    <touch:TouchButton Command="{Binding ExitToExplorerCommand}" Style="{StaticResource ButtonMenu}">
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                            <Image Source="../Images/exit.png" Width="60" Height="60" />
-                            <StackPanel Margin="10 0 0 0">
-                                <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Exit To Shell</TextBlock>
-                                <TextBlock Foreground="{StaticResource TangoGrayTextBrush}">
+                        </touch:TouchButton>
+                        <touch:TouchButton Command="{Binding ExitToExplorerCommand}" Style="{StaticResource ButtonMenu}">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                <Image Source="../Images/exit.png" Width="60" Height="60" />
+                                <StackPanel Margin="10 0 0 0">
+                                    <TextBlock FontSize="{StaticResource TangoButtonFontSize}">Exit To Shell</TextBlock>
+                                    <TextBlock Foreground="{StaticResource TangoGrayTextBrush}">
                                       Closes the PPC application and opens the windows shell.
-                                </TextBlock>
+                                    </TextBlock>
+                                </StackPanel>
                             </StackPanel>
-                        </StackPanel>
-                    </touch:TouchButton>
-                </StackPanel>
-
-                <FlowDocumentScrollViewer VerticalScrollBarVisibility="Disabled">
-                    <FlowDocument>
-                        <Table CellSpacing="0" FontFamily="{StaticResource TangoFlexoFontFamily}">
-                            <Table.Resources>
-                                <Style TargetType="{x:Type TableRowGroup}">
-                                    <Setter Property="FontSize" Value="{StaticResource TangoDefaultFontSize}"/>
-                                </Style>
-
-                                <Style TargetType="TableCell">
-                                    <Setter Property="BorderThickness" Value="0 0 0 1"></Setter>
-                                    <Setter Property="BorderBrush" Value="{StaticResource TangoGrayBrush}"></Setter>
-                                    <Setter Property="Padding" Value="5"></Setter>
-                                </Style>
-                            </Table.Resources>
-                            <Table.Columns>
-                                <TableColumn Width="160" />
-                                <TableColumn />
-                                <TableColumn />
-                            </Table.Columns>
-
-                            <TableRowGroup>
-                                <TableRow>
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock>Application Version:</TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock Text="{Binding ApplicationManager.Version,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
-                                        </Paragraph>
-                                    </TableCell>
-                                </TableRow>
-
-                                <TableRow>
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock>Firmware Version:</TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock Text="{Binding MachineProvider.MachineOperator.DeviceInformation.Version,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
-                                        </Paragraph>
-                                    </TableCell>
-                                </TableRow>
-
-                                <TableRow>
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock>FPGA 1:</TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock Text="{Binding MachineProvider.MachineOperator.DeviceInformation.FPGA1Version,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
-                                        </Paragraph>
-                                    </TableCell>
-                                </TableRow>
-
-                                <TableRow>
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock>FPGA 2:</TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock Text="{Binding MachineProvider.MachineOperator.DeviceInformation.FPGA2Version,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
-                                        </Paragraph>
-                                    </TableCell>
-                                </TableRow>
-
-                                <TableRow>
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock>FPGA 3:</TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock Text="{Binding MachineProvider.MachineOperator.DeviceInformation.FPGA3Version,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
-                                        </Paragraph>
-                                    </TableCell>
-                                </TableRow>
-                                
-                                <TableRow>
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock>CPU:</TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock>
+                        </touch:TouchButton>
+                    </StackPanel>
+
+                    <FlowDocumentScrollViewer VerticalScrollBarVisibility="Disabled">
+                        <FlowDocument>
+                            <Table CellSpacing="0" FontFamily="{StaticResource TangoFlexoFontFamily}">
+                                <Table.Resources>
+                                    <Style TargetType="{x:Type TableRowGroup}">
+                                        <Setter Property="FontSize" Value="{StaticResource TangoDefaultFontSize}"/>
+                                    </Style>
+
+                                    <Style TargetType="TableCell">
+                                        <Setter Property="BorderThickness" Value="0 0 0 1"></Setter>
+                                        <Setter Property="BorderBrush" Value="{StaticResource TangoGrayBrush}"></Setter>
+                                        <Setter Property="Padding" Value="5"></Setter>
+                                    </Style>
+                                </Table.Resources>
+                                <Table.Columns>
+                                    <TableColumn Width="160" />
+                                    <TableColumn />
+                                    <TableColumn />
+                                </Table.Columns>
+
+                                <TableRowGroup>
+                                    <TableRow>
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock>Application Version:</TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock Text="{Binding ApplicationManager.Version,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
+                                            </Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+
+                                    <TableRow>
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock>Firmware Version:</TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock Text="{Binding MachineProvider.MachineOperator.DeviceInformation.Version,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
+                                            </Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+
+                                    <TableRow>
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock>FPGA 1:</TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock Text="{Binding MachineProvider.MachineOperator.DeviceInformation.FPGA1Version,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
+                                            </Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+
+                                    <TableRow>
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock>FPGA 2:</TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock Text="{Binding MachineProvider.MachineOperator.DeviceInformation.FPGA2Version,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
+                                            </Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+
+                                    <TableRow>
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock>FPGA 3:</TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock Text="{Binding MachineProvider.MachineOperator.DeviceInformation.FPGA3Version,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}"/>
+                                            </Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+
+                                    <TableRow>
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock>CPU:</TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock>
                                                 <Run Text="{Binding CPU,Mode=OneWay,StringFormat='0',FallbackValue=0}"></Run>
                                                 <Run>%</Run>
-                                            </TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-                                </TableRow>
-
-                                <TableRow>
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock>RAM:</TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock Text="{Binding RAM,Mode=OneWay,FallbackValue=0,Converter={StaticResource ByteArrayToFileSizeConverter},StringFormat='0'}"></TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-                                </TableRow>
-
-                                <TableRow>
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock>Temperature:</TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock Text="{Binding Temperature,Mode=OneWay,FallbackValue=0,StringFormat='0 °C'}"></TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-                                </TableRow>
-
-                                <TableRow>
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock>Up Time:</TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock Text="{Binding UpTime,Mode=OneWay,StringFormat=hh\\:mm\\:ss,FallbackValue='00:00:00'}"></TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-                                </TableRow>
-
-                                <TableRow>
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock>IP Address:</TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock Text="{Binding IPAddress,Mode=OneWay,FallbackValue=0}"></TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-                                </TableRow>
-
-                                <TableRow>
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock>Total Dye Time:</TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock Text="{Binding TotalDyeTime,Mode=OneWay,FallbackValue=0}"></TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-                                </TableRow>
-
-                                <TableRow>
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock>Total Dye Meters:</TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-
-                                    <TableCell>
-                                        <Paragraph>
-                                            <TextBlock Text="{Binding TotalDyeMeters,Mode=OneWay,FallbackValue=0}"></TextBlock>
-                                        </Paragraph>
-                                    </TableCell>
-                                </TableRow>
-                            </TableRowGroup>
-                        </Table>
-                    </FlowDocument>
-                </FlowDocumentScrollViewer>
-            </DockPanel>
+                                                </TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+
+                                    <TableRow>
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock>RAM:</TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock Text="{Binding RAM,Mode=OneWay,FallbackValue=0,Converter={StaticResource ByteArrayToFileSizeConverter},StringFormat='0'}"></TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+
+                                    <TableRow>
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock>Temperature:</TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock Text="{Binding Temperature,Mode=OneWay,FallbackValue=0,StringFormat='0 °C'}"></TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+
+                                    <TableRow>
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock>Up Time:</TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock Text="{Binding UpTime,Mode=OneWay,StringFormat=hh\\:mm\\:ss,FallbackValue='00:00:00'}"></TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+
+                                    <TableRow>
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock>IP Address:</TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock Text="{Binding IPAddress,Mode=OneWay,FallbackValue=0}"></TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+
+                                    <TableRow>
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock>Total Dye Time:</TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock Text="{Binding TotalDyeTime,Mode=OneWay,FallbackValue=0}"></TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+
+                                    <TableRow>
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock>Total Dye Meters:</TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+
+                                        <TableCell>
+                                            <Paragraph>
+                                                <TextBlock Text="{Binding TotalDyeMeters,Mode=OneWay,FallbackValue=0}"></TextBlock>
+                                            </Paragraph>
+                                        </TableCell>
+                                    </TableRow>
+                                </TableRowGroup>
+                            </Table>
+                        </FlowDocument>
+                    </FlowDocumentScrollViewer>
+                </DockPanel>
+            </touch:LightTouchScrollViewer>
         </Grid>
     </Grid>
 </UserControl>
-- 
cgit v1.3.1


From 6df6d1d289a794ee814ac2ea93c49ed7b9f49cbf Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Thu, 6 Feb 2020 09:07:03 +0200
Subject: Remove spool icon

Related Work Items: #2415
---
 .../PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/PPC/Modules')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml
index 2f7f91a80..dbe09ca19 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml
@@ -153,7 +153,7 @@
                                         </ItemsControl>
                                     </Grid>
 
-                                    <Image Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center" Source="../Images/cone-full.png" Margin="30"></Image>
+                                    <!--<Image Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center" Source="../Images/cone-full.png" Margin="30"></Image>-->
 
                                     <TextBlock Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Temperature</TextBlock>
                                     <TextBlock Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Inks</TextBlock>
-- 
cgit v1.3.1