sc/DyeingComputer
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sc committed 2024-09-28 23:32:33 +08:00
2 parents bd189f0655 897e704acd
commit 8751a9617f
5 files changed
+43 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Properties/Resources.Designer.cs
Generated
+18
View File
@@ -294,6 +294,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 DifferentialPressure 的本地化字符串。
/// </summary>
public static string DifferentialPressure {
get {
return ResourceManager.GetString("DifferentialPressure", resourceCulture);
}
}
/// <summary>
/// 查找类似 Directives 的本地化字符串。
/// </summary>
@@ -402,6 +411,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 GuidingWheel 的本地化字符串。
/// </summary>
public static string GuidingWheel {
get {
return ResourceManager.GetString("GuidingWheel", resourceCulture);
}
}
/// <summary>
/// 查找类似 Headwaters 的本地化字符串。
/// </summary>
Properties/Resources.en-US.resx
+6
View File
@@ -465,4 +465,10 @@
<data name="Cycletime" xml:space="preserve">
<value>Cycle time</value>
</data>
<data name="DifferentialPressure" xml:space="preserve">
<value>Differential Pressure</value>
</data>
<data name="GuidingWheel" xml:space="preserve">
<value>Guiding Wheel</value>
</data>
</root>
Properties/Resources.resx
+6
View File
@@ -465,4 +465,10 @@
<data name="Cycletime" xml:space="preserve">
<value>Cycletime</value>
</data>
<data name="DifferentialPressure" xml:space="preserve">
<value>DifferentialPressure</value>
</data>
<data name="GuidingWheel" xml:space="preserve">
<value>GuidingWheel</value>
</data>
</root>
Properties/Resources.zh-CN.resx
+6
View File
@@ -465,4 +465,10 @@
<data name="Cycletime" xml:space="preserve">
<value>行布周期</value>
</data>
<data name="DifferentialPressure" xml:space="preserve">
<value>内/外压力差</value>
</data>
<data name="GuidingWheel" xml:space="preserve">
<value>导布轮</value>
</data>
</root>
ViewModel/MainWindowViewModel.cs
+7 -1
View File
@@ -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]";