Merge branch 'dev6.0' of http://private.flyautomation.net:82/panruising/thick_public into dev6.0

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/FixGraph/FixGraph.xaml

@@ -13,7 +13,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Dictionary_MyConv.xaml"/>
-                <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Normal.UI;component/Themes/Styles.xaml"/>
+                <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Themes/Styles.xaml"/>
             </ResourceDictionary.MergedDictionaries>
             <SolidColorBrush x:Key="TextBrush" Color="#4C4949" />
             <SolidColorBrush x:Key="GrayBrush1" Color="#FF727272"/>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/FixGraph/FixGraphConfig.xaml

@@ -12,7 +12,6 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
                 <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Converter/Dictionary_MyConv.xaml"/>
-                <!--<ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Culture/StringResource.zh-CN.xaml"/>-->
             </ResourceDictionary.MergedDictionaries>
             <local:IntMsConverter x:Key="intmsconv"/>
             <local:TimeLenConverter x:Key="timelenconv"/>
@@ -24,14 +23,14 @@
         <StackPanel Orientation="Vertical" Margin="5,20">
             <StackPanel Orientation="Horizontal">
                 <StackPanel Orientation="Vertical" Margin="5">
-                    <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strMixCnt}" />
+                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="混合数" />
                     <StackPanel Orientation="Horizontal">
-                        <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding Mix}" />
+                        <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding Mix}" />
                     </StackPanel>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal">
                     <StackPanel Orientation="Vertical" Margin="5">
-                        <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strInterval}" />
+                        <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="间隔" />
                         <StackPanel Orientation="Horizontal">
                             <ComboBox x:Name="combox_intervalopt" Width="140" HorizontalAlignment="Left" FontSize="32" 
                                       ItemsSource="{Binding DataContext.IntervalOpt, ElementName=grid_null}" 
@@ -40,13 +39,13 @@
                         </StackPanel>
                     </StackPanel>
                     <StackPanel Orientation="Vertical" Margin="5">
-                        <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="{DynamicResource strDataCnt}" />
+                        <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="数据量" />
                         <StackPanel Orientation="Horizontal">
                             <ComboBox x:Name="combox_datalenopt" Width="140" HorizontalAlignment="Left" FontSize="32" 
                                           ItemsSource="{Binding DataContext.DataLenOpt, ElementName=grid_null}" 
                                           SelectedValue="{Binding Len}"/>
-                            <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm_interval}" Text="|" />
-                            <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" >
+                            <TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" />
+                            <TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" >
                                         <Run>
                                             <MultiBinding Converter="{StaticResource timelenconv}" Mode="OneWay" >
                                                 <Binding Path="Interval" />
@@ -60,29 +59,29 @@
             </StackPanel>
             <StackPanel Orientation="Horizontal" >
                 <StackPanel Orientation="Vertical" Margin="5">
-                    <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="AD模式" />
+                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="AD模式" />
                     <ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding IsADMode}" />
                 </StackPanel>
                 <StackPanel Orientation="Vertical" Margin="5">
-                    <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="自动Y轴" />
+                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="自动Y轴" />
                     <ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding IsAutoY}" />
                 </StackPanel>
                 <StackPanel Orientation="Vertical" Margin="5" Visibility="{Binding IsAutoY,Converter={StaticResource visbilityconv}, ConverterParameter=HiddenWhenTrue}">
-                    <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="自动Y轴中值" />
+                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="自动Y轴中值" />
                     <ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding IsAutoTarget}" />
                 </StackPanel>
             </StackPanel>
             <StackPanel Orientation="Horizontal" Visibility="{Binding IsAutoY,Converter={StaticResource visbilityconv}, ConverterParameter=HiddenWhenTrue}">
                 <StackPanel Orientation="Vertical" Margin="5" Visibility="{Binding IsAutoTarget,Converter={StaticResource visbilityconv}, ConverterParameter=HiddenWhenTrue}">
-                    <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="Y轴中值" />
+                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="Y轴中值" />
                     <StackPanel Orientation="Horizontal">
-                        <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding YTarget}" />
+                        <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding YTarget}" />
                     </StackPanel>
                 </StackPanel>
                 <StackPanel Orientation="Vertical" Margin="5">
-                    <TextBlock Style="{StaticResource ResourceKey=TextBlockStyle_FieldHeaderEditable}" Text="Y轴范围" />
+                    <TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="Y轴范围" />
                     <StackPanel Orientation="Horizontal">
-                        <TextBox Style="{StaticResource ResourceKey=TextBoxStyle_FieldContent}" Text="{Binding YRange}" />
+                        <TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding YRange}" />
                     </StackPanel>
                 </StackPanel>
             </StackPanel>