From 591fb3cbef11e81cbf734df5a92826ac5dbd7af8 Mon Sep 17 00:00:00 2001 From: Roy Date: Tue, 14 Feb 2023 13:32:54 +0200 Subject: Fixed MS to PPC connection. --- .../ViewModels/MachineConnectionViewVM.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs index 165841905..c7c8335f0 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs @@ -38,7 +38,16 @@ namespace Tango.MachineStudio.UI.ViewModels public IExternalBridgeClient SelectedMachine { get { return _selectedMachine; } - set { _selectedMachine = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(RequiresAuthentication)); InvalidateRelayCommands(); } + set + { + if (value != null) + { + _selectedMachine = value; + RaisePropertyChangedAuto(); + RaisePropertyChanged(nameof(RequiresAuthentication)); + InvalidateRelayCommands(); + } + } } /// -- cgit v1.3.1 From 846503d5df0203f846f36ad6ad0da8dba596bb0c Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 14 Feb 2023 13:38:30 +0200 Subject: Machine_Studio_v4.9.6 --- .../Advanced Installer Projects/Machine Studio Installer.aip | 6 +++--- .../MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip index 19b3b39d3..d78e37f68 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip @@ -16,10 +16,10 @@ - + - + @@ -845,7 +845,7 @@ - + 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 110772b2d..c87abde49 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.9.5.0")] +[assembly: AssemblyVersion("4.9.6.0")] [assembly: ComVisible(false)] \ No newline at end of file -- cgit v1.3.1 From c4f90cfc1387d1bb1a9ea7f69b1058a7b70e3d49 Mon Sep 17 00:00:00 2001 From: Roy Date: Thu, 16 Feb 2023 18:05:43 +0200 Subject: Several bug fixes. --- .../RealTimeGraphWidgetSettingsView.xaml | 10 +++--- ...ealTimeGraphMultiChannelWidgetSettingsView.xaml | 10 +++--- .../Tango.FSE.Statistics/ViewModels/MainViewVM.cs | 2 +- .../Tango.FSE.Statistics/Views/MainView.xaml | 37 ++++++++++++++++++++-- .../Views/JobView.xaml | 2 +- .../Printing/DefaultPrintingManager.cs | 6 ++++ .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 +- .../Tango.BL/Helpers/SegmentsCsvHelper.cs | 24 ++++++++++++++ 8 files changed, 78 insertions(+), 15 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Project/Widgets/RealTimeGraph/RealTimeGraphWidgetSettingsView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Project/Widgets/RealTimeGraph/RealTimeGraphWidgetSettingsView.xaml index 073d9dc23..823df1ffe 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Project/Widgets/RealTimeGraph/RealTimeGraphWidgetSettingsView.xaml +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Project/Widgets/RealTimeGraph/RealTimeGraphWidgetSettingsView.xaml @@ -26,11 +26,11 @@ - - - - - - + + + - + + Y Min/Max - - - - - - + + + - + + Y Min/Max (AutoCompleteJobs); - StartSelectedDate = DateTime.Now.AddMonths(-1); + StartSelectedDate = DateTime.Now.AddDays(-7); EndSelectedDate = DateTime.Now; LengthUpperValue = 10000; diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml index f65bb8fda..5f0ceaa5a 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml @@ -131,7 +131,7 @@ - + @@ -261,7 +261,40 @@ - + + + + + + + + + + + diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml index 66489e131..4217d9712 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml @@ -762,7 +762,7 @@ - + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs index d920b32a4..f4a3f643d 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs @@ -149,6 +149,8 @@ namespace Tango.PPC.UI.Printing handler.Completed += async (x, e) => { + if (job.Designation == JobDesignations.FineTuning) return; + try { job.JobStatus = JobStatuses.Completed; @@ -179,6 +181,8 @@ namespace Tango.PPC.UI.Printing }; handler.Canceled += (x, e) => { + if (job.Designation == JobDesignations.FineTuning) return; + try { //No change in status ! @@ -192,6 +196,8 @@ namespace Tango.PPC.UI.Printing }; handler.Failed += async (x, e) => { + if (job.Designation == JobDesignations.FineTuning) return; + try { diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index d72e75011..efc5f8179 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - + diff --git a/Software/Visual_Studio/Tango.BL/Helpers/SegmentsCsvHelper.cs b/Software/Visual_Studio/Tango.BL/Helpers/SegmentsCsvHelper.cs index 704e005fe..18dde341b 100644 --- a/Software/Visual_Studio/Tango.BL/Helpers/SegmentsCsvHelper.cs +++ b/Software/Visual_Studio/Tango.BL/Helpers/SegmentsCsvHelper.cs @@ -161,6 +161,14 @@ namespace Tango.BL.Helpers if (rml == null) throw new InvalidOperationException($"Thread type '{threadName}' not found."); } + if (machine.SiteGuid != null) + { + if (!context.SitesRmls.Any(x => x.SiteGuid == machine.SiteGuid && x.RmlGuid == rml.Guid)) + { + throw new InvalidOperationException($"Thread type '{threadName}' is not allowed for this machine's site."); + } + } + var idsPacks = machine.Configuration.NoneEmptyIdsPacks.ToList(); var cyanIdsPack = idsPacks.FirstOrDefault(x => x.LiquidType.Type == LiquidTypes.Cyan); @@ -357,6 +365,14 @@ namespace Tango.BL.Helpers throw new InvalidOperationException($"Catalog '{row.CatalogName1}' not found on line '{lineCount}'."); } + if (machine.SiteGuid != null) + { + if (!context.SitesCatalogs.Any(x => x.SiteGuid == machine.SiteGuid && x.ColorCatalogGuid == catalog.Guid)) + { + throw new InvalidOperationException($"Catalog '{catalog.Name}' is not assigned for this machine's site."); + } + } + var item = catalog.ColorCatalogsGroups.SelectMany(x => x.ColorCatalogsItems).FirstOrDefault(x => x.Name == row.CatalogItem1); if (item == null) { @@ -374,6 +390,14 @@ namespace Tango.BL.Helpers throw new InvalidOperationException($"Catalog '{row.CatalogName2}' not found on line '{lineCount}'."); } + if (machine.SiteGuid != null) + { + if (!context.SitesCatalogs.Any(x => x.SiteGuid == machine.SiteGuid && x.ColorCatalogGuid == catalog2.Guid)) + { + throw new InvalidOperationException($"Catalog '{catalog2.Name}' is not assigned for this machine's site."); + } + } + var item2 = catalog2.ColorCatalogsGroups.SelectMany(x => x.ColorCatalogsItems).FirstOrDefault(x => x.Name == row.CatalogItem2); if (item2 == null) { -- cgit v1.3.1