diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2024-09-03 22:47:14 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2024-09-03 22:47:14 +0300 |
| commit | afaa83f7b7a9fe78e34d069a43b0f2d61cc38b69 (patch) | |
| tree | daa087c9ed287ec83df167fcbb92dd973f38904b /Software/Visual_Studio/Utilities/Tango.MachineEM.UI | |
| parent | 507557c575f9e0cd53a288415d8dd92f7a001b36 (diff) | |
| download | Tango-afaa83f7b7a9fe78e34d069a43b0f2d61cc38b69.tar.gz Tango-afaa83f7b7a9fe78e34d069a43b0f2d61cc38b69.zip | |
Fixed rounding of liquid volumes CMYK and numeric controls.
Better support for TS-1800 waste replace process.
Diffstat (limited to 'Software/Visual_Studio/Utilities/Tango.MachineEM.UI')
| -rw-r--r-- | Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs | 8 | ||||
| -rw-r--r-- | Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs index be77ee217..6b97bae31 100644 --- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/ViewModels/MainViewVM.cs @@ -146,6 +146,8 @@ namespace Tango.MachineEM.UI.ViewModels public RelayCommand PerformDataStoreTestCommand { get; set; } + public RelayCommand RequestWasteReplaceCommand { get; set; } + #endregion #region Constructors @@ -179,6 +181,7 @@ namespace Tango.MachineEM.UI.ViewModels StartThreadLoadingCommand = new RelayCommand(StartThreadLoading, (x) => Emulator.IsStarted && !_isThreadLoading); FinalizeThreadLoadingCommand = new RelayCommand(FinalizeThreadLoading, (x) => Emulator.IsStarted && _isThreadLoading); AbortJobCommand = new RelayCommand(() => Emulator?.AbortJob(), (x) => Emulator.IsStarted); + RequestWasteReplaceCommand = new RelayCommand(RequestWasteReplace, (x) => Emulator.IsStarted); Ports = new List<string>() { @@ -411,6 +414,11 @@ namespace Tango.MachineEM.UI.ViewModels } } + private void RequestWasteReplace() + { + Emulator.RequestWasteEmptying(); + } + #endregion } } diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml index c3c086065..98e70d6a5 100644 --- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml +++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml @@ -82,6 +82,12 @@ <TextBlock VerticalAlignment="Center" Margin="10 0 10 0">CARTRIDGE VALIDATION</TextBlock> </StackPanel> </Button> + <Button Padding="10 0 0 0" Margin="5" Height="45" HorizontalContentAlignment="Left" Style="{StaticResource AccentedSquareButtonStyle}" mahapps:ButtonHelper.PreserveTextCase="True" BorderThickness="0" Command="{Binding RequestWasteReplaceCommand}"> + <StackPanel Orientation="Horizontal"> + <fa:ImageAwesome Icon="Recycle" Width="16"></fa:ImageAwesome> + <TextBlock VerticalAlignment="Center" Margin="10 0 10 0">REQUEST WASTE REPLACE</TextBlock> + </StackPanel> + </Button> <ToggleButton Style="{StaticResource AccentedSquareButtonStyle}" BorderThickness="0" x:Name="toggleLevels" Height="45" Margin="5"> <StackPanel Orientation="Horizontal"> <TextBlock VerticalAlignment="Center" Margin="10 0 10 0">MACHINE STATUS</TextBlock> |