sc
/
DyeingComputer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

master
sc 1 year ago
parent
aa954eb61b 45076235fb
commit
07463625c8
3 changed files with 73 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      MainWindow.xaml.cs
  2. 4
      View/TechnologicalProcessView.xaml.cs
  3. 123
      ViewModel/MainWindowViewModel.cs

10
MainWindow.xaml.cs
View File

@ -161,13 +161,15 @@ namespace DyeingComputer
{ {
if(e.Key == Key.N) if(e.Key == Key.N)
{ {
if (MainWindowViewModel.WORK_RUN == 2) MainWindowViewModel.WORK_RUN = 1;// 运行时停止键为暂停 if (MainWindowViewModel.WORK_RUN == 2)
if (MainWindowViewModel.WORK_RUN == 1) {
MainWindowViewModel.WORK_RUN = 1;// 运行时停止键为暂停
}else if (MainWindowViewModel.WORK_RUN == 1)
{ {
MessageBoxResult messageBoxResult = System.Windows.MessageBox.Show("800", Properties.Resources.Save, MessageBoxButton.OKCancel); MessageBoxResult messageBoxResult = System.Windows.MessageBox.Show("800", Properties.Resources.Save, MessageBoxButton.OKCancel);
if (messageBoxResult == MessageBoxResult.Yes) if (messageBoxResult == MessageBoxResult.OK)
{ {
MainWindowViewModel.WORK_RUN = 1;// 运行时停止键为 MainWindowViewModel.WORK_RUN = 0;// 运行时停止键为
} }
} }
} }

4
View/TechnologicalProcessView.xaml.cs
View File

@ -104,8 +104,8 @@ namespace DyeingComputer.View
{ {
if (e.Key == Key.Y) //按键y if (e.Key == Key.Y) //按键y
{ {
MainWindowViewModel strart = new MainWindowViewModel();//实例 // MainWindowViewModel strart = new MainWindowViewModel();//实例
strart.STEP_START(Numder, Convert.ToDouble(P1), Convert.ToDouble(P2), Convert.ToDouble(P3), Convert.ToDouble(P4), Convert.ToDouble(P5));//传入参数开始 // strart.STEP_START(Numder, Convert.ToDouble(P1), Convert.ToDouble(P2), Convert.ToDouble(P3), Convert.ToDouble(P4), Convert.ToDouble(P5));//传入参数开始
} }
} }
} }

123
ViewModel/MainWindowViewModel.cs
View File

