diff options
| author | Mirta <mirta@twine-s.com> | 2021-04-19 17:59:52 +0300 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2021-04-19 17:59:52 +0300 |
| commit | 9cb29ab4e21baccfa08781f3755438749e25b4e7 (patch) | |
| tree | 51764bb5805f17542bbc1108e563dc12ab531d9a /Software/Visual_Studio/MachineStudio | |
| parent | b8a51d8cd2e5e57e489922cece83ae2c97ea7881 (diff) | |
| parent | 84407a4a05344d13076f970ff62d6660d7504231 (diff) | |
| download | Tango-9cb29ab4e21baccfa08781f3755438749e25b4e7.tar.gz Tango-9cb29ab4e21baccfa08781f3755438749e25b4e7.zip | |
Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software
Diffstat (limited to 'Software/Visual_Studio/MachineStudio')
3 files changed, 21 insertions, 3 deletions
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 35e27c834..61791d4b4 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 @@ -895,7 +895,10 @@ namespace Tango.MachineStudio.Developer.ViewModels stop.Corrected = true; stop.IsOutOfGamut = false; } - catch { } + catch (Exception ex) + { + Debug.WriteLine(ex.ToString()); + } } else if (stop.ColorSpace.Code == BL.Enumerations.ColorSpaces.RGB.ToInt32() || stop.ColorSpace.Code == BL.Enumerations.ColorSpaces.LAB.ToInt32()) { @@ -1995,6 +1998,9 @@ namespace Tango.MachineStudio.Developer.ViewModels SelectedMachineJob.Segments = SelectedMachineJob.Segments; }); + SelectedMachineJob.RaisePropertyChanged(x => x.Length); + SelectedMachineJob.RaisePropertyChanged(x => x.EstimatedDurationMili); + var settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>(); settings.DefaultJobRmlGuid = ActiveJob.RmlGuid; settings.Save(); 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 069e33f7e..4e3aa4c93 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 @@ -838,7 +838,19 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels try { IsFree = false; - await SelectedMachine.DeleteCascadeAsync(MachinesAdapter.Context); + + var machineToDelete = await new MachineBuilder(MachinesAdapter.Context).Set(SelectedMachine).WithConfiguration().BuildAsync(); + + await machineToDelete.DeleteCascadeAsync(MachinesAdapter.Context); + await machineToDelete.Configuration.DeleteCascadeAsync(MachinesAdapter.Context); + foreach (var dispenser in machineToDelete.Configuration.NoneEmptyIdsPacks.Select(x => x.Dispenser)) + { + if (dispenser != null) + { + await dispenser.DeleteCascadeAsync(MachinesAdapter.Context); + } + } + _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.MachineDeleted, _authentication.CurrentUser, SelectedMachine.Name, SelectedMachine, "Machine deleted using Machine Studio."); MachinesAdapter.Context.Machines.Remove(SelectedMachine); MachinesAdapter.Machines.Remove(SelectedMachine); 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 0436479bc..c143c7608 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("4.4.6.0")] +[assembly: AssemblyVersion("4.4.8.0")] [assembly: ComVisible(false)]
\ No newline at end of file |