diff --git a/DyeingComputer.csproj b/DyeingComputer.csproj index 5804701..03bfc33 100644 --- a/DyeingComputer.csproj +++ b/DyeingComputer.csproj @@ -402,6 +402,8 @@ + + diff --git a/Lmage/2000.png b/Lmage/2000.png new file mode 100644 index 0000000..fdc911a Binary files /dev/null and b/Lmage/2000.png differ diff --git a/Lmage/2001.png b/Lmage/2001.png new file mode 100644 index 0000000..dc98b45 Binary files /dev/null and b/Lmage/2001.png differ diff --git a/View/EquipmentSimulationView.xaml b/View/EquipmentSimulationView.xaml index 3dc77ef..6f8c104 100644 --- a/View/EquipmentSimulationView.xaml +++ b/View/EquipmentSimulationView.xaml @@ -11,11 +11,45 @@ + + gif:ImageBehavior.RepeatBehavior="Forever" HorizontalAlignment="Left" Canvas.Left="20" + Canvas.Top="180" Visibility="Collapsed" x:Name="Swing_"/> + + + + + + + + + + + + + + + - diff --git a/View/EquipmentSimulationView.xaml.cs b/View/EquipmentSimulationView.xaml.cs index 806f7af..b24296e 100644 --- a/View/EquipmentSimulationView.xaml.cs +++ b/View/EquipmentSimulationView.xaml.cs @@ -32,16 +32,18 @@ namespace DyeingComputer.View void Tick_Event_1S(object sender, EventArgs e)//Tick_Event周期执行事件1S { - 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"; - + 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";//主缸水 + if (MainWindowViewModel.Selet_dtd("3023") || MainWindowViewModel.Selet_dtd("3024"))//摆动显示 + { Swing_.Visibility = Visibility.Visible; } + else { Swing_.Visibility = Visibility.Collapsed; } } public void CountDown() { DispatcherTimer timer1s = new DispatcherTimer//初始化循环,每1秒调用一次Tick { - Interval = TimeSpan.FromSeconds(1)//秒 + Interval = TimeSpan.FromSeconds(2)//秒 }; timer1s.Tick += Tick_Event_1S; timer1s.Start();