删除多余的style

Project.FLY.DownBlowing/FLY.DownBlowing.UI.Client/UiModule/DynAreaWinder.xaml

@@ -19,15 +19,6 @@
 
             <sys:Double x:Key="FontSize_title">18</sys:Double>
             <sys:Double x:Key="FontSize_unit">12</sys:Double>
-            
-
-            <!--<Style TargetType="{x:Type Path}" x:Key="PathStyle_icon">
-                <Setter Property="Fill" Value="White"/>
-                <Setter Property="Stretch" Value="Uniform"/>
-                <Setter Property="Width" Value="30"/>
-                <Setter Property="Height" Value="30"/>
-                <Setter Property="SnapsToDevicePixels" Value="True"/>
-            </Style>-->
 
             <conv:IsGTMultiValueConverter x:Key="isgtconv"/>
             <conv:RatioConverter x:Key="ratioconv" />

Project.FLY.IBC/FLY.IBC.UI.Client/UiModule/DynAreaIbc.xaml

@@ -16,16 +16,6 @@
                 <ResourceDictionary Source="pack://application:,,,/FLY.IBC.UI.Client;component/UnitTests/UnitTests_ibc.xaml"/>
 
             </ResourceDictionary.MergedDictionaries>
-
-
-            <Style TargetType="{x:Type Path}" x:Key="PathStyle_icon">
-                <Setter Property="Fill" Value="White"/>
-                <Setter Property="Stretch" Value="Uniform"/>
-                <Setter Property="Width" Value="30"/>
-                <Setter Property="Height" Value="30"/>
-                <Setter Property="SnapsToDevicePixels" Value="True"/>
-            </Style>
-
         </ResourceDictionary>
     </UserControl.Resources>
     

Project.FLY.Weight2/FLY.Weight2.UI.Client/UiModule/DynAreaWeight.xaml

@@ -12,15 +12,6 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="pack://application:,,,/FLY.Weight2.UI.Client;component/Themes/UcWeighterItemStyle.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <Style TargetType="{x:Type Path}" x:Key="PathStyle_icon">
-                <Setter Property="Fill" Value="White"/>
-                <Setter Property="Stretch" Value="Uniform"/>
-                <Setter Property="Width" Value="30"/>
-                <Setter Property="Height" Value="30"/>
-                <Setter Property="SnapsToDevicePixels" Value="True"/>
-            </Style>
-
         </ResourceDictionary>
 
     </UserControl.Resources>

Project.FLY.Weight2/FLY.Weight2.UI.Server/WdDRList.xaml.cs

@@ -19,50 +19,6 @@ namespace FLY.Weight2.UI.Server
 {
     /// <summary>
     /// DRList.xaml 的交互逻辑
-    public class DataToRegsView : INotifyPropertyChanged
-    {
-        public DataToRegs dr;
-        /// <summary>
-        /// 对应 PLC寄存器区 coil or register
-        /// </summary>
-        public PLCAddressArea DataArea { get; set; }
-
-        /// <summary>
-        /// PLC 首地址
-        /// </summary>
-        public int Addr { get; set; }
-
-        /// <summary>
-        /// object 的 property 名称， 只能是 数字类型都是double， 剩下就是 bool
-        /// </summary>
-        public string PropertyName { get; set; }
-
-        /// <summary>
-        /// property 描述
-        /// </summary>
-        public string Description { get; set; }
-        /// <summary>
-        /// property 的值, 没有缩小. 只有 double 与 bool 
-        /// </summary>
-        public object Value { get; set; }
-
-        /// <summary>
-        /// 需要从PLC读取数据更新
-        /// </summary>
-        public bool IsNeedUpdate { get; set; }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            return PropertyName + " [" + ((int)DataArea).ToString() + "](" + Addr + ")";
-        }
-    }
     /// </summary>
     public partial class WdDRList : Window
     {
@@ -138,4 +94,48 @@ namespace FLY.Weight2.UI.Server
     /// Data: PC 属性 
     /// Regs: PLC 对象（寄存器、线圈）
     /// </summary>
+    public class DataToRegsView : INotifyPropertyChanged
+    {
+        public DataToRegs dr;
+        /// <summary>
+        /// 对应 PLC寄存器区 coil or register
+        /// </summary>
+        public PLCAddressArea DataArea { get; set; }
+
+        /// <summary>
+        /// PLC 首地址
+        /// </summary>
+        public int Addr { get; set; }
+
+        /// <summary>
+        /// object 的 property 名称， 只能是 数字类型都是double， 剩下就是 bool
+        /// </summary>
+        public string PropertyName { get; set; }
+
+        /// <summary>
+        /// property 描述
+        /// </summary>
+        public string Description { get; set; }
+        /// <summary>
+        /// property 的值, 没有缩小. 只有 double 与 bool 
+        /// </summary>
+        public object Value { get; set; }
+
+        /// <summary>
+        /// 需要从PLC读取数据更新
+        /// </summary>
+        public bool IsNeedUpdate { get; set; }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return PropertyName + " [" + ((int)DataArea).ToString() + "](" + Addr + ")";
+        }
+    }
 }

Project.FLY.Winder_20190413/FLY.Winder.UI.Client/UiModule/DynAreaWinder.xaml

@@ -22,14 +22,6 @@
             <sys:Double x:Key="FontSize_unit">12</sys:Double>
             
 
-            <Style TargetType="{x:Type Path}" x:Key="PathStyle_icon">
-                <Setter Property="Fill" Value="White"/>
-                <Setter Property="Stretch" Value="Uniform"/>
-                <Setter Property="Width" Value="30"/>
-                <Setter Property="Height" Value="30"/>
-                <Setter Property="SnapsToDevicePixels" Value="True"/>
-            </Style>
-
             <conv:IsGTMultiValueConverter x:Key="isgtconv"/>
             <conv:RatioConverter x:Key="ratioconv" />
         </ResourceDictionary>

thick_public @ dfc736b7

-Subproject commit 85d39bdfc3d7b84fee2e239de1139e63ac5ee0ef
+Subproject commit dfc736b7038eb4b280e0f590e76ed7a69722f197