diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index d251fb3..3ea6e42 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -132,6 +132,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Blower 的本地化字符串。
+ ///
+ public static string Blower {
+ get {
+ return ResourceManager.GetString("Blower", resourceCulture);
+ }
+ }
+
///
/// 查找类似 CallDistribution 的本地化字符串。
///
@@ -456,6 +465,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Nozzle 的本地化字符串。
+ ///
+ public static string Nozzle {
+ get {
+ return ResourceManager.GetString("Nozzle", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Number 的本地化字符串。
///
@@ -474,6 +492,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Overflow 的本地化字符串。
+ ///
+ public static string Overflow {
+ get {
+ return ResourceManager.GetString("Overflow", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Parameter 的本地化字符串。
///
@@ -564,6 +591,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Pump 的本地化字符串。
+ ///
+ public static string Pump {
+ get {
+ return ResourceManager.GetString("Pump", resourceCulture);
+ }
+ }
+
///
/// 查找类似 PumpDrainage 的本地化字符串。
///
@@ -825,6 +861,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Wiggle 的本地化字符串。
+ ///
+ public static string Wiggle {
+ get {
+ return ResourceManager.GetString("Wiggle", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Worklist 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index d3b4791..6b75575 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -381,4 +381,19 @@
Mixing
+
+ Blower
+
+
+ Pump
+
+
+ Nozzle
+
+
+ Wiggle
+
+
+ Overflow
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 121233b..4af415f 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -381,4 +381,19 @@
Type
+
+ Blower
+
+
+ Nozzle
+
+
+ Overflow
+
+
+ Pump
+
+
+ Wiggle
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index 806f5d7..85aaed8 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -381,4 +381,19 @@
曲线
+
+ 风机
+
+
+ 摆布
+
+
+ 喷嘴
+
+
+ 泵
+
+
+ 溢流
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index 0457c45..d5f0268 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -381,4 +381,19 @@
攪拌
+
+ 風機
+
+
+ 泵
+
+
+ 噴頭
+
+
+ 擺佈
+
+
+ 溢流
+
\ No newline at end of file
diff --git a/View/ProgramstepsView .xaml b/View/ProgramstepsView .xaml
index f91a026..2a63aee 100644
--- a/View/ProgramstepsView .xaml
+++ b/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">
diff --git a/View/ProgramstepsView .xaml.cs b/View/ProgramstepsView .xaml.cs
index 9105ec3..f009947 100644
--- a/View/ProgramstepsView .xaml.cs
+++ b/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(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(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();
diff --git a/Windows/ViewStep.xaml.cs b/Windows/ViewStep.xaml.cs
index 4490b56..d8ff356 100644
--- a/Windows/ViewStep.xaml.cs
+++ b/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
@@ -204,6 +206,23 @@ namespace DyeingComputer.Windows
P5N.Visibility = Visibility.Collapsed;
break;
case 4:
+ P1N.Text = Properties.Resources.Headwaters;
+ P2N.Text = Properties.Resources.WaterLevel;
+ P3N.Text = Properties.Resources.Time;
+ 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;
+ 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 5:
P1N.Text = Properties.Resources.Headwaters;
P2N.Text = Properties.Resources.WaterLevel;
P3N.Text = Properties.Resources.Time;
@@ -220,7 +239,7 @@ namespace DyeingComputer.Windows
P5.Visibility = Visibility.Visible;
P5N.Visibility = Visibility.Visible;
break;
- case 5:
+ case 6:
P1N.Text = Properties.Resources.Drainage;
P2N.Text = Properties.Resources.WaterLevel;
P1.Visibility = Visibility.Visible;
@@ -234,7 +253,7 @@ namespace DyeingComputer.Windows
P5.Visibility = Visibility.Collapsed;
P5N.Visibility = Visibility.Collapsed;
break;
- case 6:
+ case 7:
P1N.Text = Properties.Resources.Drainage;
P2N.Text = Properties.Resources.WaterLevel;
P1.Visibility = Visibility.Visible;
@@ -248,7 +267,7 @@ namespace DyeingComputer.Windows
P5.Visibility = Visibility.Collapsed;
P5N.Visibility = Visibility.Collapsed;
break;
- case 7:
+ case 8:
P1N.Text = Properties.Resources.Time;
P1.Visibility = Visibility.Visible;
P1N.Visibility = Visibility.Visible;
@@ -261,7 +280,7 @@ namespace DyeingComputer.Windows
P5.Visibility = Visibility.Collapsed;
P5N.Visibility = Visibility.Collapsed;
break;
- case 14:
+ case 15:
P1N.Text = Properties.Resources.Temperature;
P2N.Text = Properties.Resources.Pressure;
P1.Visibility = Visibility.Visible;
@@ -275,7 +294,7 @@ namespace DyeingComputer.Windows
P5.Visibility = Visibility.Collapsed;
P5N.Visibility = Visibility.Collapsed;
break;
- case 15:
+ case 16:
P1N.Text = Properties.Resources.Temperature;
P2N.Text = Properties.Resources.Pressure;
P1.Visibility = Visibility.Visible;
@@ -289,20 +308,24 @@ namespace DyeingComputer.Windows
P5.Visibility = Visibility.Collapsed;
P5N.Visibility = Visibility.Collapsed;
break;
- case 16:
+ 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.Collapsed;
- P2N.Visibility = Visibility.Collapsed;
- P3.Visibility = Visibility.Collapsed;
- P3N.Visibility = Visibility.Collapsed;
- P4.Visibility = Visibility.Collapsed;
- P4N.Visibility = Visibility.Collapsed;
- P5.Visibility = Visibility.Collapsed;
- P5N.Visibility = Visibility.Collapsed;
+ 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 19:
+ 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;