diff --git a/View/EquipmentSimulationView.xaml b/View/EquipmentSimulationView.xaml index 1a2b393..2d0b7e8 100644 --- a/View/EquipmentSimulationView.xaml +++ b/View/EquipmentSimulationView.xaml @@ -428,7 +428,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + @@ -575,12 +689,12 @@ + Margin="88,322,0,0" > + HorizontalAlignment="Right" VerticalAlignment="Top"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/View/EquipmentSimulationView.xaml.cs b/View/EquipmentSimulationView.xaml.cs index 88369a0..995154a 100644 --- a/View/EquipmentSimulationView.xaml.cs +++ b/View/EquipmentSimulationView.xaml.cs @@ -48,9 +48,11 @@ namespace DyeingComputer.View CountDown(); IOdata(); } - bool _ID3007, _ID3008, _ID3009, _ID3010, _ID3013, _ID3014, _ID3015, _ID3016, - _ID3017, _ID3018, _ID3019, _ID3020, _ID3036, _ID3037, - _ID3038, _ID3046, _ID3047, _ID3048, _ID3044, _ID3054, _ID3076, _ID3077; + bool _ID3007, _ID3008, _ID3009, _ID3010, _ID3013, _ID3014, _ID3015, + _ID3016, _ID3017, _ID3018, _ID3019, _ID3020, _ID3036, _ID3037, + _ID3038, _ID3039, _ID3041, _ID3042, _ID3043, _ID3044, _ID3046, + _ID3047, _ID3048, _ID3049, _ID3051, _ID3052, _ID3053, + _ID3054, _ID3076, _ID3077; public bool ID3007 { get => _ID3007; @@ -186,6 +188,51 @@ namespace DyeingComputer.View OnPropertyChanged("ID3038"); } } + public bool ID3039 + { + get => _ID3039; + set + { + _ID3039 = value; + OnPropertyChanged("ID3039"); + } + } + public bool ID3041 + { + get => _ID3041; + set + { + _ID3041 = value; + OnPropertyChanged("ID3041"); + } + } + public bool ID3042 + { + get => _ID3042; + set + { + _ID3042 = value; + OnPropertyChanged("ID3042"); + } + } + public bool ID3043 + { + get => _ID3043; + set + { + _ID3043 = value; + OnPropertyChanged("ID3043"); + } + } + public bool ID3044 + { + get => _ID3044; + set + { + _ID3044 = value; + OnPropertyChanged("ID3044"); + } + } public bool ID3046 { get => _ID3046; @@ -213,13 +260,40 @@ namespace DyeingComputer.View OnPropertyChanged("ID3048"); } } - public bool ID3044 + public bool ID3049 { - get => _ID3044; + get => _ID3049; set { - _ID3044 = value; - OnPropertyChanged("ID3044"); + _ID3049 = value; + OnPropertyChanged("ID3049"); + } + } + public bool ID3051 + { + get => _ID3051; + set + { + _ID3051 = value; + OnPropertyChanged("ID3051"); + } + } + public bool ID3052 + { + get => _ID3052; + set + { + _ID3052 = value; + OnPropertyChanged("ID3052"); + } + } + public bool ID3053 + { + get => _ID3053; + set + { + _ID3053 = value; + OnPropertyChanged("ID3053"); } } public bool ID3054 @@ -357,6 +431,26 @@ namespace DyeingComputer.View ID3038 = !ID3038; MainWindowViewModel.Updata_dtd("3038", ID3038); } + private void ID3039_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3039 = !ID3039; + MainWindowViewModel.Updata_dtd("3039", ID3039); + } + private void ID3041_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3041 = !ID3041; + MainWindowViewModel.Updata_dtd("3041", ID3041); + } + private void ID3042_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3042 = !ID3042; + MainWindowViewModel.Updata_dtd("3042", ID3042); + } + private void ID3043_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3043 = !ID3043; + MainWindowViewModel.Updata_dtd("3043", ID3043); + } private void ID3044_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) { ID3044 = !ID3044; @@ -377,6 +471,26 @@ namespace DyeingComputer.View ID3048 = !ID3048; MainWindowViewModel.Updata_dtd("3048", ID3048); } + private void ID3049_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3049 = !ID3049; + MainWindowViewModel.Updata_dtd("3049", ID3049); + } + private void ID3051_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3051 = !ID3051; + MainWindowViewModel.Updata_dtd("3051", ID3051); + } + private void ID3052_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3052 = !ID3052; + MainWindowViewModel.Updata_dtd("3052", ID3052); + } + private void ID3053_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) + { + ID3053 = !ID3053; + MainWindowViewModel.Updata_dtd("3053", ID3053); + } private void ID3054_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) { ID3054 = !ID3054; @@ -420,10 +534,18 @@ namespace DyeingComputer.View ID3036 = MainWindowViewModel.Selet_dtd("3036"); ID3037 = MainWindowViewModel.Selet_dtd("3037"); ID3038 = MainWindowViewModel.Selet_dtd("3038"); + ID3039 = MainWindowViewModel.Selet_dtd("3039"); + ID3041 = MainWindowViewModel.Selet_dtd("3041"); + ID3042 = MainWindowViewModel.Selet_dtd("3042"); + ID3043 = MainWindowViewModel.Selet_dtd("3043"); ID3044 = MainWindowViewModel.Selet_dtd("3044"); ID3046 = MainWindowViewModel.Selet_dtd("3046"); ID3047 = MainWindowViewModel.Selet_dtd("3047"); ID3048 = MainWindowViewModel.Selet_dtd("3048"); + ID3049 = MainWindowViewModel.Selet_dtd("3049"); + ID3051 = MainWindowViewModel.Selet_dtd("3051"); + ID3052 = MainWindowViewModel.Selet_dtd("3052"); + ID3053 = MainWindowViewModel.Selet_dtd("3053"); 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 c84a199..13c8989 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -733,7 +733,7 @@ namespace DyeingComputer.ViewModel { //Console.WriteLine($"{hardwareItem.Name} - {sensor.Name}: {sensor.Value.Value}°C"); // 实际应用中,你可能需要将这里的数据绑定到UI控件或存储起来 - Hardware.Add(sensor.Name+":"+sensor.SensorType, sensor.Value.Value); + // Hardware.Add(sensor.Name+":"+sensor.SensorType, sensor.Value.Value); } } }