diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index e8f634e..c37bf46 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -834,6 +834,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Protocols 的本地化字符串。
+ ///
+ public static string Protocols {
+ get {
+ return ResourceManager.GetString("Protocols", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Pump 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index b77bca1..1bf2bb2 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -489,4 +489,7 @@
Dyeing
+
+ Protocols
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 36cf590..2b6852d 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -489,4 +489,7 @@
DyeingMachine
+
+ Protocols
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index 8f91ec0..4d0bf2d 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -489,4 +489,7 @@
染色机
+
+ 协议
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index 214d32a..1fdf7e8 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -483,10 +483,13 @@
底
+
+ 領料單
+
染色機
-
- 領料單
+
+
\ No newline at end of file
diff --git a/View/EngineerSetView.xaml b/View/EngineerSetView.xaml
index d56e54d..d5c7120 100644
--- a/View/EngineerSetView.xaml
+++ b/View/EngineerSetView.xaml
@@ -8,10 +8,12 @@
mc:Ignorable="d"
d:DesignHeight="500" d:DesignWidth="800">
-
-
-
-
+
+
+
+
+
+
diff --git a/View/EngineerSetView.xaml.cs b/View/EngineerSetView.xaml.cs
index c9ee220..45b31ac 100644
--- a/View/EngineerSetView.xaml.cs
+++ b/View/EngineerSetView.xaml.cs
@@ -31,6 +31,10 @@ namespace DyeingComputer.View
comboBoxCOM.ItemsSource = ports;
comboBoxCOM.Text = Configini.IniReadvalue("SYS", "COM");
+ string[] protocols = { "SUNLIGHT_R", "MODBUS_RTU" };
+ comboBoxCOMmod.ItemsSource = protocols;
+ comboBoxCOMmod.Text = Configini.IniReadvalue("SYS", "Protocols");
+
string[] Language = { "en-US", "zh-CN", "zh -TW" };
comboBoxLanguage.ItemsSource = Language;
comboBoxLanguage.Text = Configini.IniReadvalue("SYS", "Language");
@@ -42,7 +46,10 @@ namespace DyeingComputer.View
{
Configini.IniWritevalue("SYS", "COM", comboBoxCOM.SelectedValue.ToString());
}
-
+ private void comboBoxCOMmod_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ Configini.IniWritevalue("SYS", "Protocols", comboBoxCOMmod.SelectedValue.ToString());
+ }
private void comboBoxLanguage_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
Configini.IniWritevalue("SYS", "Language", comboBoxLanguage.SelectedValue.ToString());
@@ -64,5 +71,7 @@ namespace DyeingComputer.View
RX.Text = MainWindowViewModel.RX.ToString();
TX.Text = MainWindowViewModel.TX.ToString();
}
+
+
}
}
diff --git a/View/InOutView.xaml b/View/InOutView.xaml
index b4cae51..b88e3bb 100644
--- a/View/InOutView.xaml
+++ b/View/InOutView.xaml
@@ -57,13 +57,7 @@
-
-
-
-
-
+
-
-
+