@ -184,17 +184,17 @@ namespace DyeingComputer.ViewModel
public static int WORK_RUN = 0; //运行状态0停止1暂停2运行 public static int WORK_RUN = 0; //运行状态0停止1暂停2运行
string STEP_ID = "0"; private string STEP_ID = "0";
double STEP_P1 = 0; private double STEP_P1 = 0;
double STEP_P2 = 0; private double STEP_P2 = 0;
double STEP_P3 = 0; private double STEP_P3 = 0;
double STEP_P4 = 0; private double STEP_P4 = 0;
double STEP_P5 = 0; private double STEP_P5 = 0;
int SETP_runtime; //步骤开始 private int SETP_runtime; //步骤开始
bool STEP_finish = false; //步骤结束 private bool STEP_finish = false; //步骤结束
int STEP_TIME = 0; //步骤计时S private int STEP_TIME = 0; //步骤计时S
int THL_mode = 0; //温控模式 0保温 1加热 2降 private int THL_mode = 0; //温控模式 0保温 1加热 2降
double TEMP_co = 0; //计算温度 private double TEMP_co = 0; //计算温度
public void STEP_START(string ID,double P1,double P2,double P3,double P4,double P5) public void STEP_START(string ID,double P1,double P2,double P3,double P4,double P5)
{ {
@ -213,70 +213,71 @@ namespace DyeingComputer.ViewModel
updata_dtm("1003", STEP_P2 / 600); updata_dtm("1003", STEP_P2 / 600);
STEP_TIME = Convert.ToInt16(STEP_P3) * 60; STEP_TIME = Convert.ToInt16(STEP_P3) * 60;
WORK_RUN = 2; WORK_RUN = 2;
SETP_runtime =1; SETP_runtime = 1;
} }
} }
TimeSpan ts=new TimeSpan(1);//1秒间隔 TimeSpan ts=new TimeSpan(1);//1秒间隔
void STEP_RUN() void STEP_RUN()
{ {
if (WORK_RUN == 2)
/* if (WORK_RUN == 2)
{ {
// if (SETP_runtime == 1) if (SETP_runtime == 1)
// {
if (STEP_ID == "001")
{ {
if (STEP_ID == "001")
double TO = 0;
double T = Selet_dtm("1010"); //实际温度
if (THL_mode == 0) //保温
{ {
//STEP_TIME--;
if (STEP_TIME == 0) { STEP_finish = true; } double TO = 0;
else { STEP_TIME--; } double T = Selet_dtm("1010"); //实际温度
TO = pid.PID_iterate(STEP_P1, T, ts); if (THL_mode == 0) //保温
if (TO < 0) TO = 0; {
if (STEP_TIME == 0) { STEP_finish = true; }
int TIME_H = STEP_TIME / 3600; else { STEP_TIME--; }
int TIME_M = (STEP_TIME - TIME_H * 3600) / 60; TO = pid.PID_iterate(STEP_P1, T, ts);
int TIME_S = STEP_TIME - TIME_H * 3600 - TIME_M * 60; if (TO < 0) TO = 0;
Status_Str = Resources.Temperature + Resources.Time + string.Format(" {0:D2}", TIME_H) + ":" + string.Format(" {0:D2}", TIME_M) + ":" + string.Format(" {0:D2}", TIME_S);
} int TIME_H = STEP_TIME / 3600;
else if (THL_mode == 1)//升温 int TIME_M = (STEP_TIME - TIME_H * 3600) / 60;
{ int TIME_S = STEP_TIME - TIME_H * 3600 - TIME_M * 60;
TEMP_co = TEMP_co + (STEP_P2 / 60); Status_Str = Resources.Temperature + Resources.Time + string.Format(" {0:D2}", TIME_H) + ":" + string.Format(" {0:D2}", TIME_M) + ":" + string.Format(" {0:D2}", TIME_S);
TO = pid.PID_iterate(TEMP_co, T, ts); }
if (TO < 0) TO = 0; else if (THL_mode == 1)//升温
if (STEP_P1 < T) THL_mode = 0; {
TEMP_co = TEMP_co + (STEP_P2 / 60);
TO = pid.PID_iterate(TEMP_co, T, ts);
if (TO < 0) TO = 0;
if (STEP_P1 < T) THL_mode = 0;
}
else if (THL_mode == 2)//降温
{
TEMP_co = TEMP_co - (STEP_P2 / 60);
TO = pid.PID_iterate(TEMP_co, T, ts);
if (TO > 0) TO = 0;
TO = Math.Abs(TO);
if (STEP_P1 > T) THL_mode = 0;
}
updata_dtm("1004", TO);
updata_dtm("1005", TEMP_co);
} }
else if (THL_mode == 2)//降温
}
else
{
if (Name_err == null)
{ {
TEMP_co = TEMP_co - (STEP_P2 / 60); Status_Str = Resources.Await;
TO = pid.PID_iterate(TEMP_co, T, ts);
if (TO > 0) TO = 0;
TO = Math.Abs(TO);
if (STEP_P1 > T) THL_mode = 0;
} }
updata_dtm("1004", TO);
updata_dtm("1005", TEMP_co);
} }
// }
// else
// {
// if (Name_err == null)
// {
// Status_Str = Resources.Await;
// }
// }
} }
else if (WORK_RUN == 1) else if (WORK_RUN == 1)
{ {
Status_Str = Resources. Paused; Status_Str = Resources.Paused;
} }
else if (WORK_RUN == 0) else */
if (WORK_RUN == 0)
{ {
if (Name_err == null) if (Name_err == null)
{ {
@ -389,9 +390,9 @@ namespace DyeingComputer.ViewModel
await Task.Run(() => await Task.Run(() =>
{ {
// SYSData_A = ToObservableCollection<DATA_A>(dt_a); SYSData_A = ToObservableCollection<DATA_A>(dt_a);
// SYSData_D = ToObservableCollection<DATA_D>(dt_d); SYSData_D = ToObservableCollection<DATA_D>(dt_d);
// SYSData_M = ToObservableCollection<DATA_M>(dt_m); SYSData_M = ToObservableCollection<DATA_M>(dt_m);
}); });
} }

Write Preview
Loading…
Cancel
Save