diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2023-05-14 17:09:17 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2023-05-14 17:09:17 +0300 |
| commit | 207ac666dd0e091ec58af244b0e98cda33789d7f (patch) | |
| tree | 2956546a7c66444b5cad1ee0d3f34e5a77ba8797 /Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml | |
| parent | 8ebe827a0929a04275f77cced0320852ce0b2bbb (diff) | |
| download | Tango-207ac666dd0e091ec58af244b0e98cda33789d7f.tar.gz Tango-207ac666dd0e091ec58af244b0e98cda33789d7f.zip | |
Waste GUI Object - change margins.
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml | 52 |
1 files changed, 6 insertions, 46 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 b6541df1f..44be63ffe 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml @@ -125,7 +125,9 @@ <DataTemplate x:Key="LiquidBox" DataType="{x:Type models:JerricanLevelModel}"> <DockPanel> <TextBlock DockPanel.Dock="Bottom" Text="{Binding IDSPack.LiquidType.ShortName}" HorizontalAlignment="Center" Margin="0 8 0 0"></TextBlock> - <TextBlock DockPanel.Dock="Top" Height="15" VerticalAlignment="Top" TextAlignment="Center" Visibility="{Binding HasRemainingTimeoutError,Converter={StaticResource BooleanToVisibilityConverter}}" Text="{Binding RemainingTimeoutError, StringFormat='{}{0:hh}:{0:mm}m', FallbackValue=00:00}" HorizontalAlignment="Center" FontSize="{StaticResource TangoSmallFontSizeBar}" ></TextBlock> + <Grid Height="15" DockPanel.Dock="Top"> + <TextBlock DockPanel.Dock="Top" Height="15" VerticalAlignment="Top" TextAlignment="Center" Visibility="{Binding HasRemainingTimeoutError,Converter={StaticResource BooleanToVisibilityConverter}}" Text="{Binding RemainingTimeoutError, StringFormat='{}{0:hh}:{0:mm}m', FallbackValue=00:00}" HorizontalAlignment="Center" FontSize="{StaticResource TangoSmallFontSizeBar}" ></TextBlock> + </Grid> <Grid > <Grid ClipToBounds="True" HorizontalAlignment="Center"> <Path Fill="{Binding Path=IDSPack.LiquidType, Converter={StaticResource LiquidTypeToBrushConverter}}" StrokeThickness="1.5" > @@ -196,8 +198,9 @@ <DataTemplate x:Key="WasteBox"> <DockPanel> <TextBlock DockPanel.Dock="Bottom" Text="Waste" HorizontalAlignment="Center" Margin="0 8 0 0"></TextBlock> - <TextBlock DockPanel.Dock="Top" Height="15" VerticalAlignment="Top" TextAlignment="Center" Text="" HorizontalAlignment="Center" FontSize="{StaticResource TangoSmallFontSizeBar}" ></TextBlock> - <Grid DockPanel.Dock="Top"> + <Grid Height="15" DockPanel.Dock="Top"> + </Grid> + <Grid DockPanel.Dock="Top"> <Grid ClipToBounds="True" HorizontalAlignment="Center"> <Path Fill="#CCCCCC"> <Path.Resources> @@ -236,49 +239,6 @@ </DockPanel> </DataTemplate> - <!--<DataTemplate x:Key="LubBox"> - <DockPanel > - <TextBlock DockPanel.Dock="Bottom" Text="Lub" HorizontalAlignment="Center" Margin="0 8 0 0"></TextBlock> - <TextBlock DockPanel.Dock="Top" Height="15" VerticalAlignment="Top" TextAlignment="Center" Text="" HorizontalAlignment="Center" FontSize="{StaticResource TangoSmallFontSizeBar}" ></TextBlock> - <Grid DockPanel.Dock="Top"> - <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="{StaticResource TangoTextWatermarkBrush}" Fill="Transparent" StrokeThickness="1" Data="{StaticResource InkContainerPath}"/> - </Grid> - <UniformGrid Rows="4" Columns="1" Margin="0 15 0 15" HorizontalAlignment="Center"> - <Rectangle Stroke="{StaticResource TangoTextWatermarkBrush}" Width="10" Height="2" ></Rectangle> - <Rectangle Width="10" Height="2" Stroke="{StaticResource TangoTextWatermarkBrush}"></Rectangle> - <Rectangle Width="10" Height="2" Stroke="{StaticResource TangoTextWatermarkBrush}"></Rectangle> - <Rectangle Width="10" Height="2" Stroke="{StaticResource TangoTextWatermarkBrush}"></Rectangle> - </UniformGrid> - </Grid> - </DockPanel> - </DataTemplate>--> - </UserControl.Resources> <Grid Width="960" Height="1080"> <Grid.ColumnDefinitions> |