diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
index 66640e7..f0454d1 100644
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -195,6 +195,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 Connection lost 的本地化字符串。
+ ///
+ public static string Connectionlost {
+ get {
+ return ResourceManager.GetString("Connectionlost", resourceCulture);
+ }
+ }
+
///
/// 查找类似 Container 的本地化字符串。
///
@@ -546,6 +555,15 @@ namespace DyeingComputer.Properties {
}
}
+ ///
+ /// 查找类似 的本地化字符串。
+ ///
+ public static string Port {
+ get {
+ return ResourceManager.GetString("Port", resourceCulture);
+ }
+ }
+
///
/// 查找类似 PrepareMedications 的本地化字符串。
///
diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx
index 62750ef..3564312 100644
--- a/Properties/Resources.en-US.resx
+++ b/Properties/Resources.en-US.resx
@@ -402,4 +402,10 @@
Not Implementation
+
+ Connection lost
+
+
+ Port
+
\ No newline at end of file
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 1b0b0d9..2093e2b 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -402,4 +402,10 @@
The process does not exist
+
+ Connection lost
+
+
+ Port
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx
index aaa968c..a043e44 100644
--- a/Properties/Resources.zh-CN.resx
+++ b/Properties/Resources.zh-CN.resx
@@ -402,4 +402,10 @@
执行
+
+ 连接丢失
+
+
+ 端口号
+
\ No newline at end of file
diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx
index 9074700..2d8225e 100644
--- a/Properties/Resources.zh-TW.resx
+++ b/Properties/Resources.zh-TW.resx
@@ -402,4 +402,10 @@
執行
+
+ 網路斷開
+
+
+ 連接埠
+
\ No newline at end of file
diff --git a/UserClass/CRCcheck16.cs b/UserClass/CRCcheck16.cs
index f511e8d..789839b 100644
--- a/UserClass/CRCcheck16.cs
+++ b/UserClass/CRCcheck16.cs
@@ -1,7 +1,7 @@
using System;
using System.Text;
-namespace formula_manage.UserClass
+namespace DyeingComputer.UserClass
{
///
/// CRC校验
diff --git a/UserClass/DataGridHelper.cs b/UserClass/DataGridHelper.cs
index 18adf48..38a915b 100644
--- a/UserClass/DataGridHelper.cs
+++ b/UserClass/DataGridHelper.cs
@@ -2,7 +2,7 @@
using System.Windows;
using System.Windows.Controls;
-namespace formula_manage.UserClass
+namespace DyeingComputer.UserClass
{
///
/// 实时更新datagrid
diff --git a/UserClass/DataTableForToObservableCollection.cs b/UserClass/DataTableForToObservableCollection.cs
index 8576c1b..252552c 100644
--- a/UserClass/DataTableForToObservableCollection.cs
+++ b/UserClass/DataTableForToObservableCollection.cs
@@ -3,7 +3,7 @@ using System.Collections.ObjectModel;
using System.Data;
using System.Reflection;
-namespace formula_manage.UserClass
+namespace DyeingComputer.UserClass
{
internal class DataTableToObservableCollection //数据表到可观察集合
{
diff --git a/UserClass/HardwareSN.cs b/UserClass/HardwareSN.cs
index 45de8a4..cd90c69 100644
--- a/UserClass/HardwareSN.cs
+++ b/UserClass/HardwareSN.cs
@@ -1,6 +1,6 @@
using System.Management;
-namespace formula_manage.UserClass
+namespace DyeingComputer.UserClass
{
///
/// 获取硬件SN
diff --git a/UserClass/IniFile.cs b/UserClass/IniFile.cs
index c43b367..c14ea3e 100644
--- a/UserClass/IniFile.cs
+++ b/UserClass/IniFile.cs
@@ -1,7 +1,7 @@
using System.Runtime.InteropServices;
using System.Text;
-namespace formula_manage.UserClass
+namespace DyeingComputer.UserClass
{
internal class IniFile
{
diff --git a/UserClass/LogDataRead.cs b/UserClass/LogDataRead.cs
index b43eb81..076bbf7 100644
--- a/UserClass/LogDataRead.cs
+++ b/UserClass/LogDataRead.cs
@@ -3,7 +3,7 @@ using System.Windows.Controls;
using System.Windows.Documents;
using System.Windows.Media;
-namespace formula_manage.UserClass
+namespace DyeingComputer.UserClass
{
public static class LogDataRead
{
diff --git a/UserClass/MD5check.cs b/UserClass/MD5check.cs
index b3c2f4d..ee3fae9 100644
--- a/UserClass/MD5check.cs
+++ b/UserClass/MD5check.cs
@@ -2,7 +2,7 @@
using System.Security.Cryptography;
using System.Text;
-namespace formula_manage.UserClass
+namespace DyeingComputer.UserClass
{
///
/// MD5加密
diff --git a/View/EngineerSetView.xaml b/View/EngineerSetView.xaml
index 7107c4a..8d314af 100644
--- a/View/EngineerSetView.xaml
+++ b/View/EngineerSetView.xaml
@@ -3,10 +3,12 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
- xmlns:local="clr-namespace:DyeingComputer.View"
+ xmlns:local="clr-namespace:DyeingComputer.View"
+ xmlns:lang="clr-namespace:DyeingComputer.Properties"
mc:Ignorable="d"
d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top">
-
+
+
diff --git a/View/EngineerSetView.xaml.cs b/View/EngineerSetView.xaml.cs
index e4cc86f..00f732d 100644
--- a/View/EngineerSetView.xaml.cs
+++ b/View/EngineerSetView.xaml.cs
@@ -23,6 +23,16 @@ namespace DyeingComputer.View
public EngineerSetView()
{
InitializeComponent();
+ // 获取所有可用串口端口,并添加到comboBoxCOM
+ string[] ports = System.IO.Ports.SerialPort.GetPortNames();
+ comboBoxCOM.ItemsSource = ports;
+ }
+ //调用配置文件
+ private UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "DyeingComputer.ini");
+
+ private void comboBoxCOM_SelectionChanged(object sender, SelectionChangedEventArgs e)
+ {
+ Configini.IniWritevalue("SYS","COM",comboBoxCOM.SelectedValue.ToString());
}
}
}
diff --git a/View/ProgramgroupView.xaml.cs b/View/ProgramgroupView.xaml.cs
index df5be1b..dd6284f 100644
--- a/View/ProgramgroupView.xaml.cs
+++ b/View/ProgramgroupView.xaml.cs
@@ -1,6 +1,5 @@
using DyeingComputer.UserClass;
using DyeingComputer.Windows;
-using formula_manage.UserClass;
using System;
using System.Collections.Generic;
using System.Data;
diff --git a/View/ProgramstepsView .xaml.cs b/View/ProgramstepsView .xaml.cs
index f009947..2427a48 100644
--- a/View/ProgramstepsView .xaml.cs
+++ b/View/ProgramstepsView .xaml.cs
@@ -1,6 +1,5 @@
using DyeingComputer.UserClass;
using DyeingComputer.Windows;
-using formula_manage.UserClass;
using System;
using System.Collections.Generic;
using System.Data;
diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs
index 4d66397..88e833b 100644
--- a/ViewModel/MainWindowViewModel.cs
+++ b/ViewModel/MainWindowViewModel.cs
@@ -113,13 +113,14 @@ namespace DyeingComputer.ViewModel
disTimer.Start();//计时开始
}
+ public static object Name_err;
public static object WorkNumder;
void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件
{
Sys_Time = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss");
Work_Temp = "130" + " ℃";
Work_Numder = WorkNumder.ToString();
- Status_Str = "qweqeqwqqfwfqef";
+ // Status_Str = "qweqeqwqqfwfqef";
if (LINK_OK) Modbus_link();
IO_data();
@@ -127,7 +128,7 @@ namespace DyeingComputer.ViewModel
void Tick_Event_5S(object sender, EventArgs e)//Tick_Event周期执行事件
{
if (!LINK_OK) Modbus_link();
-
+ if (Name_err != null) Status_Str = Name_err.ToString();
}
void DisTimer_100MS(object sender, EventArgs e)//Tick_Event周期执行事件
{
@@ -145,7 +146,7 @@ namespace DyeingComputer.ViewModel
try
{
port.PortName = "COM5";
- port.BaudRate = 9600;//配置
+ port.BaudRate = 115200;//配置
port.DataBits = 8;
port.Parity = Parity.None;
port.StopBits = StopBits.One;
@@ -178,7 +179,10 @@ namespace DyeingComputer.ViewModel
{
master.WriteMultipleRegisters(slaveId, startAddress, registers);
}
- catch (Exception ex) { }
+ catch (Exception ex)
+ {
+ Name_err = "PLC"+Properties.Resources.Connectionlost;
+ }
});
}