From 60dae81ccd16a1bd4f5af3b2c5b561e201ec97da Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Thu, 28 Jan 2021 20:40:01 +0200 Subject: Added support for light inks cleaner 10' ids pack ! --- Software/DB/PPC/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/PPC/Tango_log.ldf | Bin 53673984 -> 53673984 bytes Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 22675456 -> 22675456 bytes .../FSE/Tango.FSE.Common/Controls/MachineView.xaml | 5 +- .../ViewModels/MainViewVM.cs | 4 +- .../Views/ConfigurationView.xaml | 5 +- .../Views/MachineView.xaml | 5 +- .../Dialogs/CleanerDispensingViewVM.cs | 11 +- .../Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs | 16 +++ .../Tango.BL/Entities/BrushStopBase.cs | 76 ++++++++++ .../Tango.DAL.Remote/DB/BRUSH_STOPS.cs | 2 + .../Tango.DAL.Remote/DB/RemoteADO.edmx | 6 + .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 158 ++++++++++----------- .../Tango.Emulations/Emulators/MachineEmulator.cs | 2 +- 15 files changed, 192 insertions(+), 98 deletions(-) (limited to 'Software') diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf index b4ea2b8a2..10a4a8923 100644 Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf index a1f2ace90..987d86d8b 100644 Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index e2aef1aa6..ac0c70c0d 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index a4af854e7..04aad2339 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineView.xaml index 920795f43..c82b5b460 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineView.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Controls/MachineView.xaml @@ -53,7 +53,7 @@ --> - + 1 2 3 @@ -63,6 +63,7 @@ 7 8 9 + 10 @@ -76,7 +77,7 @@ - + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs index ea9470bb1..3aab57481 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs @@ -263,7 +263,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels _machines_action_timer = new ActionTimer(TimeSpan.FromMilliseconds(200)); _dispensers_action_timer = new ActionTimer(TimeSpan.FromMilliseconds(200)); - AddIdsCommand = new RelayCommand(AddIds, (x) => ActiveMachine != null && ActiveMachine.Configuration != null && ActiveMachine.Configuration.IdsPacks.Count < 9); + AddIdsCommand = new RelayCommand(AddIds, (x) => ActiveMachine != null && ActiveMachine.Configuration != null && ActiveMachine.Configuration.IdsPacks.Count < 10); RemoveIdsCommand = new RelayCommand(RemoveIds, (x) => SelectedIds != null); EditMachineCommand = new RelayCommand(() => LoadSelectedMachine(), () => SelectedMachine != null); BackToMachinesCommand = new RelayCommand(() => View.NavigateTo(MachineDesignerNavigationView.MachinesView)); @@ -546,7 +546,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels if ((newMachine || clone) && machineCreationDialogVM.GenerateDispensers) { - for (int i = 0; i < 9; i++) + for (int i = 0; i < 10; i++) { var serial = machineCreationDialogVM.SerialNumber + "-" + (i + 1); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml index 9253ac440..dbebd270c 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml @@ -134,7 +134,7 @@ - + 1 2 3 @@ -144,6 +144,7 @@ 7 8 9 + 10 @@ -156,7 +157,7 @@ - + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml index fadb9ece0..54e47c0d4 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml @@ -69,7 +69,7 @@ - + 1 2 3 @@ -79,6 +79,7 @@ 7 8 9 + 10 @@ -92,7 +93,7 @@ - + diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingViewVM.cs index d1a02a940..e37be417f 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Dialogs/CleanerDispensingViewVM.cs @@ -78,16 +78,7 @@ namespace Tango.PPC.Maintenance.Dialogs Status = "Dispensing cleaner liquid..."; - IdsPack cleanerPack = null; - - if (MachineProvider.Machine.LightInksInstalled) - { - cleanerPack = MachineProvider.Machine.Configuration.NoneEmptyIdsPacks.FirstOrDefault(x => x.LiquidType.Type == BL.Enumerations.LiquidTypes.TransparentInk); - } - else - { - cleanerPack = MachineProvider.Machine.Configuration.NoneEmptyIdsPacks.FirstOrDefault(x => x.LiquidType.Type == BL.Enumerations.LiquidTypes.Cleaner); - } + var cleanerPack = MachineProvider.Machine.Configuration.NoneEmptyIdsPacks.FirstOrDefault(x => x.LiquidType.Type == BL.Enumerations.LiquidTypes.Cleaner); if (cleanerPack == null) { diff --git a/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs index a26f54847..4b687488a 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs @@ -277,6 +277,22 @@ namespace Tango.BL.DTO get; set; } + /// + /// v9 + /// + public Double V9 + { + get; set; + } + + /// + /// v9 div + /// + public Int32 V9Div + { + get; set; + } + /// /// corrected /// diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs index a752651e2..aa602bc77 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs @@ -87,6 +87,10 @@ namespace Tango.BL.Entities public event EventHandler V8DivChanged; + public event EventHandler V9Changed; + + public event EventHandler V9DivChanged; + public event EventHandler CorrectedChanged; public event EventHandler IsTransparentChanged; @@ -961,6 +965,60 @@ namespace Tango.BL.Entities } } + protected Double _v9; + + /// + /// Gets or sets the brushstopbase v9. + /// + + [Column("V9")] + + public Double V9 + { + get + { + return _v9; + } + + set + { + if (_v9 != value) + { + _v9 = value; + + OnV9Changed(value); + + } + } + } + + protected Int32 _v9div; + + /// + /// Gets or sets the brushstopbase v9 div. + /// + + [Column("V9_DIV")] + + public Int32 V9Div + { + get + { + return _v9div; + } + + set + { + if (_v9div != value) + { + _v9div = value; + + OnV9DivChanged(value); + + } + } + } + protected Boolean _corrected; /// @@ -1465,6 +1523,24 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(V8Div)); } + /// + /// Called when the V9 has changed. + /// + protected virtual void OnV9Changed(Double v9) + { + V9Changed?.Invoke(this, v9); + RaisePropertyChanged(nameof(V9)); + } + + /// + /// Called when the V9Div has changed. + /// + protected virtual void OnV9DivChanged(Int32 v9div) + { + V9DivChanged?.Invoke(this, v9div); + RaisePropertyChanged(nameof(V9Div)); + } + /// /// Called when the Corrected has changed. /// diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs index d8f7776c6..34384cb8f 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs @@ -49,6 +49,8 @@ namespace Tango.DAL.Remote.DB public int V7_DIV { get; set; } public double V8 { get; set; } public int V8_DIV { get; set; } + public double V9 { get; set; } + public int V9_DIV { get; set; } public bool CORRECTED { get; set; } public string COLOR_CATALOG_GUID { get; set; } public string COLOR_CATALOGS_ITEM_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index 1f8eb6454..b12a9f2c0 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -103,6 +103,8 @@ + + @@ -3487,6 +3489,8 @@ + + @@ -6119,6 +6123,8 @@ + + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram index be7e5f5e5..3c5a48489 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,90 +5,90 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs index 5e56191da..ca8bacaa4 100644 --- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs +++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs @@ -158,7 +158,7 @@ namespace Tango.Emulations.Emulators MachineStatus = new MachineStatus(); MachineStatus.State = MachineState.Ready; - for (int i = 0; i < 9; i++) + for (int i = 0; i < 10; i++) { MachineStatus.IDSPacksLevels.Add(new IDSPackLevel() { -- cgit v1.3.1