添加 dynarea PosMm, 以后界面不需要 initparam.Encoder1_mmpp 转换器

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

@@ -12,17 +12,22 @@
                 <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
                 <ResourceDictionary Source="pack://application:,,,/FLY.Thick.Base.UI;component/Converter/Dictionary_MyConv.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-            <Style TargetType="TextBlock" x:Key="TextBlockStyle_ItemHeader">
+            <Style TargetType="TextBlock" x:Key="Style.Text.ItemHeader">
                 <Setter Property="FontWeight" Value="Bold"/>
                 <Setter Property="FontFamily" Value="YouYuan"/>
                 <Setter Property="FontSize" Value="12"/>
                 <Setter Property="HorizontalAlignment" Value="Left"/>
-                <Setter Property="Foreground" Value="#FF3B3B3B"/>
                 <Setter Property="Margin" Value="5,0"/>
             </Style>
+            <Style TargetType="TextBlock" x:Key="Style.Text.ItemValue">
+                <Setter Property="TextAlignment" Value="Center"/>
+                <Setter Property="HorizontalAlignment" Value="Center"/>
+                <Setter Property="FontFamily" Value="Microsoft Sans Serif"/>
+                <Setter Property="FontSize" Value="24"/>
+            </Style>
         </ResourceDictionary>
     </UserControl.Resources>
-    <Border Style="{StaticResource Styles.Module.Border}" Name="Border_AD" >
+    <Border Style="{StaticResource Styles.Module.Border}" >
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition  />
@@ -54,8 +59,10 @@
                         </Rectangle.Width>
                     </Rectangle>
                     <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="AD" Style="{StaticResource TextBlockStyle_ItemHeader}" />
-                            <TextBlock Text="{Binding AD, Converter={StaticResource ResourceKey=intconv}}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" />
+                        <TextBlock Style="{StaticResource Style.Text.ItemHeader}" FontFamily="Microsoft Sans Serif" 
+                                   Text="AD" />
+                        <TextBlock Style="{StaticResource Style.Text.ItemValue}" 
+                                   Text="{Binding AD, Converter={StaticResource intconv}}" />
                     </StackPanel>
                 </Grid>
                 <Grid Margin="2">
@@ -73,8 +80,8 @@
                         </Rectangle.Width>
                     </Rectangle>
                     <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="位置" Style="{StaticResource TextBlockStyle_ItemHeader}" />
-                            <TextBlock FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" >
+                        <TextBlock Style="{StaticResource Style.Text.ItemHeader}" Text="位置" />
+                        <TextBlock Style="{StaticResource Style.Text.ItemValue}" >
                             <Run>
                                 <MultiBinding Converter="{StaticResource p2mmconv}" Mode="OneWay" StringFormat="{}{0:F0}">
                                     <Binding Path="Position" />
@@ -82,17 +89,17 @@
                                 </MultiBinding>
                             </Run>
                         </TextBlock>
-                            <TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="12" Foreground="Black">
-                                                    <Run Text="mm"/>
-                            </TextBlock>
-                            <TextBlock Style="{StaticResource TextBlockStyle_FieldContent_mm_interval}" Text="|" FontSize="24" Foreground="Black"/>
-                            <TextBlock Text="{Binding Position}" Style="{StaticResource TextBlockStyle_FieldContent_mm}" FontSize="12" Foreground="Black">
-
+                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" FontSize="12" Foreground="Black"
+                                   Text="mm"/>
+                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Separator}" FontSize="24" Foreground="Black"/>
+                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" FontSize="12" Foreground="Black"
+                                   Text="{Binding Position}" >
                         </TextBlock>
                     </StackPanel>
                     <StackPanel Grid.Column="1" Orientation="Horizontal">
-                            <TextBlock Text="{Binding Velocity,StringFormat={}{0:F1},Mode=OneWay}" FontSize="24" FontFamily="Microsoft Sans Serif" TextAlignment="Center" HorizontalAlignment="Center" />
-                            <TextBlock Text="m/min" Style="{StaticResource ResourceKey=TextBlockStyle_FieldContent_mm}" FontSize="12" Foreground="Black"/>
+                        <TextBlock Style="{StaticResource Style.Text.ItemValue}" Text="{Binding Velocity,StringFormat={}{0:F1},Mode=OneWay}" />
+                        <TextBlock Style="{StaticResource Styles.Text.FieldContent.Unit}" FontSize="12" Foreground="Black"
+                                   Text="m/min" />
                     </StackPanel>
                 </Grid>
             </StackPanel>

Project.FLY.Thick.Base/FLY.Thick.Base/Common/DynArea.cs

@@ -35,7 +35,10 @@ namespace FLY.Thick.Base.Common
         /// 编码器1 位置 脉冲
         /// </summary>
         public int Position { get; set; }
-
+        /// <summary>
+        /// 测厚仪位置mm
+        /// </summary>
+        public double PosMm { get; set; }
         /// <summary>
         /// AD值
         /// </summary>

Project.FLY.Thick.Base/FLY.Thick.Base/FLY.Thick.Base.csproj

@@ -153,7 +153,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AutoMapper">
-      <Version>9.0.0</Version>
+      <Version>10.1.1</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>12.0.3</Version>