From 9823b433c62ed173671923c32ccccadc1d06c0bd Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 28 Feb 2018 16:29:45 +0200 Subject: Lots of work !!! --- .../Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index 500f847ed..58d8de558 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -87,6 +87,17 @@ namespace Tango.MachineStudio.Developer.ViewModels set { _windingMethods = value; RaisePropertyChangedAuto(); } } + private ObservableCollection _spoolTypes; + /// + /// Gets or sets the spool types. + /// + public ObservableCollection SpoolTypes + { + get { return _spoolTypes; } + set { _spoolTypes = value; RaisePropertyChangedAuto(); } + } + + /// /// Gets or sets the application manager. /// @@ -1127,6 +1138,7 @@ namespace Tango.MachineStudio.Developer.ViewModels ColorSpaces = _activeJobDbContext.ColorSpaces.ToObservableCollection(); Rmls = _activeJobDbContext.Rmls.ToObservableCollection(); WindingMethods = _activeJobDbContext.WindingMethods.ToObservableCollection(); + SpoolTypes = _activeJobDbContext.SpoolTypes.ToObservableCollection(); LogManager.Log("Setting active job..."); _activeJob = _activeJobDbContext.Jobs.SingleOrDefault(x => x.Guid == SelectedMachineJob.Guid); @@ -1387,6 +1399,7 @@ namespace Tango.MachineStudio.Developer.ViewModels newJob.User = _authentication.CurrentUser; newJob.Rml = _machineDbContext.Rmls.FirstOrDefault(); newJob.WindingMethod = _machineDbContext.WindingMethods.FirstOrDefault(); + newJob.SpoolType = _machineDbContext.SpoolTypes.FirstOrDefault(); newJob.Machine = SelectedMachine; SelectedMachine.Jobs.Add(newJob); -- cgit v1.3.1