diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 882675a..9069351 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -276,6 +276,15 @@ namespace DyeingComputer.Properties { } } + /// + /// 查找类似 CylinderBottom 的本地化字符串。 + /// + public static string CylinderBottom { + get { + return ResourceManager.GetString("CylinderBottom", resourceCulture); + } + } + /// /// 查找类似 Delete 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index 463c582..9ed0f4e 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -504,4 +504,7 @@ Swing + + + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 492f403..0a331d2 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -504,4 +504,7 @@ swing + + CylinderBottom + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index c3e5a57..321e450 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -504,4 +504,7 @@ 摆布 + + 缸底 + \ No newline at end of file diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index b25438d..3bcc04a 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -504,4 +504,7 @@ 擺佈 + + + \ No newline at end of file diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 957cb21..20b530e 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -1557,8 +1557,8 @@ namespace DyeingComputer.ViewModel public static string SYSlog; void LOG_view()//细节页面 { - SYSlog = Resources.Target + Resources.Temperature + " : " + string.Format(" {0:###.#}", TEMP_tar) + "°C";//显示目标温度 - SYSlog = SYSlog + " | " + Resources.MasterCylinder + Resources.Temperature + " : " + string.Format(" {0:###.#}", Convert.ToDouble(Selet_dtm("1010"))) + "°C";//显示实际温度 + SYSlog = Resources.MasterCylinder + Resources.Temperature + " : " + string.Format(" {0:###.#}", Convert.ToDouble(Selet_dtm("1010"))) + "°C";//显示实际温度 + SYSlog = SYSlog + " | "+ Resources.CylinderBottom + Resources.Temperature + " : " + string.Format(" {0:###.#}", Convert.ToDouble(Selet_dtm("1011"))) + "°C";//显示目标温度 SYSlog = SYSlog + "\n" + Resources.Compute + Resources.Temperature + " : " + string.Format(" {0:###.#}", Convert.ToDouble(Selet_dtm("1005"))) + "°C";//显示计算温度 SYSlog = SYSlog + " | " + Resources.ProportionalValves + " : " + string.Format("{0:###.#}", Convert.ToDouble(Selet_dtm("1004")) / 10) + "%";//显示比例 int IO1015 = Convert.ToInt16(Selet_dtm("1015"));