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-12 22:05:51 +08:00
2 parents f69055dcb6 a9b1dc2036
commit c8ed3818d0
17 files changed
+71 -15
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
@@ -195,6 +195,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 Connection lost 的本地化字符串。
/// </summary>
public static string Connectionlost {
get {
return ResourceManager.GetString("Connectionlost", resourceCulture);
}
}
/// <summary>
/// 查找类似 Container 的本地化字符串。
/// </summary>
@@ -546,6 +555,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 的本地化字符串。
/// </summary>
public static string Port {
get {
return ResourceManager.GetString("Port", resourceCulture);
}
}
/// <summary>
/// 查找类似 PrepareMedications 的本地化字符串。
/// </summary>
Properties/Resources.en-US.resx
+6
View File
@@ -402,4 +402,10 @@
<data name="Notimplementation" xml:space="preserve">
<value>Not Implementation</value>
</data>
<data name="Connectionlost" xml:space="preserve">
<value>Connection lost</value>
</data>
<data name="Port" xml:space="preserve">
<value>Port</value>
</data>
</root>
Properties/Resources.resx
+6
View File
@@ -402,4 +402,10 @@
<data name="process_not" xml:space="preserve">
<value>The process does not exist</value>
</data>
<data name="Connectionlost" xml:space="preserve">
<value>Connection lost</value>
</data>
<data name="Port" xml:space="preserve">
<value>Port</value>
</data>
</root>
Properties/Resources.zh-CN.resx
+6
View File
@@ -402,4 +402,10 @@
<data name="Implementation" xml:space="preserve">
<value>执行</value>
</data>
<data name="Connectionlost" xml:space="preserve">
<value>连接丢失</value>
</data>
<data name="Port" xml:space="preserve">
<value>端口号</value>
</data>
</root>
Properties/Resources.zh-TW.resx
+6
View File
@@ -402,4 +402,10 @@
<data name="Implementation" xml:space="preserve">
<value>執行</value>
</data>
<data name="Connectionlost" xml:space="preserve">
<value>網路斷開</value>
</data>
<data name="Port" xml:space="preserve">
<value>連接埠</value>
</data>
</root>
UserClass/CRCcheck16.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using System;
using System.Text;
namespace formula_manage.UserClass
namespace DyeingComputer.UserClass
{
/// <summary>
/// CRC校验
UserClass/DataGridHelper.cs
+1 -1
View File
@@ -2,7 +2,7 @@
using System.Windows;
using System.Windows.Controls;
namespace formula_manage.UserClass
namespace DyeingComputer.UserClass
{
/// <summary>
/// 实时更新datagrid
UserClass/DataTableForToObservableCollection.cs
+1 -1
View File
@@ -3,7 +3,7 @@ using System.Collections.ObjectModel;
using System.Data;
using System.Reflection;
namespace formula_manage.UserClass
namespace DyeingComputer.UserClass
{
internal class DataTableToObservableCollection //数据表到可观察集合
{
UserClass/HardwareSN.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using System.Management;
namespace formula_manage.UserClass
namespace DyeingComputer.UserClass
{
/// <summary>
/// 获取硬件SN
UserClass/IniFile.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using System.Runtime.InteropServices;
using System.Text;
namespace formula_manage.UserClass
namespace DyeingComputer.UserClass
{
internal class IniFile
{
UserClass/LogDataRead.cs
+1 -1
View File
@@ -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
{
UserClass/MD5check.cs
+1 -1
View File
@@ -2,7 +2,7 @@
using System.Security.Cryptography;
using System.Text;
namespace formula_manage.UserClass
namespace DyeingComputer.UserClass
{
/// <summary>
/// MD5加密
View/EngineerSetView.xaml
+4 -2
View File
@@ -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">
<Grid>
<DataGrid HorizontalAlignment="Left" Height="179" Margin="204,136,0,0" VerticalAlignment="Top" Width="343" d:ItemsSource="{d:SampleData ItemCount=5}"/>
<ComboBox HorizontalAlignment="Left" Height="30" Margin="190,10,0,0" x:Name="comboBoxCOM" VerticalAlignment="Top" Width="200" SelectionChanged="comboBoxCOM_SelectionChanged" FontSize="20"/>
<TextBlock HorizontalAlignment="Left" Height="30" Margin="90,10,0,0" TextWrapping="Wrap" Text="{x:Static lang:Resources.Port}" VerticalAlignment="Top" Width="80" FontSize="25"/>
</Grid>
</UserControl>
View/EngineerSetView.xaml.cs
+10
View File
@@ -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());
}
}
}
View/ProgramgroupView.xaml.cs
-1
View File
@@ -1,6 +1,5 @@
using DyeingComputer.UserClass;
using DyeingComputer.Windows;
using formula_manage.UserClass;
using System;
using System.Collections.Generic;
using System.Data;
View/ProgramstepsView .xaml.cs
-1
View File
@@ -1,6 +1,5 @@
using DyeingComputer.UserClass;
using DyeingComputer.Windows;
using formula_manage.UserClass;
using System;
using System.Collections.Generic;
using System.Data;
ViewModel/MainWindowViewModel.cs
+8 -4
View File
@@ -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;
}
});
}