完成主界面

Project.FLY.IntegratedControl/FLY.IntegratedControl.UI.Client/UIModule/Page_Main.xaml.cs

@@ -82,6 +82,11 @@ namespace FLY.IntegratedControl.UI.Client.UIModule
             w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
             w.ShowDialog();
         }
+
+        private void button_ExCool_plus_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
     public class ToggleButtonText
     {

Project.FLY.IntegratedControl/FLY.IntegratedControl.UI.Client/UnitTests/UnitTests_ibc.xaml

 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:FLY.IntegratedControl.UI.Client.UnitTests"
-                    xmlns:ibc_common="clr-namespace:FLY.IntegratedControl.Common;assembly=FLY.IntegratedControl">
-    <ibc_common:ICData x:Key="unitests_ibc"
+                    xmlns:ic_common="clr-namespace:FLY.IntegratedControl.Common;assembly=FLY.IntegratedControl">
+    <ic_common:ICData x:Key="unitests_ic"
                     IsIBCAuto = "True"
                     IsOutletAirOn="True"
                         
@@ -12,7 +12,7 @@
                     InletAirFreq="30.1"
                     OutletAirFreq="29"    
                         
-                        InletAirFreqSet="30"
+                      InletAirFreqSet="30"
                     OutletAirFreqSet="28"
                         
                     BubbleCorrR="1234"

Project.FLY.IntegratedControl/FLY.IntegratedControl/Common/ICData.cs

@@ -85,12 +85,12 @@ namespace FLY.IntegratedControl.Common
         /// <summary>
         /// 外冷运行频率(Hz)
         /// </summary>
-        public float IsExCoolFreq { get; set; }
+        public float ExCoolFreq { get; set; }
 
         /// <summary>
         /// 外冷设定频率(Hz)
         /// </summary>
-        public float IsExCoolFreqSet { get; set; }
+        public float ExCoolFreqSet { get; set; }
 
         /// <summary>
         /// K1
@@ -203,9 +203,9 @@ namespace FLY.IntegratedControl.Common
         public float TractionVRatio { get; set; }
 
         /// <summary>
-        /// 牵引速度
+        /// 牵引速度(内部）
         /// </summary>
-        public float TractionVelocity { get; set; }
+        public float TractionVelocityInner { get; set; }
 
         /// <summary>
         /// 区间2设置
@@ -283,14 +283,14 @@ namespace FLY.IntegratedControl.Common
         public float RotationDefaultFreq { get; set; }
 
         /// <summary>
-        /// 螺杆速度
+        /// 牵引速度
         /// </summary>
-        public float ScrewVelocity { get; set; }
+        public float TractionVelocity { get; set; }
 
         /// <summary>
-        /// 螺杆速度设置
+        /// 牵引速度设置
         /// </summary>
-        public float ScrewVelocitySet { get; set; }
+        public float TractionVelocitySet { get; set; }
 
         /// <summary>
         /// 主牵引运行指示

Resource/IBC&收卷(hmi7-20190713)/设备连接变量表/Generated/IBCData.cs → Resource/IBC&收卷(hmi7-20190713)/设备连接变量表/Generated/ICData.cs

@@ -5,14 +5,14 @@ using System.Text;
 using System.ComponentModel;
 using System.Reflection;
 using System.Diagnostics;
-using System.Windows.Media;
 
 
-namespace FLY.IBC.Common
+
+namespace FLY.IntegratedControl.Common
 {
-    public class IBCData:INotifyPropertyChanged
+    public class ICData : INotifyPropertyChanged
     {
-        public IBCData()
+        public ICData()
         {
         }
 
@@ -203,9 +203,9 @@ namespace FLY.IBC.Common
         public float TractionVRatio { get; set; }
 
         /// <summary>
-        /// 牵引速度
+        /// 牵引速度(内部）
         /// </summary>
-        public float TractionVelocity { get; set; }
+        public float TractionVelocityInner { get; set; }
 
         /// <summary>
         /// 区间2设置
@@ -283,14 +283,14 @@ namespace FLY.IBC.Common
         public float RotationDefaultFreq { get; set; }
 
         /// <summary>
-        /// 螺杆速度
+        /// 牵引速度
         /// </summary>
-        public float ScrewVelocity { get; set; }
+        public float TractionVelocity { get; set; }
 
         /// <summary>
-        /// 螺杆速度设置
+        /// 牵引速度设置
         /// </summary>
-        public float ScrewVelocitySet { get; set; }
+        public float TractionVelocitySet { get; set; }
 
         /// <summary>
         /// 主牵引运行指示

Resource/IBC&收卷(hmi7-20190713)/设备连接变量表/Generated/WS.xml

@@ -41,7 +41,7 @@
     <PLCVariable DeviceIndex="0" Mode="4" Addr="3502" Type="float" Scale="1" OwnerName="Item" PropertyName="VelocityFactor" />
     <PLCVariable DeviceIndex="0" Mode="4" Addr="3504" Type="float" Scale="1" OwnerName="Item" PropertyName="TractionDiameter" />
     <PLCVariable DeviceIndex="0" Mode="4" Addr="3506" Type="float" Scale="1" OwnerName="Item" PropertyName="TractionVRatio" />
-    <PLCVariable DeviceIndex="0" Mode="4" Addr="3524" Type="uint16" Scale="1" OwnerName="Item" PropertyName="TractionVelocity" />
+    <PLCVariable DeviceIndex="0" Mode="4" Addr="3524" Type="uint16" Scale="1" OwnerName="Item" PropertyName="TractionVelocityInner" />
     <PLCVariable DeviceIndex="0" Mode="4" Addr="306" Type="uint16" Scale="1" OwnerName="Item" PropertyName="Area2Set" />
     <PLCVariable DeviceIndex="0" Mode="4" Addr="1201" Type="uint16" Scale="1" OwnerName="Item" PropertyName="Area2P" />
     <PLCVariable DeviceIndex="0" Mode="4" Addr="1202" Type="uint16" Scale="1" OwnerName="Item" PropertyName="Area2I" />
@@ -57,8 +57,8 @@
     <PLCVariable DeviceIndex="0" Mode="4" Addr="5010" Type="uint16" Scale="0.1" OwnerName="Item" PropertyName="InletAirDefaultFreq" />
     <PLCVariable DeviceIndex="0" Mode="4" Addr="3580" Type="uint16" Scale="0.1" OwnerName="Item" PropertyName="TractionDefaultFreq" />
     <PLCVariable DeviceIndex="0" Mode="4" Addr="5104" Type="uint16" Scale="0.1" OwnerName="Item" PropertyName="RotationDefaultFreq" />
-    <PLCVariable DeviceIndex="0" Mode="4" Addr="3542" Type="float" Scale="1" OwnerName="Item" PropertyName="ScrewVelocity" />
-    <PLCVariable DeviceIndex="0" Mode="4" Addr="3500" Type="float" Scale="1" OwnerName="Item" PropertyName="ScrewVelocitySet" />
+    <PLCVariable DeviceIndex="0" Mode="4" Addr="3542" Type="float" Scale="1" OwnerName="Item" PropertyName="TractionVelocity" />
+    <PLCVariable DeviceIndex="0" Mode="4" Addr="3500" Type="float" Scale="1" OwnerName="Item" PropertyName="TractionVelocitySet" />
     <PLCVariable DeviceIndex="0" Mode="0" Addr="177" Type="bool" Scale="1" OwnerName="Item" PropertyName="IsTractionOn" />
     <PLCVariable DeviceIndex="0" Mode="0" Addr="176" Type="bool" Scale="1" OwnerName="Item" PropertyName="TractionOn" />
     <PLCVariable DeviceIndex="0" Mode="0" Addr="64517" Type="bool" Scale="1" OwnerName="Item" PropertyName="IsAirCushionOn" />

Resource/称重/设备连接变量表_341_v2/CHANGELOG.txt

+v2.0.0-20190706
+1. 趨Ƶʸı D2308(uint16,0.1) ->D1700(float)
\ No newline at end of file

Resource/称重/设备连接变量表_341_v2/Generated/WeighterAccessory.cs

+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+
+namespace FLY.Weight.Common
+{
+    public class WeighterAccessory:INotifyPropertyChanged
+    {
+        #region 辅助代码生成
+        /// <summary>
+        /// 总流量设定
+        /// </summary>
+        public float TotalFlowSetting { get; set; }
+
+        /// <summary>
+        /// 总流量显示
+        /// </summary>
+        public float TotalFlow { get; set; }
+
+        /// <summary>
+        /// 总产量
+        /// </summary>
+        public float TotalProduction { get; set; }
+
+        /// <summary>
+        /// 码轮周长mm
+        /// </summary>
+        public float WheelPerimeter { get; set; }
+
+        /// <summary>
+        /// 码轮脉冲
+        /// </summary>
+        public float WheelPulse { get; set; }
+
+        /// <summary>
+        /// 平均密度
+        /// </summary>
+        public float Density { get; set; }
+
+        /// <summary>
+        /// 边料不回收
+        /// </summary>
+        public bool IsRimNoRecycle { get; set; }
+
+        /// <summary>
+        /// 边料kg/h
+        /// </summary>
+        public float RimCharge { get; set; }
+
+        /// <summary>
+        /// 厚度um
+        /// </summary>
+        public float Thickness { get; set; }
+
+        /// <summary>
+        /// 当前线速度m/min
+        /// </summary>
+        public float CurrentVelocity { get; set; }
+
+        /// <summary>
+        /// 当前线速度设置m/min
+        /// </summary>
+        public float CurrentVelocitySet { get; set; }
+
+        /// <summary>
+        /// 吹膜宽度mm
+        /// </summary>
+        public float TotalFilmWidth { get; set; }
+
+        /// <summary>
+        /// 切边mm
+        /// </summary>
+        public float RimWidth { get; set; }
+
+        /// <summary>
+        /// 收卷宽度mm
+        /// </summary>
+        public float ActFilmWidth { get; set; }
+
+        /// <summary>
+        /// 设定厚度um
+        /// </summary>
+        public float SetThickness { get; set; }
+
+        /// <summary>
+        /// 理论速度m/min
+        /// </summary>
+        public float TargetVelocity { get; set; }
+
+        /// <summary>
+        /// 内收卷当前m
+        /// </summary>
+        public float ACurrentLen { get; set; }
+
+        /// <summary>
+        /// 内收卷当前kg
+        /// </summary>
+        public float ACurrent { get; set; }
+
+        /// <summary>
+        /// 内收卷上卷kg
+        /// </summary>
+        public float ALast { get; set; }
+
+        /// <summary>
+        /// 外收卷当前m
+        /// </summary>
+        public float BCurrentLen { get; set; }
+
+        /// <summary>
+        /// 外收卷当前kg
+        /// </summary>
+        public float BCurrent { get; set; }
+
+        /// <summary>
+        /// 外收卷上卷kg
+        /// </summary>
+        public float BLast { get; set; }
+
+        /// <summary>
+        /// 内收卷清零
+        /// </summary>
+        public bool AClear { get; set; }
+
+        /// <summary>
+        /// 外收卷清零
+        /// </summary>
+        public bool BClear { get; set; }
+
+        #endregion
+        public event PropertyChangedEventHandler PropertyChanged;
+    }
+}

Resource/称重/设备连接变量表_341_v2/Generated/cp_ws.ps1

+$root_path = $PSScriptRoot
+$src_path = $root_path + "\WS.xml"
+$dest_dir = $root_path + "\..\..\..\..\Project.FLY.Weight\FLY.Weight.UI.Server\bin\Debug\Gage1"
+$dest_path = $dest_dir + "\WS.xml"
+if(-not (Test-Path $dest_dir))
+{
+    echo  $dest_dir
+    mkdir $dest_dir
+}
+
+echo  WS.xml
+cp $src_path $dest_path
+
+echo Ƴɹ 
+pause
\ No newline at end of file

Resource/称重/设备连接变量表_341_v2/Generated/cp_ws_local_test.ps1

+$root_path = $PSScriptRoot
+$src_path = $root_path + "\WS_local_test.xml"
+$dest_dir = $root_path + "\..\..\..\..\Project.FLY.Weight\FLY.Weight.UI.Server\bin\Debug\Gage1"
+$dest_path = $dest_dir + "\WS.xml"
+if(-not (Test-Path $dest_dir))
+{
+    echo  $dest_dir
+    mkdir $dest_dir
+}
+
+echo  WS.xml
+cp $src_path $dest_path
+
+echo Ƴɹ 
+pause
\ No newline at end of file

thick_public/Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/MaterialDesignIcons.xaml

@@ -272,4 +272,29 @@
     <Geometry x:Key="Geometry_ruler">
         M703.3856 34.440533l289.621333 289.621334a34.133333 34.133333 0 0 1 0 48.264533L365.4656 999.867733a34.133333 34.133333 0 0 1-48.264533 0L27.579733 710.2464a34.133333 34.133333 0 0 1 0-48.298667L655.086933 34.474667a34.133333 34.133333 0 0 1 48.298667 0zM606.8224 179.2l-48.264533 48.264533 96.529066 96.5632 48.298667-48.264533-96.5632-96.5632z m-193.092267 193.092267l-48.264533 48.264533 96.5632 96.5632 48.264533-48.264533-96.5632-96.5632z m-193.092266 193.092266L172.373333 613.6832l96.5632 96.5632 48.264534-48.298667-96.5632-96.529066zM510.293333 275.797333l-48.264533 48.264534 193.058133 193.092266 48.298667-48.264533L510.293333 275.797333z m-193.092266 193.092267L268.936533 517.12l193.092267 193.092267 48.264533-48.298667-193.092266-193.058133z
     </Geometry>
+
+
+    <Geometry x:Key="Geometry_origin">
+        M512 150.016A361.984 361.984 0 1 1 150.016 512 362.496 362.496 0 0 1 512 150.016M512 0a512 512 0 1 0 512 512A512 512 0 0 0 512 0z
+            M512 512m-229.376 0a229.376 229.376 0 1 0 458.752 0 229.376 229.376 0 1 0-458.752 0Z
+    </Geometry>
+
+    <Geometry x:Key="Geometry_ring">
+        M512 150.016A361.984 361.984 0 1 1 150.016 512 362.496 362.496 0 0 1 512 150.016M512 0a512 512 0 1 0 512 512A512 512 0 0 0 512 0z
+    </Geometry>
+    <Geometry x:Key="Geometry_return">
+        M945.8 189.1l-61.6 47C800.2 131.3 669.5 64 522.8 64 269.4 64 64.3 264 64 511.5 63.7 759.1 269.2 960 522.8 960c198.1 0 366.9-122.7 431.1-294.5 1.6-4.5-0.8-9.5-5.4-11l-61.9-20.8c-4.5-1.5-9.4 0.7-11 5.1-2 5.3-4.2 10.7-6.4 15.9-18.9 43.7-46 83-80.5 116.7s-74.7 60.2-119.4 78.7c-46.2 19.1-95.5 28.8-146.2 28.8-50.8 0-100-9.7-146.2-28.8-44.7-18.5-84.9-44.9-119.4-78.7-34.5-33.7-61.6-73-80.5-116.7-19.6-45.2-29.5-93.2-29.5-142.8 0-49.6 9.9-97.6 29.5-142.8 18.9-43.7 46-83 80.5-116.7s74.7-60.2 119.4-78.7c46.2-19.1 95.5-28.8 146.2-28.8 50.8 0 100 9.7 146.2 28.8 44.7 18.5 84.9 44.9 119.4 78.7 10.8 10.6 21 21.8 30.4 33.5L753.2 336c-5.8 4.4-3.8 13.3 3.3 15l191.9 45.9c5.5 1.3 10.8-2.8 10.8-8.2l0.9-193c-0.2-7-8.6-11-14.3-6.6z m0 0
+    </Geometry>
+    <Geometry x:Key="Geometry_offset">
+        M1020.416 456.704h-73.728c-4.096 0-6.144-1.024-6.144-5.632v-237.056c0-4.608 1.536-5.632 6.144-5.632h73.728v248.32zM2.048 565.76h73.728c4.096 0 6.144 1.024 6.144 5.632v237.056c0 4.608-1.536 5.632-6.144 5.632h-73.728v-248.32zM622.592 114.176c16.896 13.824 32.768 27.136 48.128 39.936 13.824 11.264 27.648 23.04 41.472 34.304l43.008 35.328c13.824 11.264 27.648 23.04 41.472 34.304 14.336 11.776 28.672 24.064 43.008 35.84 14.336 11.776 28.16 23.552 42.496 34.816 6.144 4.608 6.144 4.608 0.512 9.216-28.16 23.04-56.32 46.592-84.48 69.632-26.112 21.504-52.224 43.52-78.848 65.024-26.112 21.504-52.224 43.52-78.848 65.024-5.12 4.096-10.24 8.704-15.36 12.8-1.024 0.512-1.536 2.048-2.56 1.024-0.512-0.512-0.512-1.536-0.512-2.56v-4.096-126.464c0-9.728 1.024-8.704-8.192-8.704h-531.456c-9.216 0-8.192 1.024-8.192-8.192v-137.216c0-5.632 1.536-7.168 7.168-7.168H614.4c7.68 0 7.68 0 7.68-7.68v-127.488c0.512-2.048 0.512-4.096 0.512-7.68z
+            M401.92 468.48v134.656c0 5.632 1.536 7.168 7.168 7.168h529.92c7.68 0 7.68 0 7.68 7.68v136.704c0 9.216 1.024 8.192-8.192 8.192H409.6c-7.68 0-7.68 0-7.68 8.192V906.24c-8.192-5.12-14.336-11.264-20.992-16.896l-44.544-36.864c-14.336-12.288-29.184-24.064-43.52-36.352-14.848-12.288-29.184-24.064-44.032-36.352l-36.864-30.72c-14.336-11.776-28.672-24.064-43.008-35.84-9.728-8.192-19.456-15.872-28.672-23.552-2.048-2.048-1.536-3.072 0-4.608 12.288-10.24 24.064-19.968 36.352-30.208 14.336-12.288 29.184-24.064 43.52-36.352 16.384-13.824 33.28-27.648 49.664-41.472 12.288-10.24 25.088-20.48 37.376-31.232 14.336-11.776 28.672-24.064 43.008-35.84 14.848-12.8 30.208-25.088 45.056-37.888 1.536-1.024 3.584-2.56 6.656-3.584z
+    </Geometry>
+    <Geometry x:Key="Geometry_cut">
+        M149.6064 668.0576h276.48v-307.2h-276.48v307.2z m221.7984-254.8736v202.5472H204.1856V413.184h167.2192zM597.9136 360.8576v307.2h276.48v-307.2h-276.48z m54.6816 254.8736V413.184h167.2192v202.5472H652.5952zM576.512 179.5072c0-35.5328-28.9792-64.512-64.512-64.512s-64.512 28.9792-64.512 64.512c0 24.4736 13.7216 45.8752 33.8944 56.7296v547.9424c-20.1728 10.9568-33.8944 32.256-33.8944 56.7296 0 35.5328 28.9792 64.512 64.512 64.512s64.512-28.9792 64.512-64.512c0-24.4736-13.7216-45.8752-33.8944-56.7296V236.2368c20.1728-10.9568 33.8944-32.256 33.8944-56.7296z
+    </Geometry>
+
+    <Geometry x:Key="Geometry_light">
+        M510.707071 140.282828C343.973495 140.282828 208.808081 275.448242 208.808081 442.181818c0 166.734869 135.165414 301.89899 301.89899 301.89899 166.734869 0 301.89899-135.164121 301.89899-301.89899 0-166.733576-135.164121-301.89899-301.89899-301.89899z 
+        m217.056969 314.181818c-18.531556 0-34.417778-15.896566-34.417777-31.79701 0-50.344081-18.531556-90.096485-55.59596-121.890909-37.064404-31.800889-76.774141-47.696162-119.135677-47.696161-21.178182 0-34.412606-13.252525-34.412606-34.450101 0-18.548364 13.234424-31.802182 34.412606-31.802182 63.539717 0 119.135677 21.202747 169.439677 63.597899 50.298828 42.397737 74.127515 100.693333 74.127515 172.240161 0 15.901737-13.239596 31.798303-34.417778 31.798303z
+    </Geometry>
 </ResourceDictionary>
\ No newline at end of file