diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2021-02-01 12:30:29 +0200 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2021-02-01 12:30:29 +0200 |
| commit | 05c3a13600078dfbe6e8c911ab57fa85f11a92bb (patch) | |
| tree | 58b48a92be3632da0811bbc12122386970272a02 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels | |
| parent | d7a2713f1ff4679a7b28a90d1622d1dbfdf06aee (diff) | |
| parent | 49c86b365b94cfc87e92e22dfa388c08215d4c88 (diff) | |
| download | Tango-05c3a13600078dfbe6e8c911ab57fa85f11a92bb.tar.gz Tango-05c3a13600078dfbe6e8c911ab57fa85f11a92bb.zip | |
Merge branch 'Light_Inks' of https://twinetfs.visualstudio.com/Tango/_git/Tango into Light_Inks
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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); |
