diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index af7be8c..c5b468e 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -294,6 +294,15 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 DifferentialPressure 的本地化字符串。 + /// + public static string DifferentialPressure { + get { + return ResourceManager.GetString("DifferentialPressure", resourceCulture); + } + } + /// /// 查找类似 Directives 的本地化字符串。 /// @@ -402,6 +411,15 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 GuidingWheel 的本地化字符串。 + /// + public static string GuidingWheel { + get { + return ResourceManager.GetString("GuidingWheel", resourceCulture); + } + } + /// /// 查找类似 Headwaters 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index 03b33f7..8ab4f37 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -465,4 +465,10 @@ Cycle time + + Differential Pressure + + + Guiding Wheel + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index d3f2e1f..57ba726 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -465,4 +465,10 @@ Cycletime + + DifferentialPressure + + + GuidingWheel + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index 76f77f1..b12b13d 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -465,4 +465,10 @@ 行布周期 + + 内/外压力差 + + + 导布轮 + \ No newline at end of file diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index e250419..fcab7c6 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -993,9 +993,15 @@ namespace DyeingComputer.ViewModel if (MT18 >= 10) Sys_log = Sys_log + "\n" + "10 : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1041"))); }//溢流/o型 else if (S16 == 1) //气流 - { } + { + Sys_log = Sys_log + "\n" + Resources.DifferentialPressure + " : "+ string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1021"))) + "%"; + Sys_log = Sys_log + "\n" + Resources.Blower + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1044"))) + "%"; + Sys_log = Sys_log + "\n" + Resources.GuidingWheel + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1046"))) + "M/min"; + Sys_log = Sys_log + "\n" + Resources.Nozzle + Resources.Flowmeter + " : " + string.Format("{0:D3}", Convert.ToInt16(Selet_dtm("1045"))) + "L/min"; + } else if (S16 == 2) //桶纱 { } + Sys_log = Sys_log + "\n-------------------------------------------------------"; if (SM01 == 1) Sys_log = Sys_log + "\n" + Resources.Medicine + Resources.Tank + "1 => [" + Resources.WaterLevel + ":" + string.Format("{0:D4}", Convert.ToInt16(Selet_dtm("1017"))) + "L][" + Resources.Temperature + ":" + string.Format(" {0:###.#}", Convert.ToInt16(Selet_dtm("1012"))) + "°C]"; if (SM02 == 1) Sys_log = Sys_log + "\n" + Resources.Medicine + Resources.Tank + "2 => [" + Resources.WaterLevel + ":" + string.Format("{0:D4}", Convert.ToInt16(Selet_dtm("1018"))) + "L][" + Resources.Temperature + ":" + string.Format(" {0:###.#}", Convert.ToInt16(Selet_dtm("1013"))) + "°C]";