aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2023-04-30 15:36:25 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2023-04-30 15:36:25 +0300
commit9f890f5bdcdf20d44c4bcc7f3ad005d6ffa005a2 (patch)
tree91a3274e4de0c004e68ca5bc58b90def0414893b /Software/Visual_Studio/PPC
parentc462aab74f45aeac7a25a20aa1bf36ee5ea841bd (diff)
downloadTango-9f890f5bdcdf20d44c4bcc7f3ad005d6ffa005a2.tar.gz
Tango-9f890f5bdcdf20d44c4bcc7f3ad005d6ffa005a2.zip
Lub control - only GUI.
Diffstat (limited to 'Software/Visual_Studio/PPC')
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml58
1 files changed, 51 insertions, 7 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 433e08571..5c96fecb1 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -205,6 +205,48 @@
</DockPanel>
</DataTemplate>
+ <DataTemplate x:Key="LubBox">
+ <DockPanel>
+ <TextBlock DockPanel.Dock="Bottom" Text="Lub" HorizontalAlignment="Center" Margin="0 8 0 0"></TextBlock>
+ <Grid>
+ <Grid ClipToBounds="True" HorizontalAlignment="Center">
+ <Path Fill="#CCCCCC">
+ <Path.Resources>
+ <sys:Double x:Key="RectWidth">30</sys:Double>
+ <sys:Double x:Key="RectHeight">88</sys:Double>
+ </Path.Resources>
+ <Path.Data>
+ <CombinedGeometry GeometryCombineMode="Intersect">
+ <CombinedGeometry.Geometry1>
+ <StaticResource ResourceKey="InkContainerPath"/>
+ </CombinedGeometry.Geometry1>
+ <CombinedGeometry.Geometry2>
+
+ <RectangleGeometry Rect="1,0 30,88">
+ <!--<RectangleGeometry.Rect>
+ <MultiBinding Converter="{StaticResource MidTankLevelToElementRectConverter}">
+ <Binding Source="{StaticResource RectHeight}"/>
+ <Binding Source="{StaticResource RectWidth}"/>
+ <Binding Path="Level" />
+ </MultiBinding>
+ </RectangleGeometry.Rect>-->
+ </RectangleGeometry>
+ </CombinedGeometry.Geometry2>
+ </CombinedGeometry>
+ </Path.Data>
+ </Path>
+ <Path Stroke="Black" Fill="Transparent" StrokeThickness="1" Data="{StaticResource InkContainerPath}"/>
+ </Grid>
+ <UniformGrid Rows="4" Columns="1" Margin="0 15 0 15" HorizontalAlignment="Center">
+ <Rectangle Stroke="Black" Width="10" Height="2" ></Rectangle>
+ <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle>
+ <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle>
+ <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle>
+ </UniformGrid>
+ </Grid>
+ </DockPanel>
+ </DataTemplate>
+
</UserControl.Resources>
<Grid Width="1246" Height="1400">
<Grid.ColumnDefinitions>
@@ -813,7 +855,7 @@
</DockPanel>
<Border Height="2" Background="{StaticResource TangoLightBorderBrush}" VerticalAlignment="Bottom" Margin="0 2 0 0" CornerRadius="2"></Border>
</Grid>
- <Grid Grid.Row="1" Margin="0 25 0 0">
+ <Grid Grid.Row="1" Margin="0 28 0 0">
<StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal" >
<Image Source="../Images/Overview Icons/Sensors.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/>
@@ -867,7 +909,7 @@
</StackPanel>
</UniformGrid>
<Grid Margin="0 28 0 0">
- <Image Source="../Images/Job Issues/Machine outline.png" Height="Auto" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Center" Width="634" />
+ <Image Source="../Images/Job Issues/Machine outline.png" Height="188" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Center" Width="636" />
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<StackPanel Orientation="Vertical">
<Border Height="184" Width="83" VerticalAlignment="Center" CornerRadius="2 0 0 2" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}">
@@ -951,7 +993,7 @@
</Grid>
</StackPanel>
</Grid>
- <Grid Grid.Row="2" x:Name="IncLevels" Margin="0 20 0 0">
+ <Grid Grid.Row="2" x:Name="IncLevels" Margin="0 20 0 0" Height="220">
<StackPanel Orientation="Vertical">
<DockPanel>
<StackPanel Orientation="Vertical" DockPanel.Dock="Right" Margin="0 0 30 0" >
@@ -960,7 +1002,7 @@
<TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Waste</TextBlock>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="-25 24 0 0">
- <Border Height="88" Width="2" CornerRadius="16" BorderThickness="2" BorderBrush="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="-20 0 0 0"/>
+ <Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="-20 0 0 0"/>
<ContentControl Margin="20 0 0 0" ContentTemplate="{StaticResource WasteBox}" Content="{Binding}" IsTabStop="False"/>
</StackPanel>
@@ -979,12 +1021,14 @@
</ItemsControl.ItemsPanel>
</ItemsControl>
- <Border Height="88" Width="2" CornerRadius="16" BorderThickness="2" BorderBrush="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="20 0 0 0"/>
+ <Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="20 0 0 0"/>
+ <ContentControl Margin="55 0 0 0" ContentTemplate="{StaticResource LubBox}" Content="{Binding}" IsTabStop="False"/>
</StackPanel>
</StackPanel>
</DockPanel>
-
- </StackPanel>
+
+ </StackPanel>
+ <Border VerticalAlignment="Bottom" Height="2" Background="{StaticResource TangoLightBorderBrush}" Margin="0 40 0 0" CornerRadius="2"></Border>
</Grid>
</Grid>
</Grid>