From 8e15f292e2950cac71282923adc357f2abf8b306 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Fri, 12 Sep 2025 13:47:16 +0300 Subject: Extra Inks Catalogs. --- .../Excel/ColorItem.cs | 6 + .../Templates/ExportTemplate.xlsx | Bin 21324 -> 22099 bytes .../ViewModels/MainViewVM.cs | 12 ++ .../Views/CatalogView.xaml | 16 +- .../Dialogs/VectorFineTuningDialogVM.cs | 36 +++- .../Tango.PPC.JobsV2/Models/BrushStopModel.cs | 15 +- .../Models/LiquidVolumesCollection.cs | 6 + .../Tango.BL/DTO/ColorCatalogsItemDTOBase.cs | 48 +++++ .../Visual_Studio/Tango.BL/Entities/BrushStop.cs | 28 ++- .../Tango.BL/Entities/ColorCatalogsItemBase.cs | 228 +++++++++++++++++++++ .../Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS.cs | 6 + .../Tango.DAL.Remote/DB/RemoteADO.edmx | 18 ++ .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 194 +++++++++--------- .../SQLExaminer/Configurations/OverrideData.xml | Bin 98058 -> 98548 bytes 14 files changed, 499 insertions(+), 114 deletions(-) (limited to 'Software/Visual_Studio') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorItem.cs index 9d5011325..81d309bcc 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorItem.cs @@ -24,6 +24,12 @@ namespace Tango.MachineStudio.Catalogs.Excel public double Magenta { get; set; } public double Yellow { get; set; } public double Black { get; set; } + public double BlueExtra { get; set; } + public double NavyExtra { get; set; } + public double OrangeExtra { get; set; } + public double RedExtra { get; set; } + public double RubineExtra { get; set; } + public double VioletExtra { get; set; } public int Region { get; set; } } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate.xlsx b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate.xlsx index e57422725..27e5f84cf 100644 Binary files a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate.xlsx and b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate.xlsx differ diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs index ac00af5b0..88f14fa09 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs @@ -454,6 +454,12 @@ namespace Tango.MachineStudio.Catalogs.ViewModels Magenta = x.Magenta, Yellow = x.Yellow, Black = x.Black, + BlueExtra = x.BlueExtra, + NavyExtra = x.NavyExtra, + OrangeExtra = x.OrangeExtra, + RedExtra = x.RedExtra, + RubineExtra = x.RubineExtra, + VioletExtra = x.VioletExtra, Region = x.ProcessParametersTableIndex, }).ToList(); @@ -581,6 +587,12 @@ namespace Tango.MachineStudio.Catalogs.ViewModels existinItem.Magenta = item.Magenta; existinItem.Yellow = item.Yellow; existinItem.Black = item.Black; + existinItem.BlueExtra = item.BlueExtra; + existinItem.NavyExtra = item.NavyExtra; + existinItem.OrangeExtra = item.OrangeExtra; + existinItem.RedExtra = item.RedExtra; + existinItem.RubineExtra = item.RubineExtra; + existinItem.VioletExtra = item.VioletExtra; existinItem.ProcessParametersTableIndex = item.Region; if (inserting) diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml index 5a49c93d3..1cc8c391b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml @@ -164,7 +164,7 @@ - + GROUP COLORS () @@ -195,10 +195,16 @@ - + - - + + + + + + + + @@ -206,7 +212,7 @@ - + COLOR MEDIA RECIPES () diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs index a597a4c50..b24611796 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs @@ -809,10 +809,38 @@ namespace Tango.PPC.Jobs.Dialogs TargetB = BrushStopModel.ColorCatalogsItem.B; BrushStopModel.PreventPropertyUpdate = true; BrushStopModel.LiquidVolumes.ResetVolume(); - BrushStopModel.LiquidVolumes.GetLiquidVolume(LiquidTypes.Cyan).Volume = brushstop.ColorCatalogsItem.Cyan; - BrushStopModel.LiquidVolumes.GetLiquidVolume(LiquidTypes.Magenta).Volume = brushstop.ColorCatalogsItem.Magenta; - BrushStopModel.LiquidVolumes.GetLiquidVolume(LiquidTypes.Yellow).Volume = brushstop.ColorCatalogsItem.Yellow; - BrushStopModel.LiquidVolumes.GetLiquidVolume(LiquidTypes.Black).Volume = brushstop.ColorCatalogsItem.Black; + + var cyanVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("cyan"); + if (cyanVolume != null) cyanVolume.Volume = brushstop.ColorCatalogsItem.Cyan; + + var magentaVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("magenta"); + if (magentaVolume != null) magentaVolume.Volume = brushstop.ColorCatalogsItem.Magenta; + + var yellowVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("yellow"); + if (yellowVolume != null) yellowVolume.Volume = brushstop.ColorCatalogsItem.Yellow; + + var blackVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("black"); + if (blackVolume != null) blackVolume.Volume = brushstop.ColorCatalogsItem.Black; + + var blueVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("blue"); + if (blueVolume != null) blueVolume.Volume = brushstop.ColorCatalogsItem.Blue; + + var navyVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("navy"); + if (navyVolume != null) navyVolume.Volume = brushstop.ColorCatalogsItem.NavyExtra; + + var orangeVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("orange"); + if (orangeVolume != null) orangeVolume.Volume = brushstop.ColorCatalogsItem.OrangeExtra; + + var redVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("red"); + if (redVolume != null) redVolume.Volume = brushstop.ColorCatalogsItem.RedExtra; + + var rubineVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("rubine"); + if (rubineVolume != null) rubineVolume.Volume = brushstop.ColorCatalogsItem.RubineExtra; + + var violetVolume = BrushStopModel.LiquidVolumes.FindLiquidVolumeForCatalog("violet"); + if (violetVolume != null) violetVolume.Volume = brushstop.ColorCatalogsItem.VioletExtra; + + BrushStopModel.PreventPropertyUpdate = false; IsOnlyManual = false; } diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs index 5634f783e..dd82d8d1a 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs @@ -1351,10 +1351,17 @@ namespace Tango.PPC.Jobs.Models if (ColorCatalogsItem != null) { LiquidVolumes.ResetVolumeSilent(); - LiquidVolumes.GetLiquidVolume(LiquidTypes.Cyan).SetVolumeSilent(ColorCatalogsItem.Cyan); - LiquidVolumes.GetLiquidVolume(LiquidTypes.Magenta).SetVolumeSilent(ColorCatalogsItem.Magenta); - LiquidVolumes.GetLiquidVolume(LiquidTypes.Yellow).SetVolumeSilent(ColorCatalogsItem.Yellow); - LiquidVolumes.GetLiquidVolume(LiquidTypes.Black).SetVolumeSilent(ColorCatalogsItem.Black); + + LiquidVolumes.FindLiquidVolumeForCatalog("cyan")?.SetVolumeSilent(ColorCatalogsItem.Cyan); + LiquidVolumes.FindLiquidVolumeForCatalog("magenta")?.SetVolumeSilent(ColorCatalogsItem.Magenta); + LiquidVolumes.FindLiquidVolumeForCatalog("yellow")?.SetVolumeSilent(ColorCatalogsItem.Yellow); + LiquidVolumes.FindLiquidVolumeForCatalog("black")?.SetVolumeSilent(ColorCatalogsItem.Black); + LiquidVolumes.FindLiquidVolumeForCatalog("blue")?.SetVolumeSilent(ColorCatalogsItem.BlueExtra); + LiquidVolumes.FindLiquidVolumeForCatalog("navy")?.SetVolumeSilent(ColorCatalogsItem.NavyExtra); + LiquidVolumes.FindLiquidVolumeForCatalog("orange")?.SetVolumeSilent(ColorCatalogsItem.OrangeExtra); + LiquidVolumes.FindLiquidVolumeForCatalog("red")?.SetVolumeSilent(ColorCatalogsItem.RedExtra); + LiquidVolumes.FindLiquidVolumeForCatalog("rubine")?.SetVolumeSilent(ColorCatalogsItem.RubineExtra); + LiquidVolumes.FindLiquidVolumeForCatalog("violet")?.SetVolumeSilent(ColorCatalogsItem.VioletExtra); LiquidVolumes.RaiseVolume(); IsOutOfGamut = false; // RaisePropertyChanged(nameof(IsLiquidVolumesOutOfRange)); diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/LiquidVolumesCollection.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/LiquidVolumesCollection.cs index 704fc36b0..8eaae4452 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/LiquidVolumesCollection.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/LiquidVolumesCollection.cs @@ -43,6 +43,12 @@ namespace Tango.PPC.Jobs.Models return this.FirstOrDefault(x => x.IdsPack.LiquidType.Type == (LiquidTypes)type); } + public LiquidVolumeModel FindLiquidVolumeForCatalog(String name) + { + var volume = this.Where(x => x.IdsPack.LiquidType.HasPigment && !x.IdsPack.LiquidType.IsLightInk).FirstOrDefault(x => x.IdsPack.LiquidType.Type.ToString().ToLower().Contains(name.ToLower())); + return volume; + } + public void Undo() { this.ToList().ForEach(x => x.Undo()); diff --git a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs index 4b2609281..519af0f96 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ColorCatalogsItemDTOBase.cs @@ -141,5 +141,53 @@ namespace Tango.BL.DTO get; set; } + /// + /// blue extra + /// + public Double BlueExtra + { + get; set; + } + + /// + /// navy extra + /// + public Double NavyExtra + { + get; set; + } + + /// + /// orange extra + /// + public Double OrangeExtra + { + get; set; + } + + /// + /// red extra + /// + public Double RedExtra + { + get; set; + } + + /// + /// rubine extra + /// + public Double RubineExtra + { + get; set; + } + + /// + /// violet extra + /// + public Double VioletExtra + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs index f41cfec9c..b26576647 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs @@ -684,17 +684,37 @@ namespace Tango.BL.Entities { if (LiquidVolumes != null) { - var cyan = LiquidVolumes.FirstOrDefault(x => x.LiquidType == LiquidTypes.Cyan); + var noneLightLiquidVolumes = LiquidVolumes.Where(x => !x.IdsPack.LiquidType.IsLightInk && x.IdsPack.LiquidType.HasPigment).ToList(); + + var cyan = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("cyan")); if (cyan != null) cyan.Volume = ColorCatalogsItem.Cyan; - var magenta = LiquidVolumes.FirstOrDefault(x => x.LiquidType == LiquidTypes.Magenta); + var magenta = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("magenta")); if (magenta != null) magenta.Volume = ColorCatalogsItem.Magenta; - var yellow = LiquidVolumes.FirstOrDefault(x => x.LiquidType == LiquidTypes.Yellow); + var yellow = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("yellow")); if (yellow != null) yellow.Volume = ColorCatalogsItem.Yellow; - var black = LiquidVolumes.FirstOrDefault(x => x.LiquidType == LiquidTypes.Black); + var black = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("black")); if (black != null) black.Volume = ColorCatalogsItem.Black; + + var blue = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("blue")); + if (blue != null) blue.Volume = ColorCatalogsItem.BlueExtra; + + var navy = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("navy")); + if (navy != null) navy.Volume = ColorCatalogsItem.NavyExtra; + + var orange = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("orange")); + if (orange != null) orange.Volume = ColorCatalogsItem.OrangeExtra; + + var red = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("red")); + if (red != null) red.Volume = ColorCatalogsItem.RedExtra; + + var rubine = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("rubine")); + if (rubine != null) red.Volume = ColorCatalogsItem.RubineExtra; + + var violet = noneLightLiquidVolumes.FirstOrDefault(x => x.LiquidType.ToString().ToLower().Contains("violet")); + if (violet != null) violet.Volume = ColorCatalogsItem.VioletExtra; } } catch (Exception ex) diff --git a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs index 30d77a051..b866dc6fe 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ColorCatalogsItemBase.cs @@ -55,6 +55,18 @@ namespace Tango.BL.Entities public event EventHandler ProcessParametersTableIndexChanged; + public event EventHandler BlueExtraChanged; + + public event EventHandler NavyExtraChanged; + + public event EventHandler OrangeExtraChanged; + + public event EventHandler RedExtraChanged; + + public event EventHandler RubineExtraChanged; + + public event EventHandler VioletExtraChanged; + public event EventHandler> BrushStopsChanged; public event EventHandler ColorCatalogsGroupChanged; @@ -465,6 +477,168 @@ namespace Tango.BL.Entities } } + protected Double _blueextra; + + /// + /// Gets or sets the colorcatalogsitembase blue extra. + /// + + [Column("BLUE_EXTRA")] + + public Double BlueExtra + { + get + { + return _blueextra; + } + + set + { + if (_blueextra != value) + { + _blueextra = value; + + OnBlueExtraChanged(value); + + } + } + } + + protected Double _navyextra; + + /// + /// Gets or sets the colorcatalogsitembase navy extra. + /// + + [Column("NAVY_EXTRA")] + + public Double NavyExtra + { + get + { + return _navyextra; + } + + set + { + if (_navyextra != value) + { + _navyextra = value; + + OnNavyExtraChanged(value); + + } + } + } + + protected Double _orangeextra; + + /// + /// Gets or sets the colorcatalogsitembase orange extra. + /// + + [Column("ORANGE_EXTRA")] + + public Double OrangeExtra + { + get + { + return _orangeextra; + } + + set + { + if (_orangeextra != value) + { + _orangeextra = value; + + OnOrangeExtraChanged(value); + + } + } + } + + protected Double _redextra; + + /// + /// Gets or sets the colorcatalogsitembase red extra. + /// + + [Column("RED_EXTRA")] + + public Double RedExtra + { + get + { + return _redextra; + } + + set + { + if (_redextra != value) + { + _redextra = value; + + OnRedExtraChanged(value); + + } + } + } + + protected Double _rubineextra; + + /// + /// Gets or sets the colorcatalogsitembase rubine extra. + /// + + [Column("RUBINE_EXTRA")] + + public Double RubineExtra + { + get + { + return _rubineextra; + } + + set + { + if (_rubineextra != value) + { + _rubineextra = value; + + OnRubineExtraChanged(value); + + } + } + } + + protected Double _violetextra; + + /// + /// Gets or sets the colorcatalogsitembase violet extra. + /// + + [Column("VIOLET_EXTRA")] + + public Double VioletExtra + { + get + { + return _violetextra; + } + + set + { + if (_violetextra != value) + { + _violetextra = value; + + OnVioletExtraChanged(value); + + } + } + } + protected SynchronizedObservableCollection _brushstops; /// @@ -673,6 +847,60 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(ProcessParametersTableIndex)); } + /// + /// Called when the BlueExtra has changed. + /// + protected virtual void OnBlueExtraChanged(Double blueextra) + { + BlueExtraChanged?.Invoke(this, blueextra); + RaisePropertyChanged(nameof(BlueExtra)); + } + + /// + /// Called when the NavyExtra has changed. + /// + protected virtual void OnNavyExtraChanged(Double navyextra) + { + NavyExtraChanged?.Invoke(this, navyextra); + RaisePropertyChanged(nameof(NavyExtra)); + } + + /// + /// Called when the OrangeExtra has changed. + /// + protected virtual void OnOrangeExtraChanged(Double orangeextra) + { + OrangeExtraChanged?.Invoke(this, orangeextra); + RaisePropertyChanged(nameof(OrangeExtra)); + } + + /// + /// Called when the RedExtra has changed. + /// + protected virtual void OnRedExtraChanged(Double redextra) + { + RedExtraChanged?.Invoke(this, redextra); + RaisePropertyChanged(nameof(RedExtra)); + } + + /// + /// Called when the RubineExtra has changed. + /// + protected virtual void OnRubineExtraChanged(Double rubineextra) + { + RubineExtraChanged?.Invoke(this, rubineextra); + RaisePropertyChanged(nameof(RubineExtra)); + } + + /// + /// Called when the VioletExtra has changed. + /// + protected virtual void OnVioletExtraChanged(Double violetextra) + { + VioletExtraChanged?.Invoke(this, violetextra); + RaisePropertyChanged(nameof(VioletExtra)); + } + /// /// Called when the BrushStops has changed. /// diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS.cs index d24ec2c8d..ccf91fb22 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/COLOR_CATALOGS_ITEMS.cs @@ -39,6 +39,12 @@ namespace Tango.DAL.Remote.DB public double A { get; set; } public double B { get; set; } public int PROCESS_PARAMETERS_TABLE_INDEX { get; set; } + public double BLUE_EXTRA { get; set; } + public double NAVY_EXTRA { get; set; } + public double ORANGE_EXTRA { get; set; } + public double RED_EXTRA { get; set; } + public double RUBINE_EXTRA { get; set; } + public double VIOLET_EXTRA { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection BRUSH_STOPS { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index 93ca57214..7d61b95e1 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -243,6 +243,12 @@ + + + + + + @@ -5957,6 +5963,12 @@ + + + + + + @@ -9542,6 +9554,12 @@ + + + + + + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram index b032b64d6..a0306b022 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,103 +5,103 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml index 0e232786a..6336e4c11 100644 Binary files a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml and b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml differ -- cgit v1.3.1