Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

Properties/Resources.Designer.cs

@@ -132,6 +132,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Blower 的本地化字符串。
+        /// </summary>
+        public static string Blower {
+            get {
+                return ResourceManager.GetString("Blower", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 CallDistribution 的本地化字符串。
         /// </summary>
@@ -456,6 +465,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Nozzle 的本地化字符串。
+        /// </summary>
+        public static string Nozzle {
+            get {
+                return ResourceManager.GetString("Nozzle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Number 的本地化字符串。
         /// </summary>
@@ -474,6 +492,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Overflow 的本地化字符串。
+        /// </summary>
+        public static string Overflow {
+            get {
+                return ResourceManager.GetString("Overflow", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Parameter 的本地化字符串。
         /// </summary>
@@ -564,6 +591,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Pump 的本地化字符串。
+        /// </summary>
+        public static string Pump {
+            get {
+                return ResourceManager.GetString("Pump", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 PumpDrainage 的本地化字符串。
         /// </summary>
@@ -825,6 +861,15 @@ namespace DyeingComputer.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Wiggle 的本地化字符串。
+        /// </summary>
+        public static string Wiggle {
+            get {
+                return ResourceManager.GetString("Wiggle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Worklist 的本地化字符串。
         /// </summary>

Properties/Resources.en-US.resx

@@ -381,4 +381,19 @@
   <data name="Mixing" xml:space="preserve">
     <value>Mixing</value>
   </data>
+  <data name="Blower" xml:space="preserve">
+    <value>Blower</value>
+  </data>
+  <data name="Pump" xml:space="preserve">
+    <value>Pump</value>
+  </data>
+  <data name="Nozzle" xml:space="preserve">
+    <value>Nozzle</value>
+  </data>
+  <data name="Wiggle" xml:space="preserve">
+    <value>Wiggle</value>
+  </data>
+  <data name="Overflow" xml:space="preserve">
+    <value>Overflow</value>
+  </data>
 </root>

Properties/Resources.resx

@@ -381,4 +381,19 @@
   <data name="Type" xml:space="preserve">
     <value>Type</value>
   </data>
+  <data name="Blower" xml:space="preserve">
+    <value>Blower</value>
+  </data>
+  <data name="Nozzle" xml:space="preserve">
+    <value>Nozzle</value>
+  </data>
+  <data name="Overflow" xml:space="preserve">
+    <value>Overflow</value>
+  </data>
+  <data name="Pump" xml:space="preserve">
+    <value>Pump</value>
+  </data>
+  <data name="Wiggle" xml:space="preserve">
+    <value>Wiggle</value>
+  </data>
 </root>

Properties/Resources.zh-CN.resx

@@ -381,4 +381,19 @@
   <data name="Curve" xml:space="preserve">
     <value>曲线</value>
   </data>
+  <data name="Blower" xml:space="preserve">
+    <value>风机</value>
+  </data>
+  <data name="Wiggle" xml:space="preserve">
+    <value>摆布</value>
+  </data>
+  <data name="Nozzle" xml:space="preserve">
+    <value>喷嘴</value>
+  </data>
+  <data name="Pump" xml:space="preserve">
+    <value>泵</value>
+  </data>
+  <data name="Overflow" xml:space="preserve">
+    <value>溢流</value>
+  </data>
 </root>

Properties/Resources.zh-TW.resx

@@ -381,4 +381,19 @@
   <data name="Mixing" xml:space="preserve">
     <value>攪拌</value>
   </data>
+  <data name="Blower" xml:space="preserve">
+    <value>風機</value>
+  </data>
+  <data name="Pump" xml:space="preserve">
+    <value>泵</value>
+  </data>
+  <data name="Nozzle" xml:space="preserve">
+    <value>噴頭</value>
+  </data>
+  <data name="Wiggle" xml:space="preserve">
+    <value>擺佈</value>
+  </data>
+  <data name="Overflow" xml:space="preserve">
+    <value>溢流</value>
+  </data>
 </root>

View/ProgramstepsView .xaml

@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:DyeingComputer.View"
              xmlns:lang="clr-namespace:DyeingComputer.Properties" 
              xmlns:ConvertMoels="clr-namespace:DyeingComputer.ConvertMoels"
-             mc:Ignorable="d" 
+             mc:Ignorable="d" Loaded="UserControl_Loaded"
             d:DesignHeight="630" d:DesignWidth="1280" HorizontalAlignment="Left">
     <UserControl.Resources>
         <ConvertMoels:RowToIndexConverter x:Key="RowToIndexConverter"/>

View/ProgramstepsView .xaml.cs

@@ -15,6 +15,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
@@ -97,6 +98,31 @@ namespace DyeingComputer.View
             }
         }
 
+        private void UserControl_Loaded(object sender, RoutedEventArgs e)//打开页面时的操作
+        {
+            if (ID == null) ID = sql.Tables[0].Rows.Count.ToString();
+            Grid.SelectedIndex = StrToInt.To16Convert10(ID)-1;
+        }
+        public static T GetVisualChild<T>(Visual parent) where T : Visual
+        {
+            T child = default(T);
+            int numVisuals = VisualTreeHelper.GetChildrenCount(parent);
+            for (int i = 0; i < numVisuals; i++)
+            {
+                Visual v = (Visual)VisualTreeHelper.GetChild(parent, i);
+                child = v as T;
+                if (child == null)
+                {
+                    child = GetVisualChild<T>(v);
+                }
+                if (child != null)
+                {
+                    break;
+                }
+            }
+            return child;
+        }
+
         private void ProgramgroupView_edit_Click(object sender, RoutedEventArgs e)//编辑
         {
             if(ID == null) ID = sql.Tables[0].Rows.Count.ToString();

Windows/ViewStep.xaml.cs

@@ -59,8 +59,8 @@ namespace DyeingComputer.Windows
             e.Handled = !re.IsMatch(e.Text);
         }
 
-        private readonly string[] a = {"001","007","008","013","017", "020", "022", "031", "035", "036", "039", "040", "041", "049", "050",
-                "051", "054", "056","064","065","066","067","090","091","093","094" };
+        private readonly string[] a = {"001","007","008","013","015" ,"017", "020", "022", "031", "035", "036", "039", "040", "041", "049", "050",
+                "051", "054", "055", "056","064","065","066","067","090","091","093","094" };
 
         private void Form1_Load()
         {
@@ -68,6 +68,7 @@ namespace DyeingComputer.Windows
             this.boxID.Items.Add(Properties.Resources.AddWater + "(" + Properties.Resources.WaterLevel + ")");//水位进水007
             this.boxID.Items.Add(Properties.Resources.AddWater + "(" + Properties.Resources.Flowmeter + ")");//流量进水008
             this.boxID.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.WaterLevel + ")");//水位水洗013
+            this.boxID.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.Overflow + ")");//溢流水洗015
             this.boxID.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.Cooling + ")");//降温水洗017
             this.boxID.Items.Add(Properties.Resources.Drainage);//排水020
             this.boxID.Items.Add(Properties.Resources.PumpDrainage);//主泵排水022
@@ -80,7 +81,8 @@ namespace DyeingComputer.Windows
             this.boxID.Items.Add(Properties.Resources.Await);//等待049
             this.boxID.Items.Add(Properties.Resources.Pressurized);//加压050
             this.boxID.Items.Add(Properties.Resources.Depressurized);//减压051
-            this.boxID.Items.Add(Properties.Resources.PumpStart);//泵速度054
+            this.boxID.Items.Add(Properties.Resources.Pump + "/"+Properties.Resources.Blower);//泵风机速度054
+            this.boxID.Items.Add(Properties.Resources.PumpStart);//泵启动055
             this.boxID.Items.Add(Properties.Resources.PumpStops);//泵停止056
             this.boxID.Items.Add(Properties.Resources.PrepareMedications);//备药064
             this.boxID.Items.Add(Properties.Resources.AddTheMedicine);//加药065
@@ -207,8 +209,8 @@ namespace DyeingComputer.Windows
                     P1N.Text = Properties.Resources.Headwaters;
                     P2N.Text = Properties.Resources.WaterLevel;
                     P3N.Text = Properties.Resources.Time;
-                    P4N.Text = Properties.Resources.Target + Properties.Resources.Temperature;
-                    P5N.Text = Properties.Resources.Rate;
+                    P4N.Text = Properties.Resources.Flowmeter;
+                    P5N.Text = Properties.Resources.Target + Properties.Resources.Temperature;
                     P1.Visibility = Visibility.Visible;
                     P1N.Visibility = Visibility.Visible;
                     P2.Visibility = Visibility.Visible;
@@ -221,18 +223,21 @@ namespace DyeingComputer.Windows
                     P5N.Visibility = Visibility.Visible;
                     break;
                 case 5:
-                    P1N.Text = Properties.Resources.Drainage;
+                    P1N.Text = Properties.Resources.Headwaters;
                     P2N.Text = Properties.Resources.WaterLevel;
+                    P3N.Text = Properties.Resources.Time;
+                    P4N.Text = Properties.Resources.Target + Properties.Resources.Temperature;
+                    P5N.Text = Properties.Resources.Rate;
                     P1.Visibility = Visibility.Visible;
                     P1N.Visibility = Visibility.Visible;
                     P2.Visibility = Visibility.Visible;
                     P2N.Visibility = Visibility.Visible;
-                    P3.Visibility = Visibility.Collapsed;
-                    P3N.Visibility = Visibility.Collapsed;
-                    P4.Visibility = Visibility.Collapsed;
-                    P4N.Visibility = Visibility.Collapsed;
-                    P5.Visibility = Visibility.Collapsed;
-                    P5N.Visibility = Visibility.Collapsed;
+                    P3.Visibility = Visibility.Visible;
+                    P3N.Visibility = Visibility.Visible;
+                    P4.Visibility = Visibility.Visible;
+                    P4N.Visibility = Visibility.Visible;
+                    P5.Visibility = Visibility.Visible;
+                    P5N.Visibility = Visibility.Visible;
                     break;
                 case 6:
                     P1N.Text = Properties.Resources.Drainage;
@@ -249,11 +254,12 @@ namespace DyeingComputer.Windows
                     P5N.Visibility = Visibility.Collapsed;
                     break;
                 case 7:
-                    P1N.Text = Properties.Resources.Time;
+                    P1N.Text = Properties.Resources.Drainage;
+                    P2N.Text = Properties.Resources.WaterLevel;
                     P1.Visibility = Visibility.Visible;
                     P1N.Visibility = Visibility.Visible;
-                    P2.Visibility = Visibility.Collapsed;
-                    P2N.Visibility = Visibility.Collapsed;
+                    P2.Visibility = Visibility.Visible;
+                    P2N.Visibility = Visibility.Visible;
                     P3.Visibility = Visibility.Collapsed;
                     P3N.Visibility = Visibility.Collapsed;
                     P4.Visibility = Visibility.Collapsed;
@@ -261,13 +267,12 @@ namespace DyeingComputer.Windows
                     P5.Visibility = Visibility.Collapsed;
                     P5N.Visibility = Visibility.Collapsed;
                     break;
-                case 14:
-                    P1N.Text = Properties.Resources.Temperature;
-                    P2N.Text = Properties.Resources.Pressure;
+                case 8:
+                    P1N.Text = Properties.Resources.Time;
                     P1.Visibility = Visibility.Visible;
                     P1N.Visibility = Visibility.Visible;
-                    P2.Visibility = Visibility.Visible;
-                    P2N.Visibility = Visibility.Visible;
+                    P2.Visibility = Visibility.Collapsed;
+                    P2N.Visibility = Visibility.Collapsed;
                     P3.Visibility = Visibility.Collapsed;
                     P3N.Visibility = Visibility.Collapsed;
                     P4.Visibility = Visibility.Collapsed;
@@ -290,11 +295,12 @@ namespace DyeingComputer.Windows
                     P5N.Visibility = Visibility.Collapsed;
                     break;
                 case 16:
-                    P1N.Text = Properties.Resources.PumpSpeed;
+                    P1N.Text = Properties.Resources.Temperature;
+                    P2N.Text = Properties.Resources.Pressure;
                     P1.Visibility = Visibility.Visible;
                     P1N.Visibility = Visibility.Visible;
-                    P2.Visibility = Visibility.Collapsed;
-                    P2N.Visibility = Visibility.Collapsed;
+                    P2.Visibility = Visibility.Visible;
+                    P2N.Visibility = Visibility.Visible;
                     P3.Visibility = Visibility.Collapsed;
                     P3N.Visibility = Visibility.Collapsed;
                     P4.Visibility = Visibility.Collapsed;
@@ -302,7 +308,24 @@ namespace DyeingComputer.Windows
                     P5.Visibility = Visibility.Collapsed;
                     P5N.Visibility = Visibility.Collapsed;
                     break;
-                case 19:
+                case 17:
+                    P1N.Text = Properties.Resources.PumpSpeed;
+                    P2N.Text = Properties.Resources.Blower;
+                    P3N.Text = Properties.Resources.Pressure;
+                    P4N.Text = Properties.Resources.Nozzle;
+                    P5N.Text = Properties.Resources.Wiggle;
+                    P1.Visibility = Visibility.Visible;
+                    P1N.Visibility = Visibility.Visible;
+                    P2.Visibility = Visibility.Visible;
+                    P2N.Visibility = Visibility.Visible;
+                    P3.Visibility = Visibility.Visible;
+                    P3N.Visibility = Visibility.Visible;
+                    P4.Visibility = Visibility.Visible;
+                    P4N.Visibility = Visibility.Visible;
+                    P5.Visibility = Visibility.Visible;
+                    P5N.Visibility = Visibility.Visible;
+                    break;
+                case 20:
                     P1N.Text = Properties.Resources.Medicine + Properties.Resources.Tank;
                     P2N.Text = Properties.Resources.Headwaters;
                     P3N.Text = Properties.Resources.WaterLevel;
@@ -319,7 +342,7 @@ namespace DyeingComputer.Windows
                     P5.Visibility = Visibility.Visible;
                     P5N.Visibility = Visibility.Visible;
                     break;
-                case 20:
+                case 21:
                     P1N.Text = Properties.Resources.Medicine + Properties.Resources.Tank;
                     P2N.Text = Properties.Resources.Curve;
                     P3N.Text =  Properties.Resources.Time;
@@ -334,7 +357,7 @@ namespace DyeingComputer.Windows
                     P5.Visibility = Visibility.Collapsed;
                     P5N.Visibility = Visibility.Collapsed;
                     break; 
-                case 21:
+                case 22:
                     P1N.Text = Properties.Resources.Medicine + Properties.Resources.Tank;
                     P2N.Text = Properties.Resources.Type;
                     P3N.Text = Properties.Resources.Step;
@@ -350,7 +373,7 @@ namespace DyeingComputer.Windows
                     P5.Visibility = Visibility.Collapsed;
                     P5N.Visibility = Visibility.Collapsed;
                     break;                        
-                case 22:
+                case 23:
                     P1N.Text = Properties.Resources.Medicine + Properties.Resources.Tank;
                     P2N.Text = Properties.Resources.Type;
                     P3N.Text = Properties.Resources.Flowmeter;
@@ -365,7 +388,7 @@ namespace DyeingComputer.Windows
                     P5.Visibility = Visibility.Collapsed;
                     P5N.Visibility = Visibility.Collapsed;
                     break;
-                case 23:
+                case 24:
                     P1N.Text = Properties.Resources.Target + Properties.Resources.Temperature;
                     P2N.Text = "PH";
                     P1.Visibility = Visibility.Visible;
@@ -379,7 +402,7 @@ namespace DyeingComputer.Windows
                     P5.Visibility = Visibility.Collapsed;
                     P5N.Visibility = Visibility.Collapsed;
                     break;
-                case 24:
+                case 25:
                     P1N.Text = Properties.Resources.Target + Properties.Resources.Temperature;
                     P2N.Text = Properties.Resources.Rate;
                     P3N.Text = "PH";
@@ -394,7 +417,7 @@ namespace DyeingComputer.Windows
                     P5.Visibility = Visibility.Collapsed;
                     P5N.Visibility = Visibility.Collapsed;
                     break;
-                case 25:
+                case 26:
                     P1N.Text = Properties.Resources.Time;
                     P1.Visibility = Visibility.Visible;
                     P1N.Visibility = Visibility.Visible;
@@ -407,7 +430,7 @@ namespace DyeingComputer.Windows
                     P5.Visibility = Visibility.Collapsed;
                     P5N.Visibility = Visibility.Collapsed;
                     break;
-                case 26:
+                case 27:
                     P1N.Text = Properties.Resources.Beginning+ Properties.Resources.Temperature;
                     P2N.Text = "PH";
                     P1.Visibility = Visibility.Visible;