diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-02-17 00:21:02 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-02-17 00:21:02 +0200 |
| commit | aeabed7471e61eb5a2e7b122e6f999f96fe47feb (patch) | |
| tree | 52666f1170559e29f7c0b69416e12bbe34585d93 /Software | |
| parent | f4b04f631207a3bc849fd8f4b789cc028926d041 (diff) | |
| download | Tango-aeabed7471e61eb5a2e7b122e6f999f96fe47feb.tar.gz Tango-aeabed7471e61eb5a2e7b122e6f999f96fe47feb.zip | |
Implemented Ink Filling/Waste Emptying popups.
Diffstat (limited to 'Software')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs | 26 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs | 9 |
2 files changed, 30 insertions, 5 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs index 13ad6ed89..42d947326 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs @@ -43,7 +43,14 @@ namespace Tango.PPC.UI.ViewModels { private IMachineProvider _machineProvider; - public CartridgeStatus Status { get; set; } + private CartridgeStatus _status; + public CartridgeStatus Status + { + get { return _status; } + set { _status = value; PreviousState = _status.State; } + } + + public CartridgeState PreviousState { get; set; } public bool InProgress { @@ -462,7 +469,7 @@ namespace Tango.PPC.UI.ViewModels NotificationProvider.ShowInfo("Cannot perform a machine update while the machine is dyeing."); return; } - + NavigationManager.NavigateTo(NavigationView.MachineUpdateView); TangoIOC.Default.GetInstance<MachineUpdateViewVM>().CheckForUpdates(); IsMenuOpened = false; @@ -496,6 +503,21 @@ namespace Tango.PPC.UI.ViewModels if (model != null) { + if (cartridgeStatus != null) + { + if ((cartridgeStatus.State == CartridgeState.Error || cartridgeStatus.State == CartridgeState.EmpyingFailed || cartridgeStatus.State == CartridgeState.FillingFailed) && (model.PreviousState != CartridgeState.Error && model.PreviousState != CartridgeState.FillingFailed && model.PreviousState != CartridgeState.EmpyingFailed)) + { + NotificationProvider.ShowError(cartridgeStatus.Message); + } + + if ((cartridgeStatus.State == CartridgeState.EmptyingCompleted || cartridgeStatus.State == CartridgeState.FillingCompleted) + && + (model.PreviousState != CartridgeState.EmptyingCompleted && model.PreviousState != CartridgeState.FillingCompleted)) + { + NotificationProvider.ShowSuccess(cartridgeStatus.Message); + } + } + model.Status = cartridgeStatus; } } diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs index b3f1d3dc4..19c63bdc5 100644 --- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs +++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs @@ -241,20 +241,23 @@ namespace Tango.Emulations.Emulators Index = i, Slot = CartridgeSlot.Ink, }, - State = CartridgeState.Present + State = CartridgeState.Present, + Message = "This is an emulated ink filling message" }); } InkFillingStatus.CartridgesStatuses.Add(new CartridgeStatus() { Cartridge = new Cartridge() { Index = 0, Slot = CartridgeSlot.WasteMiddle }, - State = CartridgeState.Present + State = CartridgeState.Present, + Message = "This is an emulated waste emptying message" }); InkFillingStatus.CartridgesStatuses.Add(new CartridgeStatus() { Cartridge = new Cartridge() { Index = 1, Slot = CartridgeSlot.WasteLower }, - State = CartridgeState.Present + State = CartridgeState.Present, + Message = "This is an emulated waste emptying message" }); } |