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 2025-05-13 14:55:29 +08:00
2 parents 2b1ea35d76 f1e7a4c5ee
commit 6db36019f2
7 files changed
+91 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Properties/Resources.Designer.cs
Generated
+27
View File
@@ -636,6 +636,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 NAME 的本地化字符串。
/// </summary>
public static string NAME_ {
get {
return ResourceManager.GetString("NAME_", resourceCulture);
}
}
/// <summary>
/// 查找类似 New 的本地化字符串。
/// </summary>
@@ -1050,6 +1059,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 swing 的本地化字符串。
/// </summary>
public static string Swing {
get {
return ResourceManager.GetString("Swing", resourceCulture);
}
}
/// <summary>
/// 查找类似 SystemDataLoss 的本地化字符串。
/// </summary>
@@ -1131,6 +1149,15 @@ namespace DyeingComputer.Properties {
}
}
/// <summary>
/// 查找类似 value 的本地化字符串。
/// </summary>
public static string Value {
get {
return ResourceManager.GetString("Value", resourceCulture);
}
}
/// <summary>
/// 查找类似 Washing 的本地化字符串。
/// </summary>
Properties/Resources.en-US.resx
+6
View File
@@ -498,4 +498,10 @@
<data name="NAME_" xml:space="preserve">
<value />
</data>
<data name="Value" xml:space="preserve">
<value />
</data>
<data name="Swing" xml:space="preserve">
<value />
</data>
</root>
Properties/Resources.resx
+6 -3
View File
@@ -495,10 +495,13 @@
<data name="R_P" xml:space="preserve">
<value>Run/Pause</value>
</data>
<data name="Resources" xml:space="preserve">
<value>Resources</value>
</data>
<data name="NAME_" xml:space="preserve">
<value>NAME</value>
</data>
<data name="Value" xml:space="preserve">
<value>value</value>
</data>
<data name="Swing" xml:space="preserve">
<value>swing</value>
</data>
</root>
Properties/Resources.zh-CN.resx
+6
View File
@@ -498,4 +498,10 @@
<data name="NAME_" xml:space="preserve">
<value>名称</value>
</data>
<data name="Value" xml:space="preserve">
<value>数值</value>
</data>
<data name="Swing" xml:space="preserve">
<value>摆布</value>
</data>
</root>
Properties/Resources.zh-TW.resx
+6
View File
@@ -498,4 +498,10 @@
<data name="NAME_" xml:space="preserve">
<value />
</data>
<data name="Value" xml:space="preserve">
<value />
</data>
<data name="Swing" xml:space="preserve">
<value />
</data>
</root>
View/TechnologicalProcessView.xaml
+3 -2
View File
@@ -139,7 +139,7 @@
<DataGrid x:Name="Parameter_set" Visibility="Collapsed"
AutoGenerateColumns="False" FontSize="15" AlternationCount="2"
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9"
ColumnHeaderHeight="40" >
ColumnHeaderHeight="40" CellEditEnding="Parameter_set_CellEditEnding">
<DataGrid.RowStyle >
<Style TargetType="{x:Type DataGridRow}">
<Setter Property="Height" Value="30" />
@@ -171,7 +171,8 @@
<DataGrid.Columns>
<!--列信息绑定-->
<DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Binding="{Binding ParameterSet}" Width="200" IsReadOnly="True"/>
<DataGridTextColumn Header="{x:Static lang:Resources.ParameterSet}" Width="200" Binding="{Binding Value}"/>
<DataGridTextColumn Header="{x:Static lang:Resources.Value}" Width="200" Binding="{Binding Value}"/>
<DataGridTextColumn MaxWidth="0" Binding="{Binding ID}"/>
</DataGrid.Columns>
</DataGrid>
</Grid>
View/TechnologicalProcessView.xaml.cs
+37 -4
View File
@@ -67,6 +67,7 @@ namespace DyeingComputer.View
// ProgramgroupView_edit.IsEnabled = false;
// ProgramgroupView_del.IsEnabled = false;
// ProgramgroupView_Insert.IsEnabled = false;
tblDatas.Clear();
tblDatas.Columns.Add("ParameterSet", Type.GetType("System.String"));
tblDatas.Columns.Add("Value", Type.GetType("System.Double"));
tblDatas.Columns.Add("ID", Type.GetType("System.String"));
@@ -83,14 +84,14 @@ namespace DyeingComputer.View
newRow["ID"] = "1021";
tblDatas.Rows.Add(newRow);
newRow = tblDatas.NewRow();
newRow["ParameterSet"] = Properties.Resources.Blower + " (%)";//摆布速度
newRow["ParameterSet"] = Properties.Resources.Swing + " (%)";//摆布速度
newRow["Value"] = MainWindowViewModel.Selet_dtm("1041");
newRow["ID"] = "1041";
tblDatas.Rows.Add(newRow);
newRow = tblDatas.NewRow();
newRow["ParameterSet"] = Properties.Resources.ClothWheel + " (M/min)";//布轮速度
newRow["Value"] = MainWindowViewModel.Selet_dtm("1025");
newRow["ID"] = "1025";
newRow["ID"] = "ClothWheel";
tblDatas.Rows.Add(newRow);
newRow = tblDatas.NewRow();
newRow["ParameterSet"] = Properties.Resources.ClothWheel + "1 (M/min)";//提不论速度
@@ -186,9 +187,41 @@ namespace DyeingComputer.View
tblDatas.Rows.Add(newRow);
}
Parameter_set.ItemsSource = tblDatas.DefaultView;
}
private void Parameter_set_CellEditEnding(object sender, DataGridCellEditEndingEventArgs e)
{
string ID;
string newValue = (e.EditingElement as TextBox).Text;//获得输入单元格信息
int rownum = Parameter_set.SelectedIndex;//获取鼠标选中行并定义变量
if (rownum != -1)//判断鼠标定位是否有效
{
ID = (Parameter_set.Columns[2].GetCellContent(Parameter_set.Items[rownum]) as TextBlock).Text;//定位第0列，
if (ID == "ClothWheel")
{
MainWindowViewModel.Updata_dtm("1025", Convert.ToDouble(newValue));
MainWindowViewModel.Updata_dtm("1026", Convert.ToDouble(newValue));
MainWindowViewModel.Updata_dtm("1027", Convert.ToDouble(newValue));
MainWindowViewModel.Updata_dtm("1028", Convert.ToDouble(newValue));
MainWindowViewModel.Updata_dtm("1029", Convert.ToDouble(newValue));
MainWindowViewModel.Updata_dtm("1035", Convert.ToDouble(newValue));
MainWindowViewModel.Updata_dtm("1037", Convert.ToDouble(newValue));
MainWindowViewModel.Updata_dtm("1039", Convert.ToDouble(newValue));
MainWindowViewModel.Updata_dtm("1053", Convert.ToDouble(newValue));
MainWindowViewModel.Updata_dtm("1055", Convert.ToDouble(newValue));
MainWindowViewModel.Updata_dtm("1057", Convert.ToDouble(newValue));
MainWindowViewModel.Updata_dtm("1059", Convert.ToDouble(newValue));
}
else
{
MainWindowViewModel.Updata_dtm(ID, Convert.ToDouble(newValue));
}
}
}//参数设置
DataTable tblDatas = new DataTable("Datas");
public static object workName;
public static SQLiteHelper SQLiteHelpers = null; //定义数据库
@@ -434,7 +467,7 @@ namespace DyeingComputer.View
{
}
private void ProgramgroupView_stop_Click(object sender, RoutedEventArgs e)//结束工艺
{