diff options
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml | 60 |
1 files changed, 48 insertions, 12 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 fae3fe3d8..25841cb94 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml @@ -730,26 +730,38 @@ <Image Source="../Images/Job Issues/job_length.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/> <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Sensors</TextBlock> </StackPanel> - <UniformGrid Columns="5" Rows="1" Height="150"> + <UniformGrid Columns="5" Rows="1" Height="120" Margin="20 12 20 0"> + <StackPanel Orientation="Vertical"> <Grid> - <shapes:Arc Stroke="Red" StrokeThickness="10" StartAngle="40" EndAngle="320" Width="110" Height="110" OriginRotationDegrees="90" Direction="Clockwise"/> - <shapes:Arc Stroke="Green" StrokeThickness="10" StartAngle="40" EndAngle="140" Width="110" Height="110" OriginRotationDegrees="90" Direction="Clockwise"/> + <touch:TouchArcProgress Foreground="Green" RingThickness="10" Value="75" Maximum="100" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress> + <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="Bold" Foreground="Green">10</TextBlock> + <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 10" FontSize="{StaticResource TangoComboBoxItemFontSize}" >Bar</TextBlock> + </Grid> + <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Pressure</TextBlock> + </StackPanel> <Grid> - <shapes:Arc Stroke="Red" StrokeThickness="10" StartAngle="40" EndAngle="320" Width="110" Height="110" OriginRotationDegrees="90" Direction="Clockwise"/> - <shapes:Arc Stroke="Green" StrokeThickness="10" StartAngle="40" EndAngle="220" Width="110" Height="110" OriginRotationDegrees="90" Direction="Clockwise"/> + <touch:TouchArcProgress Foreground="Green" RingThickness="10" Value="75" Maximum="100" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress> + <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Green">10</TextBlock> + <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="ºC" ></TextBlock> </Grid> <Grid> - <shapes:Arc Stroke="Red" StrokeThickness="10" StartAngle="40" EndAngle="320" Width="110" Height="110" OriginRotationDegrees="90" Direction="Clockwise"/> - <shapes:Arc Stroke="Green" StrokeThickness="10" StartAngle="40" EndAngle="100" Width="110" Height="110" OriginRotationDegrees="90" Direction="Clockwise"/> + <touch:TouchArcProgress Foreground="Green" RingThickness="10" Value="75" Maximum="100" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress> + <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Green">10</TextBlock> + <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="ºC"></TextBlock> + </Grid> <Grid> - <shapes:Arc Stroke="Red" StrokeThickness="10" StartAngle="40" EndAngle="320" Width="110" Height="110" OriginRotationDegrees="90" Direction="Clockwise"/> - <shapes:Arc Stroke="Green" StrokeThickness="10" StartAngle="40" EndAngle="260" Width="110" Height="110" OriginRotationDegrees="90" Direction="Clockwise"/> + <touch:TouchArcProgress Foreground="red" RingThickness="10" Value="75" Maximum="100" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress> + <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Green">75</TextBlock> + <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="ºC"></TextBlock> + </Grid> <Grid> - <shapes:Arc Stroke="Red" StrokeThickness="10" StartAngle="40" EndAngle="320" Width="110" Height="110" OriginRotationDegrees="90" Direction="Clockwise"/> - <shapes:Arc Stroke="Green" StrokeThickness="10" StartAngle="40" EndAngle="300" Width="110" Height="110" OriginRotationDegrees="90" Direction="Clockwise"/> + <touch:TouchArcProgress Foreground="red" RingThickness="10" Value="75" Maximum="100" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress> + <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Red">200</TextBlock> + <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="ºC"></TextBlock> + </Grid> </UniformGrid> <Grid > @@ -759,6 +771,7 @@ </StackPanel> </Grid> <Grid Grid.Row="2" x:Name="IncLevels" Margin="0 20 0 0"> + <StackPanel Orientation="Vertical"> <DockPanel> <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" > <Image Source="../Images/Job Issues/job_length.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/> @@ -769,7 +782,30 @@ <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Ink Levels</TextBlock> </StackPanel> </DockPanel> - + <UniformGrid Columns="12" Rows="1" Margin="0 20 0 0"> + <Border Height="88" Width="32" CornerRadius="16" BorderThickness="2" BorderBrush="RosyBrown"> + <Grid> + <Canvas Width="30" > + <Rectangle Canvas.Top="30" Fill="Cyan" Height="88" Width="32" > + <Rectangle.Clip> + <RectangleGeometry RadiusX="1" RadiusY="15" > + <RectangleGeometry.Rect> + <Rect Width="30" Height="20"></Rect> + </RectangleGeometry.Rect> + </RectangleGeometry> + </Rectangle.Clip> + </Rectangle> + </Canvas> + <UniformGrid Rows="4" Columns="1" Margin="1 15 1 15"> + <Rectangle Width="10" Height="2" Fill="Black"></Rectangle> + <Rectangle Width="10" Height="2" Fill="Black"></Rectangle> + <Rectangle Width="10" Height="2" Fill="Black"></Rectangle> + <Rectangle Width="10" Height="2" Fill="Black"></Rectangle> + </UniformGrid> + </Grid> + </Border> + </UniformGrid> + </StackPanel> </Grid> </Grid> </Grid> |