diff --git a/DyeingComputer.csproj b/DyeingComputer.csproj index 7be0a13..d914bb8 100644 --- a/DyeingComputer.csproj +++ b/DyeingComputer.csproj @@ -451,6 +451,9 @@ + + + diff --git a/Lmage/19000.png b/Lmage/19000.png new file mode 100644 index 0000000..1fc99e1 Binary files /dev/null and b/Lmage/19000.png differ diff --git a/Lmage/19001.png b/Lmage/19001.png new file mode 100644 index 0000000..9e486f0 Binary files /dev/null and b/Lmage/19001.png differ diff --git a/Lmage/19002.png b/Lmage/19002.png new file mode 100644 index 0000000..01826b3 Binary files /dev/null and b/Lmage/19002.png differ diff --git a/Lmage/IconParkUsbOne.png b/Lmage/IconParkUsbOne.png new file mode 100644 index 0000000..6dce64e Binary files /dev/null and b/Lmage/IconParkUsbOne.png differ diff --git a/View/EquipmentSimulationView.xaml b/View/EquipmentSimulationView.xaml index 16e4c8b..1a2b393 100644 --- a/View/EquipmentSimulationView.xaml +++ b/View/EquipmentSimulationView.xaml @@ -6,14 +6,14 @@ xmlns:local="clr-namespace:DyeingComputer.View" xmlns:gif="http://wpfanimatedgif.codeplex.com" mc:Ignorable="d" + Loaded="UserControl_Loaded" d:DesignHeight="1000" d:DesignWidth="1980"> - - + + - @@ -22,48 +22,48 @@ VerticalAlignment="Top" Width="160" FontSize="30" Background="White" Padding="5,0,5,0"/> - + - + - - - + + + + Margin="550,30,0,0"> - - - + + + + Margin="658,30,0,0"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + - + + + + + + + - - - - + - + + + + + diff --git a/View/EquipmentSimulationView.xaml.cs b/View/EquipmentSimulationView.xaml.cs index 8b4294e..88369a0 100644 --- a/View/EquipmentSimulationView.xaml.cs +++ b/View/EquipmentSimulationView.xaml.cs @@ -46,8 +46,11 @@ namespace DyeingComputer.View InitializeComponent(); DataContext = this; CountDown(); + IOdata(); } - bool _ID3007, _ID3008,_ID3020; + bool _ID3007, _ID3008, _ID3009, _ID3010, _ID3013, _ID3014, _ID3015, _ID3016, + _ID3017, _ID3018, _ID3019, _ID3020, _ID3036, _ID3037, + _ID3038, _ID3046, _ID3047, _ID3048, _ID3044, _ID3054, _ID3076, _ID3077; public bool ID3007 { get => _ID3007; @@ -66,6 +69,87 @@ namespace DyeingComputer.View OnPropertyChanged("ID3008"); } } + public bool ID3009 + { + get => _ID3009; + set + { + _ID3009 = value; + OnPropertyChanged("ID3009"); + } + } + public bool ID3010 + { + get => _ID3010; + set + { + _ID3010 = value; + OnPropertyChanged("ID3010"); + } + } + public bool ID3013 + { + get => _ID3013; + set + { + _ID3013 = value; + OnPropertyChanged("ID3013"); + } + } + public bool ID3014 + { + get => _ID3014; + set + { + _ID3014 = value; + OnPropertyChanged("ID3014"); + } + } + public bool ID3015 + { + get => _ID3015; + set + { + _ID3015 = value; + OnPropertyChanged("ID3015"); + } + } + public bool ID3016 + { + get => _ID3016; + set + { + _ID3016 = value; + OnPropertyChanged("ID3016"); + } + } + public bool ID3017 + { + get => _ID3017; + set + { + _ID3017 = value; + OnPropertyChanged("ID3017"); + } + } + public bool ID3018 + { + get => _ID3018; + set + { + _ID3018 = value; + OnPropertyChanged("ID3018"); + } + } + public bool ID3019 + { + get => _ID3019; + set + { + _ID3019 = value; + OnPropertyChanged("ID3019"); + } + } public bool ID3020 { get => _ID3020; @@ -75,21 +159,119 @@ namespace DyeingComputer.View OnPropertyChanged("ID3020"); } } - - - - void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S + public bool ID3036 { - M_T.Text = string.Format(" {0:###.#}", Convert.ToDouble(MainWindowViewModel.Selet_dtm("1010"))) + "°C";//主缸温度 - M_L.Text = string.Format("{0:D4}", Convert.ToInt16(MainWindowViewModel.Selet_dtm("1015"))) + "L";//主缸水 - S1_T.Text = string.Format(" {0:###.#}", Convert.ToDouble(MainWindowViewModel.Selet_dtm("1012"))) + "°C";//缸1温度 - S1_L.Text = string.Format("{0:D4}", Convert.ToInt16(MainWindowViewModel.Selet_dtm("1017"))) + "L";//缸1水 - S2_T.Text = string.Format(" {0:###.#}", Convert.ToDouble(MainWindowViewModel.Selet_dtm("1013"))) + "°C";//缸2温度 - S2_L.Text = string.Format("{0:D4}", Convert.ToInt16(MainWindowViewModel.Selet_dtm("1018"))) + "L";//缸2水 - + get => _ID3036; + set + { + _ID3036 = value; + OnPropertyChanged("ID3036"); + } + } + public bool ID3037 + { + get => _ID3037; + set + { + _ID3037 = value; + OnPropertyChanged("ID3037"); + } + } + public bool ID3038 + { + get => _ID3038; + set + { + _ID3038 = value; + OnPropertyChanged("ID3038"); + } + } + public bool ID3046 + { + get => _ID3046; + set + { + _ID3046 = value; + OnPropertyChanged("ID3046"); + } + } + public bool ID3047 + { + get => _ID3047; + set + { + _ID3047 = value; + OnPropertyChanged("ID3047"); + } + } + public bool ID3048 + { + get => _ID3048; + set + { + _ID3048 = value; + OnPropertyChanged("ID3048"); + } + } + public bool ID3044 + { + get => _ID3044; + set + { + _ID3044 = value; + OnPropertyChanged("ID3044"); + } + } + public bool ID3054 + { + get => _ID3054; + set + { + _ID3054 = value; + OnPropertyChanged("ID3054"); + } + } + public bool ID3076 + { + get => _ID3076; + set + { + _ID3076 = value; + OnPropertyChanged("ID3076"); + } + } + public bool ID3077 + { + get => _ID3077; + set + { + _ID3077 = value; + OnPropertyChanged("ID3077"); + } + } + private void UserControl_Loaded(object sender, RoutedEventArgs e) + { + if (MainWindowViewModel.MT20 == 1) + { + MP1.Visibility = Visibility.Collapsed; + MPF1.Visibility = Visibility.Collapsed; + MP2.Visibility = Visibility.Collapsed; + MPF2.Visibility = Visibility.Collapsed; + } + else if (MainWindowViewModel.MT20 == 2) + { + MP2.Visibility = Visibility.Collapsed; + MPF2.Visibility = Visibility.Collapsed; + } + CountDown(); + IOdata(); } + void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S + { + IOdata(); + } public void CountDown() { DispatcherTimer timer1s = new DispatcherTimer//初始化循环，每1秒调用一次Tick @@ -100,21 +282,151 @@ namespace DyeingComputer.View timer1s.Start(); } - - - private void ID3007_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) { ID3007 = !ID3007; + MainWindowViewModel.Updata_dtd("3007", ID3007); } private void ID3008_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) { ID3008 = !ID3008; + MainWindowViewModel.Updata_dtd("3008", ID3008); + } + private void ID3009_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3009 = !ID3009; + MainWindowViewModel.Updata_dtd("3009", ID3009); + } + private void ID3010_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3010 = !ID3010; + MainWindowViewModel.Updata_dtd("3010", ID3010); + } + private void ID3013_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3013 = !ID3013; + MainWindowViewModel.Updata_dtd("3013", ID3013); + } + private void ID3014_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3014 = !ID3014; + MainWindowViewModel.Updata_dtd("3014", ID3014); + } + private void ID3015_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3015 = !ID3015; + MainWindowViewModel.Updata_dtd("3015", ID3015); + } + private void ID3016_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3016 = !ID3016; + MainWindowViewModel.Updata_dtd("3016", ID3016); + } + private void ID3017_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3017 = !ID3017; + MainWindowViewModel.Updata_dtd("3017", ID3017); + } + private void ID3018_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3018 = !ID3018; + MainWindowViewModel.Updata_dtd("3018", ID3018); + } + private void ID3019_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3019 = !ID3019; + MainWindowViewModel.Updata_dtd("3019", ID3019); } private void ID3020_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) { ID3020 = !ID3020; + MainWindowViewModel.Updata_dtd("3020", ID3020); + } + private void ID3036_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3036 = !ID3036; + MainWindowViewModel.Updata_dtd("3036", ID3036); + } + private void ID3037_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3037 = !ID3037; + MainWindowViewModel.Updata_dtd("3037", ID3037); + } + private void ID3038_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3038 = !ID3038; + MainWindowViewModel.Updata_dtd("3038", ID3038); + } + private void ID3044_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3044 = !ID3044; + MainWindowViewModel.Updata_dtd("3044", ID3044); + } + private void ID3046_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3046 = !ID3046; + MainWindowViewModel.Updata_dtd("3046", ID3046); + } + private void ID3047_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3047 = !ID3047; + MainWindowViewModel.Updata_dtd("3047", ID3047); + } + private void ID3048_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3048 = !ID3048; + MainWindowViewModel.Updata_dtd("3048", ID3048); + } + private void ID3054_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3054 = !ID3054; + MainWindowViewModel.Updata_dtd("3054", ID3054); + } + private void ID3076_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3076 = !ID3076; + MainWindowViewModel.Updata_dtd("3076", ID3076); + } + private void ID3077_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3077 = !ID3077; + MainWindowViewModel.Updata_dtd("3077", ID3077); + } + + + private void IOdata() + { + M_T.Text = string.Format(" {0:F1}", Convert.ToDouble(MainWindowViewModel.Selet_dtm("1010"))) + "°C";//主缸温度 + M_L.Text = string.Format("{0:D4}", Convert.ToInt16(MainWindowViewModel.Selet_dtm("1015"))) + "L";//主缸水 + S1_T.Text = string.Format(" {0:F1}", Convert.ToDouble(MainWindowViewModel.Selet_dtm("1012"))) + "°C";//缸1温度 + S1_L.Text = string.Format("{0:D4}", Convert.ToInt16(MainWindowViewModel.Selet_dtm("1017"))) + "L";//缸1水 + S2_T.Text = string.Format(" {0:F1}", Convert.ToDouble(MainWindowViewModel.Selet_dtm("1013"))) + "°C";//缸2温度 + S2_L.Text = string.Format("{0:D4}", Convert.ToInt16(MainWindowViewModel.Selet_dtm("1018"))) + "L";//缸2水 + MtH.Text = string.Format(" {0:P1}", Convert.ToDouble(MainWindowViewModel.Selet_dta("5001"))/10);//升温 + Mtl.Text = string.Format(" {0:P1}", Convert.ToDouble(MainWindowViewModel.Selet_dta("5002"))/10) ;//降温 + + ID3007 = MainWindowViewModel.Selet_dtd("3007"); + ID3008 = MainWindowViewModel.Selet_dtd("3008"); + ID3009 = MainWindowViewModel.Selet_dtd("3009"); + ID3010 = MainWindowViewModel.Selet_dtd("3010"); + ID3013 = MainWindowViewModel.Selet_dtd("3013"); + ID3014 = MainWindowViewModel.Selet_dtd("3014"); + ID3015 = MainWindowViewModel.Selet_dtd("3015"); + ID3016 = MainWindowViewModel.Selet_dtd("3016"); + ID3017 = MainWindowViewModel.Selet_dtd("3017"); + ID3018 = MainWindowViewModel.Selet_dtd("3018"); + ID3019 = MainWindowViewModel.Selet_dtd("3019"); + ID3020 = MainWindowViewModel.Selet_dtd("3020"); + ID3036 = MainWindowViewModel.Selet_dtd("3036"); + ID3037 = MainWindowViewModel.Selet_dtd("3037"); + ID3038 = MainWindowViewModel.Selet_dtd("3038"); + ID3044 = MainWindowViewModel.Selet_dtd("3044"); + ID3046 = MainWindowViewModel.Selet_dtd("3046"); + ID3047 = MainWindowViewModel.Selet_dtd("3047"); + ID3048 = MainWindowViewModel.Selet_dtd("3048"); + ID3054 = MainWindowViewModel.Selet_dtd("3054"); + ID3076 = MainWindowViewModel.Selet_dtd("3076"); + ID3077 = MainWindowViewModel.Selet_dtd("3077"); } - } } diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 6a3e09f..c84a199 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -328,6 +328,8 @@ namespace DyeingComputer.ViewModel private static double MT16;//流量计数系数 public static int MT17;// public static int MT18;//主缸管数 + public static int MT19;// + public static int MT20;//管数 private static double MT33;//主缸温度偏差 private int MT38;//高水位 private int MT39;//中水位 @@ -408,6 +410,8 @@ namespace DyeingComputer.ViewModel MT16 = Convert.ToDouble(Selet_con("MT16"));//流量计数系数 MT17 = Convert.ToInt16(Selet_con("MT17"));// MT18 = Convert.ToInt16(Selet_con("MT18"));// + MT19 = Convert.ToInt16(Selet_con("MT19"));// + MT20 = Convert.ToInt16(Selet_con("MT20"));// MT33 = Convert.ToDouble(Selet_con("MT33"));//温度偏差参数 MT38 = Convert.ToInt16(Selet_con("MT38"));// MT39 = Convert.ToInt16(Selet_con("MT39"));// @@ -941,7 +945,7 @@ namespace DyeingComputer.ViewModel STEP_finish = false; break; case "041": - SETP_runtime = false; + SETP_runtime = true; STEP_finish = false; break; case "049": @@ -1763,6 +1767,7 @@ namespace DyeingComputer.ViewModel Updata_dtd((3000 + i).ToString(), false); } if (errTabler.Rows.Count == 0) Status_Str = Resources.End; + WORK_RUN = 0; break;//结束 case "049": if (Selet_dtd("2004")|| UserCall_OK) @@ -2432,7 +2437,6 @@ namespace DyeingComputer.ViewModel double T_P4 = Convert.ToDouble(arrRows[0]["Parameter4"].ToString()); double T_P5 = Convert.ToDouble(arrRows[0]["Parameter5"].ToString()); STEP_START(T_ID, T_P1, T_P2, T_P3, T_P4, T_P5); - /* if (arrRows.First().Field("StepID_S1") != null) { STEP_IDp1 = (string)arrRows[0]["StepID_S1"]; @@ -2460,7 +2464,6 @@ namespace DyeingComputer.ViewModel STEP_P4p3 = (double)arrRows[0]["Parameter4_S3"]; STEP_P5p3 = (double)arrRows[0]["Parameter5_S3"]; }*/ - APILog.LOGlog(WorkNumder.ToString(), "Process", "Next", "STEP = " + RUN_STEPID + ";StepID=" + T_ID + ";P1=" + T_P1 + ";P2=" + T_P2 + ";P3=" + T_P3 + ";P4=" + T_P4 + ";P5=" + T_P5); if (ViewID == 1) { sys_workSTEPID = RUN_STEPID; } else { sys_workSTEPID = -1; } @@ -2474,21 +2477,17 @@ namespace DyeingComputer.ViewModel else if (WORK_RUN == 1) { Status_Str = Resources.Paused; - for (int i = 4; i < DQ_DL; i++) + /* for (int i = 4; i < DQ_DL; i++) { Updata_dtd((3000 + i).ToString(), false); - } + }*/ } else if (WORK_RUN == 0) { // if (Status_Str == Resources.Paused) // { Updata_dtm("1004", 0); - Updata_dtm("1005", Selet_dtm("1010")); - for (int i = 1; i < DQ_DL; i++) - { - Updata_dtd((3000+i).ToString(), false); - } + Updata_dtm("1005", Selet_dtm("1010")); // }//清除输出状态 if (errTabler.Rows.Count == 0) {