diff --git a/MainWindow.xaml b/MainWindow.xaml index 5989128..399d02b 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -58,19 +58,43 @@ - - - - - - + + + + + + - - - - - - + + + + + + @@ -83,7 +107,6 @@ TextWrapping="Wrap" VerticalAlignment="Top" Width="100" FontSize="12" Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}" IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/> - - - - + + diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index f6a085c..44feac8 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -115,6 +115,8 @@ namespace DyeingComputer.ViewModel _ = AsyncTcpServer.Main(); IsInteractive = false; UserButton = false; + Lock_bool = false; + Link_bool = false; ProgramgroupView_run = new RelayCommand( execute:ProgramgroupView_run_ );//开始/暂停事件 @@ -307,6 +309,26 @@ namespace DyeingComputer.ViewModel OnPropertyChanged("UserButton"); } } + bool _Lock_bool; + public bool Lock_bool//锁图标 + { + get => _Lock_bool; + set + { + _Lock_bool = value; + OnPropertyChanged("Lock_bool"); + } + } + bool _Link_bool; + public bool Link_bool//连接图标 + { + get => _Link_bool; + set + { + _Link_bool = value; + OnPropertyChanged("Link_bool"); + } + } public string work_Temp; //显示温度 public string Work_Temp //通知UI控件参数改变 {