Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer
This commit is contained in:
commit
094a3553ad
3 files changed
+18
-16
No files matched your search
@@ -8,6 +8,7 @@
|
||||
mc:Ignorable="d"
|
||||
WindowStartupLocation="CenterScreen"
|
||||
ResizeMode="NoResize"
|
||||
WindowStyle="None"
|
||||
Title="SUNLIGHT 800" Height="800" Width="600">
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
|
||||
+11
-12
@@ -55,7 +55,9 @@ namespace DyeingComputer.Windows
|
||||
dat_P = 2;
|
||||
Setp(DAT.Field<string>("StepID_S2"));
|
||||
dat_P = 3;
|
||||
Setp(DAT.Field<string>("StepID_S3"));
|
||||
Setp(DAT.Field<string>("StepID_S3"));
|
||||
dat_P = 0;
|
||||
boxIDp.IsEnabled=false;
|
||||
}
|
||||
|
||||
private void Tb_KeyPress(object sender, TextCompositionEventArgs e)//输入事件
|
||||
@@ -370,11 +372,10 @@ namespace DyeingComputer.Windows
|
||||
this.boxID.Items.Add(Properties.Resources.AddTheMedicine);//加药065
|
||||
this.boxID.Items.Add(Properties.Resources.CallDistribution);//呼叫输送066
|
||||
this.boxID.Items.Add(Properties.Resources.CallPreparation);//呼叫准备067
|
||||
this.boxIDp.Items.Add(Properties.Resources.RapidAcidAddition);//快速加酸090
|
||||
this.boxIDp.Items.Add(Properties.Resources.PHTemperatureControl);//ph温度控制091
|
||||
this.boxIDp.Items.Add(Properties.Resources.PHDetection);//ph检测093
|
||||
this.boxIDp.Items.Add(Properties.Resources.PHControl);//ph控制094
|
||||
|
||||
this.boxID.Items.Add(Properties.Resources.RapidAcidAddition);//快速加酸090
|
||||
this.boxID.Items.Add(Properties.Resources.PHTemperatureControl);//ph温度控制091
|
||||
this.boxID.Items.Add(Properties.Resources.PHDetection);//ph检测093
|
||||
this.boxID.Items.Add(Properties.Resources.PHControl);//ph控制094
|
||||
|
||||
this.boxIDp.Items.Add("");//
|
||||
this.boxIDp.Items.Add(Properties.Resources.Washing + "(" + Properties.Resources.Cooling + ")");//降温水洗017
|
||||
@@ -1699,7 +1700,7 @@ namespace DyeingComputer.Windows
|
||||
private void imageP1_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
((Image)sender).RenderTransform = Transform.Identity;
|
||||
dat_P = 1;
|
||||
dat_P = 1; boxIDp.IsEnabled = true;
|
||||
Sub.Text = Properties.Resources.Subroutine + ": "+dat_P.ToString();
|
||||
boxNAMEp.Text = dat_D.Field<string>("StepID_S1");
|
||||
P1P.Text = dat_D.Field<double>("Parameter1_S1").ToString();
|
||||
@@ -1711,7 +1712,7 @@ namespace DyeingComputer.Windows
|
||||
private void imageP2_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
((Image)sender).RenderTransform = Transform.Identity;
|
||||
dat_P = 2;
|
||||
dat_P = 2; boxIDp.IsEnabled = true;
|
||||
Sub.Text = Properties.Resources.Subroutine + ": "+ dat_P.ToString();
|
||||
boxNAMEp.Text = dat_D.Field<string>("StepID_S2");
|
||||
P1P.Text = dat_D.Field<double>("Parameter1_S2").ToString();
|
||||
@@ -1723,7 +1724,7 @@ namespace DyeingComputer.Windows
|
||||
private void imageP3_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
|
||||
{
|
||||
((Image)sender).RenderTransform = Transform.Identity;
|
||||
dat_P = 3;
|
||||
dat_P = 3; boxIDp.IsEnabled = true;
|
||||
Sub.Text = Properties.Resources.Subroutine + ": "+ dat_P.ToString();
|
||||
boxNAMEp.Text = dat_D.Field<string>("StepID_S3");
|
||||
P1P.Text = dat_D.Field<double>("Parameter1_S3").ToString();
|
||||
@@ -1731,8 +1732,6 @@ namespace DyeingComputer.Windows
|
||||
P3P.Text = dat_D.Field<double>("Parameter3_S3").ToString();
|
||||
P4P.Text = dat_D.Field<double>("Parameter4_S3").ToString();
|
||||
P5P.Text = dat_D.Field<double>("Parameter5_S3").ToString();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user