适配分辨率1280*1024的界面

Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_FrameDiff.xaml

@@ -12,7 +12,10 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
+            <Style TargetType="TextBlock" >
+                <Setter Property="FontSize" Value="13"/>
+                <Setter Property="Margin" Value="7,13,7,5" />
+            </Style>
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid>
@@ -57,8 +60,8 @@
             </lvc:CartesianChart.AxisY>
         </lvc:CartesianChart>-->
         <StackPanel Orientation="Horizontal" Grid.Row="1">
-            <TextBlock Text="{Binding FrameIdx1, StringFormat=第一幅号：{0}}" Style="{StaticResource TextBlockStyle_FieldHeader}"  FontSize="18"  Margin="15,5,15,5"/>
-            <TextBlock Text="{Binding FrameIdx2, StringFormat=第二幅号：{0}}" Style="{StaticResource TextBlockStyle_FieldHeader}"  FontSize="18"  Margin="15,5,15,5"/>
+            <TextBlock Text="{Binding FrameIdx1, StringFormat=第一幅号：{0}}"  />
+            <TextBlock Text="{Binding FrameIdx2, StringFormat=第二幅号：{0}}"  />
         </StackPanel>
 
     </Grid>

Project.FLY.ThickHeatAnalyst.Fix/FLY.HeatingHelper.UI/UIModule/UC_HeatBoltAnalyst.xaml

@@ -12,7 +12,16 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
+            <Style TargetType="TextBlock">
+                <Setter Property="Margin" Value="5"/>
+                <Setter Property="FontFamily" Value="YouYuan" />
+                <Setter Property="FontSize" Value="25" />
+            </Style>
+            <Style TargetType="TextBox">
+                <Setter Property="FontSize" Value="22" />
+                <Setter Property="FontFamily" Value="YouYuan" />
+                <Setter Property="Margin" Value="0,5,5,5" />
+            </Style>
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -26,41 +35,41 @@
                 <RowDefinition Height="auto"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
-            <StackPanel Orientation="Vertical"  Name="SP_0">
+            <StackPanel Orientation="Vertical"  Name="SP_0" Margin="5,10">
                 <DockPanel>
-                    <TextBlock Text="最大幅间隔" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}" DockPanel.Dock="Left"   />
-                    <TextBox Text="{Binding MaxFrameInterval}"  Style="{StaticResource TextBoxStyle1}" DockPanel.Dock="Right" />
+                    <TextBlock Text="最大幅间隔:" Background="LightBlue" DockPanel.Dock="Left"   />
+                    <TextBox Text="{Binding MaxFrameInterval}"  />
                 </DockPanel>
                 <DockPanel>
-                    <TextBlock Text="总加热变化量" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}"  />
-                    <TextBox Text="{Binding HeatRateVar}" Style="{StaticResource TextBoxStyle1}" />
+                    <TextBlock Text="总加热变化量:" Background="LightBlue"  />
+                    <TextBox Text="{Binding HeatRateVar}"  />
                 </DockPanel>
                 <DockPanel>
-                    <TextBlock Text="忽略加热变化量" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}" />
-                    <TextBox Text="{Binding NeglectHeatRate}" Style="{StaticResource TextBoxStyle1}" />
+                    <TextBlock Text="忽略加热变化量:" Background="LightBlue"  />
+                    <TextBox Text="{Binding NeglectHeatRate}" />
                 </DockPanel>
                 <DockPanel>
-                    <TextBlock Text="分离螺丝数" Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}"  />
-                    <TextBox Text="{Binding Separation}" Style="{StaticResource TextBoxStyle1}"  />
+                    <TextBlock Text="分离螺丝数:" Background="LightBlue"   />
+                    <TextBox Text="{Binding Separation}" />
                 </DockPanel>
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="3*"/>
-                        <ColumnDefinition Width="2*"/>
+                        <ColumnDefinition Width="4*"/>
                     </Grid.ColumnDefinitions>
-                        <TextBlock  Text="{Binding Path=HeatBoltItems.Count, StringFormat=搜索结果：{0}}"  Background="LightBlue" Style="{StaticResource TextBlockStyle_FieldHeader}"   />
+                        <TextBlock  Text="{Binding Path=HeatBoltItems.Count, StringFormat=搜索结果：{0}}"  Background="LightBlue"    />
                     <Grid Grid.Column="1">
-                        <DockPanel>
-                            <Controls:ToggleSwitch Content="过滤" IsChecked="{Binding IsFilter}"  Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"  FontSize="22" Margin="5"/>
-                            <Button Content="搜索" Click="Button_Click"   FontFamily="YouYuan"  Margin="5"
+                        <StackPanel Orientation="Horizontal">
+                            <Controls:ToggleSwitch Content="过滤" IsChecked="{Binding IsFilter}"  Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"   FontSize="20" Margin="15,5,5,5" Width="100"/>
+                            <Button Content="搜索" Click="Button_Click"   FontFamily="YouYuan"  Margin="5" Width="75" FontSize="20"
                     Style="{DynamicResource AccentedSquareButtonStyle}" />
-                        </DockPanel>
+                        </StackPanel>
                     </Grid>
                 </Grid>
             </StackPanel>
             <ListView x:Name="lv_result" ItemsSource="{Binding HeatBoltItems}"  Grid.Row="1" Margin="5,5,5,20"
                       SelectionChanged="Lv_result_SelectionChanged"
-                      SelectedIndex="{Binding SelectItem}"  FontFamily="YouYuan" >
+                      SelectedIndex="{Binding SelectItem}"  FontFamily="YouYuan"  FontSize="20">
                 <ListView.View>
                     <GridView>
                         <GridView.Columns>
@@ -89,7 +98,7 @@
             </Grid.RowDefinitions>
             <local:UC_FramePicker Grid.Row="0" DataContext="{Binding vm1}" Margin="5"/>
             <local:UC_FramePicker Grid.Row="1" DataContext="{Binding vm2}" Margin="5"/>
-            <local:UC_FrameDiff Grid.Row="2" DataContext="{Binding vmDiff}" Margin="5"/>
+            <local:UC_FrameDiff Grid.Row="2" DataContext="{Binding vmDiff}" Margin="5,5,5,20"/>
         </Grid>
     </Grid>
 </UserControl>