Skip to content

Commit

Permalink
增加drs动画效果
Browse files Browse the repository at this point in the history 
改进换挡显示
 -字体加大
 -间距减小
 -非当前档位亮度减小
 -优化档位字体的对齐结构
  • Loading branch information
Ning committed Oct 11, 2021
1 parent e0300d2 commit adb7c7a
Show file tree
Hide file tree
Showing 2 changed files with 196 additions and 73 deletions.
87 changes: 54 additions & 33 deletions WpfApp1/F1Instrument.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,40 @@
<Grid Height="500" Margin="0,0,0,0">
<Grid Height="500" Width="500">
<Image Name="img_bc" Source="/Resources/bc.png" Opacity="0.7"></Image>
<Grid Height="150" Width="250" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="125,156,125,194">
<Grid Width="800" HorizontalAlignment="Center" VerticalAlignment="Center">
<Grid Name="gear_grid" Width="800" Margin="0,0,0,0" VerticalAlignment="Center">
<Label Content="R" Name="lb_R" Margin="0,0,0,0" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="40"/>
<Label Content="N" Name="lb_N" Margin="80,0,0,0" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="40"></Label>
<Label Content="1" Name="lb_1" Margin="160,0,0,0" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="40"></Label>
<Label Content="2" Name="lb_2" Margin="240,0,0,0" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="40"></Label>
<Label Content="3" Name="lb_3" Margin="320,0,0,0" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="40"></Label>
<Label Content="4" Name="lb_4" Margin="400,0,0,0" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="40"></Label>
<Label Content="5" Name="lb_5" Margin="480,0,0,0" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="40"></Label>
<Label Content="6" Name="lb_6" Margin="560,0,0,0" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="40"></Label>
<Label Content="7" Name="lb_7" Margin="640,0,0,0" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="40"></Label>
<Label Content="8" Name="lb_8" Margin="720,0,0,0" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="40"></Label>

<Grid Height="100" Width="240" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="-50,188,-50,212">
<Grid Width="600" HorizontalAlignment="Center" VerticalAlignment="Center">
<Grid Name="gear_grid" Width="600" VerticalAlignment="Center" Margin="-77,0,77,0">
<Grid Height="150" Width="80" VerticalAlignment="Center" Margin="-450,0,0,0">
<Label Content="R" Name="lb_R" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="50"/>
</Grid>
<Grid Height="150" Width="80" VerticalAlignment="Center" Margin="-350,0,0,0">
<Label Content="N" Name="lb_N" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="50"/>
</Grid>
<Grid Height="150" Width="80" VerticalAlignment="Center" Margin="-250,0,0,0">
<Label Content="1" Name="lb_1" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="50"/>
</Grid>
<Grid Height="150" Width="80" VerticalAlignment="Center" Margin="-150,0,0,0">
<Label Content="2" Name="lb_2" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="50"/>
</Grid>
<Grid Height="150" Width="80" VerticalAlignment="Center" Margin="-50,0,0,0">
<Label Content="3" Name="lb_3" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="50"/>
</Grid>
<Grid Height="150" Width="80" VerticalAlignment="Center" Margin="50,0,0,0">
<Label Content="4" Name="lb_4" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="50"/>
</Grid>
<Grid Height="150" Width="80" VerticalAlignment="Center" Margin="150,0,0,0">
<Label Content="5" Name="lb_5" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="50"/>
</Grid>
<Grid Height="150" Width="80" VerticalAlignment="Center" Margin="250,0,0,0">
<Label Content="6" Name="lb_6" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="50"/>
</Grid>
<Grid Height="150" Width="80" VerticalAlignment="Center" Margin="350,0,0,0">
<Label Content="7" Name="lb_7" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="50"/>
</Grid>
<Grid Height="150" Width="80" VerticalAlignment="Center" Margin="450,0,0,0">
<Label Content="8" Name="lb_8" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Foreground="White" FontFamily="SourceHanSansCN-Normal" FontSize="50"/>
</Grid>
</Grid>
</Grid>
</Grid>
Expand All @@ -29,28 +50,28 @@
<local:Arc x:Name="arc_tr" Width="326" Height="326" Rect="25,25,277,277" StartAngle="128" EndAngle="307" Stroke="#16d213" StrokeThickness="35" StrokeDashArray="1,0" HorizontalAlignment="Center" VerticalAlignment="Center"></local:Arc>
<local:Arc x:Name="arc_break" Width="326" Height="326" Rect="24,24,278,278" StartAngle="410" EndAngle="311" Stroke="#d20003" StrokeThickness="34" StrokeDashArray="1,0" HorizontalAlignment="Center" VerticalAlignment="Center"></local:Arc>

<StackPanel Margin="5" x:Name="dr">
<Path Fill="#0ae404">
<Path.Data>
<CombinedGeometry GeometryCombineMode="Union">
<CombinedGeometry.Geometry1>
<CombinedGeometry GeometryCombineMode="Exclude">
<CombinedGeometry.Geometry1>
<EllipseGeometry Center="245 245" RadiusX="117" RadiusY="117"></EllipseGeometry>
</CombinedGeometry.Geometry1>
<CombinedGeometry.Geometry2>
<RectangleGeometry Rect="100 179 300 300" >

</RectangleGeometry>
</CombinedGeometry.Geometry2>
</CombinedGeometry>
</CombinedGeometry.Geometry1>
<StackPanel Margin="5" x:Name="dr">
<Path Fill="#0ae404">
<Path.Data>
<CombinedGeometry GeometryCombineMode="Union">
<CombinedGeometry.Geometry1>
<CombinedGeometry GeometryCombineMode="Exclude">
<CombinedGeometry.Geometry1>
<EllipseGeometry Center="245 245" RadiusX="117" RadiusY="117"></EllipseGeometry>
</CombinedGeometry.Geometry1>
<CombinedGeometry.Geometry2>
<RectangleGeometry Rect="100 179 300 300" >

</CombinedGeometry>
</Path.Data>
</Path>
</StackPanel>
</RectangleGeometry>
</CombinedGeometry.Geometry2>
</CombinedGeometry>
</CombinedGeometry.Geometry1>

</CombinedGeometry>
</Path.Data>
</Path>
</StackPanel>

<Grid Width="150" Height="50" HorizontalAlignment="Center" Margin="175,147,175,303">
<Label Name="lb_DRS" Content="DRS" FontSize="35" HorizontalAlignment="Center" Foreground="Orange" FontFamily="SourceHanSansCN-Normal" Margin="14,-10,14,10"></Label>
</Grid>
Expand Down
Loading

0 comments on commit adb7c7a

Please sign in to comment.