From 6e444d582bf493e971764c81c2d6fe59bd7681d2 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 11 Nov 2018 12:49:16 +0200 Subject: Machine Studio v3.5.61 --- .../Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs | 1 + 1 file changed, 1 insertion(+) (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 a0512b310..79b1f1c17 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 @@ -1972,6 +1972,7 @@ namespace Tango.MachineStudio.Developer.ViewModels ActiveJob.Segments.Add(seg); SelectedSegment = seg; AddBrushStop(); + SetSegmentBrushStopsLiquidVolumes(SelectedSegment); ArrangeSegmentsIndices(); } } -- cgit v1.3.1 From 739fd56662cdee59f42ec8d80654babf158b9f51 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 11 Nov 2018 16:18:23 +0200 Subject: Machine Studio v3.5.63 --- .../DeveloperModuleSettings.cs | 2 ++ .../ViewModels/MainViewVM.cs | 27 +++++++++++++++++++++- .../ViewModels/MachineTechViewVM.cs | 13 ++++++++++- .../Properties/AssemblyInfo.cs | 2 +- 4 files changed, 41 insertions(+), 3 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs index 5e0e6d838..e6d5674e1 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModuleSettings.cs @@ -22,6 +22,8 @@ namespace Tango.MachineStudio.Developer public List ProcessParametersIndices { get; set; } + public String DefaultJobRmlGuid { get; set; } + public DeveloperModuleSettings() { ProcessParametersIndices = new List(); 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 79b1f1c17..f15ffb2c7 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 @@ -1773,6 +1773,10 @@ namespace Tango.MachineStudio.Developer.ViewModels SelectedMachineJob.Segments = SelectedMachineJob.Segments; }); + var settings = SettingsManager.Default.GetOrCreate(); + settings.DefaultJobRmlGuid = ActiveJob.RmlGuid; + settings.Save(); + }); } @@ -2015,16 +2019,37 @@ namespace Tango.MachineStudio.Developer.ViewModels { LogManager.Log(String.Format("Adding new job {0}...", jobName)); + var settings = SettingsManager.Default.GetOrCreate(); + Job newJob = new Job(); newJob.Name = jobName; newJob.CreationDate = DateTime.UtcNow; newJob.UserGuid = _authentication.CurrentUser.Guid; - newJob.Rml = _machineDbContext.Rmls.FirstOrDefault(); + + if (String.IsNullOrWhiteSpace(settings.DefaultJobRmlGuid)) + { + newJob.Rml = _machineDbContext.Rmls.FirstOrDefault(); + } + else + { + var rml = _machineDbContext.Rmls.SingleOrDefault(x => x.Guid == settings.DefaultJobRmlGuid); + if (rml != null) + { + newJob.Rml = rml; + } + else + { + newJob.Rml = _machineDbContext.Rmls.FirstOrDefault(); + } + } + newJob.WindingMethod = _machineDbContext.WindingMethods.FirstOrDefault(); newJob.SpoolType = _machineDbContext.SpoolTypes.FirstOrDefault(); newJob.ColorSpace = _machineDbContext.ColorSpaces.FirstOrDefault(); newJob.Machine = SelectedMachine; + + SelectedMachine.Jobs.Add(newJob); var segment = newJob.AddSolidSegment(); segment.BrushStops[0].SetAllDispensingStepDivisions(BL.Dispensing.DispenserStepDivisions.D8); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs index a02e09e9a..4b362688f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs @@ -1276,10 +1276,15 @@ namespace Tango.MachineStudio.Technician.ViewModels }) .Subscribe((response) => { - item.HomingMaximumProgress = response.MaxProgress; item.HomingProgress = response.Progress; + },(ex) => + { + + item.IsHoming = false; + item.IsHomingCompleted = true; + }, () => { @@ -1372,6 +1377,12 @@ namespace Tango.MachineStudio.Technician.ViewModels item.HomingMaximumProgress = response.MaxProgress; item.HomingProgress = response.Progress; + }, (ex) => + { + + item.IsHoming = false; + item.IsHomingCompleted = true; + }, () => { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index de819a61f..b45a71b6a 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("3.5.61.18305")] +[assembly: AssemblyVersion("3.5.62.18305")] [assembly: ComVisible(false)] \ No newline at end of file -- cgit v1.3.1