按钮样式

VIZ.H2V.Module.Resource/Style/CheckBox/CheckBox_NdiView.xaml

@@ -54,10 +54,12 @@
             <Setter.Value>
                 <ControlTemplate TargetType="CheckBox">
                     <Grid x:Name="border" Background="Transparent">
-                        <Image x:Name="img" Visibility="Visible" Width="32" Height="32" 
-                               Source="/VIZ.H2V.Module.Resource;component/Icons/footbal_field_32x32.png"></Image>
-                        <Image x:Name="img_over"  Visibility="Collapsed" Width="32" Height="32" 
-                               Source="/VIZ.H2V.Module.Resource;component/Icons/footbal_field_over_32x32.png"></Image>
+                        <Image x:Name="img" Visibility="Visible" Width="24" Height="24" 
+                               VerticalAlignment="Center" HorizontalAlignment="Center"
+                               Source="/VIZ.H2V.Module.Resource;component/Icons/footbal_field_24x24.png"></Image>
+                        <Image x:Name="img_over"  Visibility="Collapsed" Width="24" Height="24" 
+                               VerticalAlignment="Center" HorizontalAlignment="Center"
+                               Source="/VIZ.H2V.Module.Resource;component/Icons/footbal_field_over_24x24.png"></Image>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">
@@ -84,10 +86,12 @@
             <Setter.Value>
                 <ControlTemplate TargetType="CheckBox">
                     <Grid x:Name="border" Background="Transparent">
-                        <Image x:Name="img" Visibility="Visible" Width="32" Height="32" 
-                               Source="/VIZ.H2V.Module.Resource;component/Icons/filter_32x32.png"></Image>
-                        <Image x:Name="img_over"  Visibility="Collapsed" Width="32" Height="32" 
-                               Source="/VIZ.H2V.Module.Resource;component/Icons/filter_over_32x32.png"></Image>
+                        <Image x:Name="img" Visibility="Visible" Width="24" Height="24" 
+                               VerticalAlignment="Center" HorizontalAlignment="Center"
+                               Source="/VIZ.H2V.Module.Resource;component/Icons/filter_24x24.png"></Image>
+                        <Image x:Name="img_over"  Visibility="Collapsed" Width="24" Height="24" 
+                               VerticalAlignment="Center" HorizontalAlignment="Center"
+                               Source="/VIZ.H2V.Module.Resource;component/Icons/filter_over_24x24.png"></Image>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsChecked" Value="True">

VIZ.H2V.Module.Resource/VIZ.H2V.Module.Resource.csproj

@@ -187,10 +187,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Icons\filter_32x32.png" />
-    <Resource Include="Icons\filter_over_32x32.png" />
-    <Resource Include="Icons\footbal_field_32x32.png" />
-    <Resource Include="Icons\footbal_field_over_32x32.png" />
+    <Resource Include="Icons\filter_24x24.png" />
+    <Resource Include="Icons\filter_over_24x24.png" />
+    <Resource Include="Icons\footbal_field_24x24.png" />
+    <Resource Include="Icons\footbal_field_over_24x24.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

VIZ.H2V.Module/NDIView/View/NDIView.xaml

@@ -129,7 +129,7 @@
             </Grid>
         </Grid>
         <StackPanel Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,20,0,0" Orientation="Horizontal">
-            <Button Width="80" Height="30" Content="算法重启" Style="{StaticResource Button_Restart}"
+            <Button Width="80" Height="30" Content="重启算法" Style="{StaticResource Button_Restart}"
                     IsEnabled="{Binding Path=ViewStatus,Converter={StaticResource NDIViewStatus2IsEnabledConverter_SettingButton}}"
                     Command="{Binding RestartCommand}"></Button>
             <Button Width="80" Height="30" Content="关闭算法" Style="{StaticResource Button_Restart}" Margin="15,0,0,0"
@@ -178,8 +178,8 @@
 
         <!-- 显示组 -->
         <StackPanel Grid.Row="0" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,0,5" Orientation="Horizontal">
-            <CheckBox Style="{StaticResource CheckBox_IsBorderEnabled}" Width="32" Height="32" Margin="0,0,15,0"
-                      ToolTip="是否启用边线检测"
+            <CheckBox Style="{StaticResource CheckBox_IsBorderEnabled}" Width="32" Height="32" Margin="0,0,10,0"
+                      ToolTip="启用边线过滤"
                       IsEnabled="{Binding Path=ViewStatus,Converter={StaticResource NDIViewStatus2IsEnabledConverter}}"
                       IsChecked="{Binding Path=AlgorithmConfig.IsBorderEnabled,Mode=TwoWay}">
                 <behaviors:Interaction.Triggers>
@@ -192,7 +192,7 @@
                 </behaviors:Interaction.Triggers>
             </CheckBox>
             <CheckBox Style="{StaticResource CheckBox_IsBorderShow}" Width="32" Height="32"
-                      ToolTip="是否显示边线检测区域"
+                      ToolTip="显示边线"
                       IsEnabled="{Binding Path=ViewStatus,Converter={StaticResource NDIViewStatus2IsEnabledConverter}}"
                       IsChecked="{Binding Path=AlgorithmConfig.IsShowBorder,Mode=TwoWay}">
                 <behaviors:Interaction.Triggers>