diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 19cf644..ab9c1e4 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -294,6 +294,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Headwaters 的本地化字符串。
+ ///
+ public static string Headwaters {
+ get {
+ return ResourceManager.GetString("Headwaters", resourceCulture);
+ }
+ }
+
///
/// 查找类似 History 的本地化字符串。
///
@@ -393,6 +402,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Number 的本地化字符串。
+ ///
+ public static string Number {
+ get {
+ return ResourceManager.GetString("Number", resourceCulture);
+ }
+ }
+
///
/// 查找类似 OutTheCloth 的本地化字符串。
///
@@ -447,6 +465,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Pressure 的本地化字符串。
+ ///
+ public static string Pressure {
+ get {
+ return ResourceManager.GetString("Pressure", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Pressurized 的本地化字符串。
///
@@ -537,6 +564,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Rate 的本地化字符串。
+ ///
+ public static string Rate {
+ get {
+ return ResourceManager.GetString("Rate", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Ready 的本地化字符串。
///
@@ -654,6 +690,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Target 的本地化字符串。
+ ///
+ public static string Target {
+ get {
+ return ResourceManager.GetString("Target", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Process 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index e3083a8..23e7405 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -342,4 +342,19 @@
YES
+
+ Rate
+
+
+ Target
+
+
+ Headwaters
+
+
+ Number
+
+
+ Pressure
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 2f4a7d8..36b27e6 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -342,4 +342,19 @@
YES
+
+ Headwaters
+
+
+ Number
+
+
+ Pressure
+
+
+ Rate
+
+
+ Target
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index 5f9e32f..1cbaa8a 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -342,4 +342,19 @@
是
+
+ 速率
+
+
+ 目标
+
+
+ 水源
+
+
+ 次数
+
+
+ 压力
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index 70f2405..2acc341 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -342,4 +342,19 @@
是
+
+ 速率
+
+
+ 目標
+
+
+ 來源
+
+
+ 次數
+
+
+ 壓力
+
\ No newline at end of file
diff --git a/View/ProgramstepsView .xaml.cs b/View/ProgramstepsView .xaml.cs
index 9e07ac6..d649f1b 100644
--- a/View/ProgramstepsView .xaml.cs
+++ b/View/ProgramstepsView .xaml.cs
@@ -176,20 +176,20 @@ namespace DyeingComputer.View
public struct Date
{
- public string Step;
- public string StepID;
- public string StepNAME;
- public string PNAME;
- public string P1;
- public string P2;
- public string P3;
- public string P4;
- public string P5;
- public string P6;
- public string P7;
- public string P8;
- public string P9;
- public string P10;
+ public string Step { get; set; }
+ public string StepID { get; set; }
+ public string StepNAME { get; set; }
+ public string PNAME { get; set; }
+ public string P1 { get; set; }
+ public string P2 { get; set; }
+ public string P3 { get; set; }
+ public string P4 { get; set; }
+ public string P5 { get; set; }
+ public string P6 { get; set; }
+ public string P7 { get; set; }
+ public string P8 { get; set; }
+ public string P9 { get; set; }
+ public string P10 { get; set; }
}
diff --git a/Windows/ViewStep.xaml.cs b/Windows/ViewStep.xaml.cs
index 157fad1..d4fbc85 100644
--- a/Windows/ViewStep.xaml.cs
+++ b/Windows/ViewStep.xaml.cs
@@ -1,4 +1,5 @@
using DyeingComputer.View;
+using ScottPlot.Palettes;
using System;
using System.Collections.Generic;
using System.Data;
@@ -28,6 +29,16 @@ namespace DyeingComputer.Windows
InitializeComponent();
Form1_Load();
FocusManager.SetFocusedElement(boxNAME, boxNAME);
+ P1.Visibility = Visibility.Collapsed;
+ P1N.Visibility = Visibility.Collapsed;
+ 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;
}
private void Tb_KeyPress(object sender, TextCompositionEventArgs e)//输入事件
@@ -38,9 +49,6 @@ 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", "055", "056","064","065","066","067","090","091","093","094" };
@@ -85,21 +93,21 @@ namespace DyeingComputer.Windows
if (g != -1)
{
boxID.SelectedIndex = g;//有效索引传入
+ set(g);
} else
{
boxID.SelectedIndex =-1;
- // boxNAME.Text = Properties.Resources.Invalidfeatures;//功能无效
-
+ set(-1);
}
}
}
-
private void BoxID_SelectionChanged(object sender, SelectionChangedEventArgs e)//下拉框选择事件
{
if (boxID.SelectedIndex !=-1)
{
int i = boxID.SelectedIndex;
boxNAME.Text = a.ElementAt(i);
+ set(i);
}
}
@@ -112,5 +120,182 @@ namespace DyeingComputer.Windows
{
this.Close(); //关闭窗口
}
+
+ private void set(int a)
+ {
+ switch (a)
+ {
+ case 0:
+ P1N.Text = Properties.Resources.Target+Properties.Resources.Temperature;
+ P2N.Text = Properties.Resources.Rate;
+ P3N.Text = Properties.Resources.Time;
+ 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.Collapsed;
+ P4N.Visibility = Visibility.Collapsed;
+ P5.Visibility = Visibility.Collapsed;
+ P5N.Visibility = Visibility.Collapsed;
+ break;
+ case 1:
+ P1N.Text = Properties.Resources.Headwaters;
+ P2N.Text = Properties.Resources.WaterLevel;
+ 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;
+ break;
+ case 2:
+ P1N.Text = Properties.Resources.Headwaters;
+ P2N.Text = Properties.Resources.Flowmeter;
+ 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;
+ break;
+ case 3:
+ P1N.Text = Properties.Resources.Headwaters;
+ P2N.Text = Properties.Resources.WaterLevel;
+ P3N.Text = Properties.Resources.Time;
+ P3N.Text = Properties.Resources.Number;
+ 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.Collapsed;
+ 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.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.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.Drainage;
+ P2N.Text = Properties.Resources.WaterLevel;
+ 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;
+ break;
+ case 6:
+ P1N.Text = Properties.Resources.Drainage;
+ P2N.Text = Properties.Resources.WaterLevel;
+ 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;
+ break;
+ case 7:
+ P1N.Text = Properties.Resources.Time;
+ 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;
+ break;
+ case 14:
+ P1N.Text = Properties.Resources.Temperature;
+ P2N.Text = Properties.Resources.Pressure;
+ 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;
+ break;
+ case 15:
+ P1N.Text = Properties.Resources.Temperature;
+ P2N.Text = Properties.Resources.Pressure;
+ 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;
+ break;
+ case 16:
+ P1N.Text = Properties.Resources.PumpSpeed;
+ 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;
+ break;
+ default:
+ P1.Visibility = Visibility.Collapsed;
+ P1N.Visibility = Visibility.Collapsed;
+ 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;
+ break;
+ }
+ }
}
}