From 1f4a296ce7e38d59a7a796ad2ab57db116f8fdb5 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 3 Aug 2022 18:24:59 +0300 Subject: PPC_v1.7.13 --- .../PPC Installer-cache/cacheIndex.txt | Bin 52 -> 52 bytes .../Advanced Installer Projects/PPC Installer.aip | 6 +++--- .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Software') diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt index 1a2038cfa..5fe5afe5a 100644 Binary files a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt and b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt differ diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip index 649c7fd38..3dc4a6510 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip @@ -18,10 +18,10 @@ - + - + @@ -502,7 +502,7 @@ - + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index 36e71499c..ca1dbf9ea 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("1.7.12.0")] +[assembly: AssemblyVersion("1.7.13.0")] -- cgit v1.3.1 From 6768f10da035dee02e5f4de2988b7cdccd7dc04c Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 7 Aug 2022 17:49:02 +0300 Subject: Fine Tuning. LAB out of gamut. --- .../Dialogs/ColorSelectionViewVM.cs | 7 ++-- .../Dialogs/VectorFineTuningDialogVM.cs | 30 ++++++++++-------- .../Tango.PPC.JobsV2/Models/BrushStopModel.cs | 37 ++++++++++++++++++++++ .../Tango.PPC.JobsV2/Models/TrialsLogModel.cs | 3 -- 4 files changed, 58 insertions(+), 19 deletions(-) (limited to 'Software') diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs index 923f045f1..52f112954 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs @@ -1064,9 +1064,10 @@ namespace Tango.PPC.Jobs.Dialogs && VectorFineTuningDialogVM.SelectedLog.B != null) { _selectedBrushStop.PreventPropertyUpdate = true; - _selectedBrushStop.L = (double)VectorFineTuningDialogVM.SelectedLog.L; - _selectedBrushStop.A = (double)VectorFineTuningDialogVM.SelectedLog.A; - _selectedBrushStop.B = (double)VectorFineTuningDialogVM.SelectedLog.B; + _selectedBrushStop.L = (double)VectorFineTuningDialogVM.SelectedLog.SuggestionL; + _selectedBrushStop.A = (double)VectorFineTuningDialogVM.SelectedLog.SuggestionA; + _selectedBrushStop.B = (double)VectorFineTuningDialogVM.SelectedLog.SuggestionB; + //if not tested _selectedBrushStop.PreventPropertyUpdate = false; _selectedBrushStop.ConvertColor(); } 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 9a3230ea8..1352fa79d 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 @@ -494,7 +494,6 @@ namespace Tango.PPC.Jobs.Dialogs ActiveLogModel.SuggestionL = TargetL; ActiveLogModel.SuggestionA = TargetA; ActiveLogModel.SuggestionB = TargetB; - ActiveLogModel.HasSuggestionsLAB = true; TrialsLogitems = new SynchronizedObservableCollection(); TrialsLogitems.Add(ActiveLogModel); //TEST @@ -687,7 +686,7 @@ namespace Tango.PPC.Jobs.Dialogs BrushStopModel.Black = SelectedLog.TestK; } - if(false == SelectedLog.HasSuggestionsLAB) + if(!SelectedLog.IsTested) { double lastSuggestionL = TargetL; double lastSuggestionA = TargetA; @@ -803,17 +802,16 @@ namespace Tango.PPC.Jobs.Dialogs double lastSuggestionL = TargetL; double lastSuggestionA = TargetA; double lastSuggestionB = TargetB; - if (!ActiveLogModel.HasSuggestionsLAB) + + TrialsLogModel lastTested = TrialsLogitems.OrderBy(x => x.TrialNumber).LastOrDefault(y=>y.IsTested); + if(lastTested != null) { - TrialsLogModel lastTested = TrialsLogitems.OrderBy(x => x.TrialNumber).LastOrDefault(y=>y.IsTested); - if(lastTested != null) - { - lastSuggestionL = lastTested.SuggestionL; - lastSuggestionA = lastTested.SuggestionA; - lastSuggestionB = lastTested.SuggestionB; - } - CalculateSuggestionLAB(lastSuggestionL, lastSuggestionA, lastSuggestionB, ActiveLogModel); + lastSuggestionL = lastTested.SuggestionL; + lastSuggestionA = lastTested.SuggestionA; + lastSuggestionB = lastTested.SuggestionB; } + CalculateSuggestionLAB(lastSuggestionL, lastSuggestionA, lastSuggestionB, ActiveLogModel); + BrushStopModel.PreventPropertyUpdate = true; BrushStopModel.L = ActiveLogModel.SuggestionL; BrushStopModel.A = ActiveLogModel.SuggestionA; @@ -821,7 +819,14 @@ namespace Tango.PPC.Jobs.Dialogs BrushStopModel.PreventPropertyUpdate = false; //calculate CMYK - BrushStopModel.ConvertColorToVolume(); + BrushStopModel.FineTuningConverter(); + if(BrushStopModel.IsOutOfGamut) + { + ActiveLogModel.SuggestionL = BrushStopModel.L; + ActiveLogModel.SuggestionA = BrushStopModel.A; + ActiveLogModel.SuggestionB = BrushStopModel.B; + } + BrushStopModel.ColorSpace = ColorSpaces.LAB; var settings = SettingsManager.Default.GetOrCreate(); @@ -1160,7 +1165,6 @@ namespace Tango.PPC.Jobs.Dialogs trial.SuggestionL = LimitToRange((lastSuggestionL + (TargetL - (double)MeasuredL)),0, 100) ; trial.SuggestionA = LimitToRange((lastSuggestionA + (TargetA - (double)MeasuredA)), -128, 127); trial.SuggestionB = LimitToRange((lastSuggestionB + (TargetB - (double)MeasuredB )), -128, 127); - trial.HasSuggestionsLAB = true; return true; } 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 07bf2fa5c..e71edc7a7 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 @@ -1397,6 +1397,43 @@ namespace Tango.PPC.Jobs.Models } } + public void FineTuningConverter() + { + RequiredMaxLiquidTest = true; + + ColorSpaces colorSpace = ColorSpaces.LAB; + BrushStop stop = CreateBrushStop(colorSpace); + try + { + IsBusy = true; + var output = _converter.Convert(stop, SegmentModel.Job.Machine.Configuration, SegmentModel.Job.Rml, false, false, false); + + _cyan = (output.SingleCoordinates.OutputLiquids.SingleOrDefault(x => x.LiquidType == PMR.ColorLab.LiquidType.Cyan).Volume); + _yellow = (output.SingleCoordinates.OutputLiquids.SingleOrDefault(x => x.LiquidType == PMR.ColorLab.LiquidType.Yellow).Volume); + _magenta = (output.SingleCoordinates.OutputLiquids.SingleOrDefault(x => x.LiquidType == PMR.ColorLab.LiquidType.Magenta).Volume); + _black = (output.SingleCoordinates.OutputLiquids.SingleOrDefault(x => x.LiquidType == PMR.ColorLab.LiquidType.Black).Volume); + IsOutOfGamut = output.OutOfGamut; + if(IsOutOfGamut) + { + BrushStop stopLAB = CreateBrushStop(ColorSpaces.Volume); + + IsBusy = true; + var outputLAB = _converter.Convert(stopLAB, SegmentModel.Job.Machine.Configuration, SegmentModel.Job.Rml, false, false, false); + _l = output.SingleCoordinates.L; + _a = output.SingleCoordinates.A; + _b = output.SingleCoordinates.B; + } + } + catch (Exception ex) + { + LogManager.Log(ex, "An error occurred while trying to get volume => RGB from conversion engine." + ex); + } + finally + { + IsBusy = false; + } + } + public void RaiseOffsetChanged() { RaisePropertyChanged(nameof(OffsetPercent)); diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/TrialsLogModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/TrialsLogModel.cs index 3b16a65a2..c6dfdd4a9 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/TrialsLogModel.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/TrialsLogModel.cs @@ -64,8 +64,6 @@ namespace Tango.PPC.Jobs.Models public double SuggestionA { get; set; } [BsonIgnore] public double SuggestionB { get; set; } - [BsonIgnore] - public bool HasSuggestionsLAB { get; set; } public double C { get; set; } public double M { get; set; } @@ -195,7 +193,6 @@ namespace Tango.PPC.Jobs.Models IsTested = false; IsSelectionEnable = true; IsBest = false; - HasSuggestionsLAB = false; } #region Methods -- cgit v1.3.1 From f78684da1c34e0bd16ff7d27c7411b0d7d78c71b Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 7 Aug 2022 18:57:33 +0300 Subject: Fine Tuning . Loading and calculate suggestion LAB for saved trials. --- .../Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Software') 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 1352fa79d..bacbaf0bb 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 @@ -513,8 +513,14 @@ namespace Tango.PPC.Jobs.Dialogs foreach ( var trial in TrialsLogitems.OrderBy(x=>x.TrialNumber)) { - trial.IsTested = true; - CalculateSuggestionLAB(lastSuggestionL, lastSuggestionA, lastSuggestionB, trial); + // trial.IsTested = true; + //CalculateSuggestionLAB(lastSuggestionL, lastSuggestionA, lastSuggestionB, trial); + if (trial.L != null && trial.A != null && trial.B != null) + { + trial.SuggestionL = LimitToRange((lastSuggestionL + (TargetL - (double)trial.L)), 0, 100); + trial.SuggestionA = LimitToRange((lastSuggestionA + (TargetA - (double)trial.A)), -128, 127); + trial.SuggestionB = LimitToRange((lastSuggestionB + (TargetB - (double)trial.B)), -128, 127); + } lastSuggestionL = trial.SuggestionL; lastSuggestionA = trial.SuggestionA; lastSuggestionB = trial.SuggestionB; -- cgit v1.3.1 From 9b747cfdd4c35b119a1722206cd6b2dca94c71d8 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Mon, 8 Aug 2022 18:08:06 +0300 Subject: Fine Tuning. Delete item and test for messages. Related Work Items: #7101 --- .../Dialogs/VectorFineTuningDialogVM.cs | 126 ++++++++++++--------- .../Tango.PPC.JobsV2/Models/TrialsLogModel.cs | 6 +- 2 files changed, 78 insertions(+), 54 deletions(-) (limited to 'Software') 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 bacbaf0bb..fed0a7043 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 @@ -507,25 +507,7 @@ namespace Tango.PPC.Jobs.Dialogs else { TrialsLogitems = new SynchronizedObservableCollection(TestColor.TrialslogList.OrderByDescending(x=>x.TrialNumber)); - double lastSuggestionL = TargetL; - double lastSuggestionA = TargetA; - double lastSuggestionB = TargetB; - foreach ( var trial in TrialsLogitems.OrderBy(x=>x.TrialNumber)) - { - // trial.IsTested = true; - //CalculateSuggestionLAB(lastSuggestionL, lastSuggestionA, lastSuggestionB, trial); - if (trial.L != null && trial.A != null && trial.B != null) - { - trial.SuggestionL = LimitToRange((lastSuggestionL + (TargetL - (double)trial.L)), 0, 100); - trial.SuggestionA = LimitToRange((lastSuggestionA + (TargetA - (double)trial.A)), -128, 127); - trial.SuggestionB = LimitToRange((lastSuggestionB + (TargetB - (double)trial.B)), -128, 127); - } - lastSuggestionL = trial.SuggestionL; - lastSuggestionA = trial.SuggestionA; - lastSuggestionB = trial.SuggestionB; - } - //TrialsLogitems.ToList().ForEach(x => x.IsTested = true); int maxTrialsNumber = TrialsLogitems.Max( x=>x.TrialNumber); ActiveLogModel = TrialsLogitems.FirstOrDefault(x => x.TrialNumber == maxTrialsNumber); if (ActiveLogModel == null) @@ -533,14 +515,14 @@ namespace Tango.PPC.Jobs.Dialogs ActiveLogModel = new TrialsLogModel(0, Cyan, Magenta, Yellow, Black); TrialsLogitems.Add(ActiveLogModel); } + if (ActiveLogModel.IsTested == false) + { + ActiveLogModel.L = ActiveLogModel.A = ActiveLogModel.B = null; + ActiveLogModel.DeltaE = null; + } ActiveLogModel.IsActiveTrial = true; - ActiveLogModel.IsTested = false; ActiveLogModel.IsSelectionEnable = true; - ActiveLogModel.SuggestionL = lastSuggestionL; - ActiveLogModel.SuggestionA = lastSuggestionA; - ActiveLogModel.SuggestionB = lastSuggestionB; - var minValue = TrialsLogitems.Min(x => x.DeltaE); if(minValue != null && minValue < 2) { @@ -548,7 +530,8 @@ namespace Tango.PPC.Jobs.Dialogs } OKCommand.RaiseCanExecuteChanged(); - + TestCommand.RaiseCanExecuteChanged(); + } IsVisible = true; RaisePropertyChanged(nameof(TrialsLogitems)); @@ -634,6 +617,7 @@ namespace Tango.PPC.Jobs.Dialogs ActiveLogModel = TrialsLogitems.FirstOrDefault(x=> x.TrialNumber == 0); ActiveLogModel.L = ActiveLogModel.A = ActiveLogModel.B = null; ActiveLogModel.DeltaE = null; + ActiveLogModel.IsTested = false; TrialsLogitems.Clear(); if (TestColor != null) { @@ -648,14 +632,50 @@ namespace Tango.PPC.Jobs.Dialogs private void DeleteTrialLog(object obj) { - if (SelectedLog != null && SelectedLog.TrialNumber != 0) + if (SelectedLog != null ) { - TrialsLogitems.Remove(SelectedLog); - RaisePropertyChanged(nameof(IsDisableInputLAB)); - SelectedLog = null; - var minDelataE = TrialsLogitems.Min(x => x.DeltaE); - if (minDelataE != null && minDelataE < 2) - TrialsLogitems.ToList().ForEach(x => x.IsBest = (x.DeltaE == minDelataE)); + if (SelectedLog.TrialNumber != 0) + { + TrialsLogitems.Remove(SelectedLog); + int trialNumber = 0; + foreach( var trial in TrialsLogitems.OrderBy(x=>x.TrialNumber)) + { + trial.TrialNumber = trialNumber; + trialNumber++; + } + if (TestColor != null) + { + TestColor.TrialslogList.Clear(); + TestColor.TrialslogList.AddRange(TrialsLogitems); + TrialsLogEngine.Default.UpdateTest(TestColor); + } + var max = TrialsLogitems.Max(x=>x.TrialNumber); + ActiveLogModel = TrialsLogitems.FirstOrDefault(x => x.TrialNumber == max); + RaisePropertyChanged(nameof(IsDisableInputLAB)); + SelectedLog = null; + var minDelataE = TrialsLogitems.Min(x => x.DeltaE); + if (minDelataE != null && minDelataE < 2) + TrialsLogitems.ToList().ForEach(x => x.IsBest = (x.DeltaE == minDelataE)); + } + else if( TrialsLogitems.Count == 1) + { + ActiveLogModel.L = ActiveLogModel.A = ActiveLogModel.B = null; + ActiveLogModel.DeltaE = null; + ActiveLogModel.IsTested = false; + if (TestColor != null) + { + TrialsLogEngine.Default.Delete(TestColor); + } + SelectedLog = null; + _measuredL = null; + _measuredB = null; + _measuredA = null; + RaisePropertyChanged(nameof(MeasuredL)); + RaisePropertyChanged(nameof(MeasuredA)); + RaisePropertyChanged(nameof(MeasuredB)); + RaisePropertyChanged(nameof(TrialsLogitems)); + RaisePropertyChanged(nameof(IsDisableInputLAB)); + } } } @@ -1119,32 +1139,36 @@ namespace Tango.PPC.Jobs.Dialogs if (TrialsLogitems.Count == 1 || ActiveLogModel.DeltaE == null) return ; + int currentTrialNumber = ActiveLogModel.TrialNumber; + if(TrialsLogitems.Count >= 3) { - var currentTrialNumber = ActiveLogModel.TrialNumber; - var item = TrialsLogitems [TrialsLogitems.Count- 3]; - var item1 = TrialsLogitems[TrialsLogitems.Count - 2]; - var item2 = TrialsLogitems[TrialsLogitems.Count - 1]; - //dEi+2- dEi+1>0.5 and dEi+1-dEi>0.5 - if (( item2.DeltaE - item1.DeltaE) > 0.5 && (item1.DeltaE - item.DeltaE) > 0.5) - { - await NotificationProvider.ShowInfo("It seems that we can’t get you any closer"); - return ; - } - //Math.Abs - //| dEi+1- dEi | and |dEi+2 -dEi+1|<=0.1. - if(Math.Abs((double)item1.DeltaE - (double)item.DeltaE)<= 0.1 && Math.Abs((double)item2.DeltaE - (double)item1.DeltaE) <= 0.1) - { - await NotificationProvider.ShowInfo("It seems that we can’t get you any closer"); - return; + var item = TrialsLogitems.FirstOrDefault( x=>x.TrialNumber == currentTrialNumber - 2); + var item1 = TrialsLogitems.FirstOrDefault(x => x.TrialNumber == currentTrialNumber - 1); + var item2 = ActiveLogModel; + if(item1 != null && item2 != null && item != null) + {//dEi+2- dEi+1>0.5 and dEi+1-dEi>0.5 + if (( item2.DeltaE - item1.DeltaE) > 0.5 && (item1.DeltaE - item.DeltaE) > 0.5) + { + await NotificationProvider.ShowInfo("It seems that we can’t get you any closer"); + return ; + } + //Math.Abs + //| dEi+1- dEi | and |dEi+2 -dEi+1|<=0.1. + if(Math.Abs((double)item1.DeltaE - (double)item.DeltaE)<= 0.1 && Math.Abs((double)item2.DeltaE - (double)item1.DeltaE) <= 0.1) + { + await NotificationProvider.ShowInfo("It seems that we can’t get you any closer"); + return; + } } } - - if (TrialsLogitems.Count >= 2) { - var item = TrialsLogitems[TrialsLogitems.Count - 2]; - var item1 = TrialsLogitems[TrialsLogitems.Count - 1]; + var item = TrialsLogitems.FirstOrDefault(x => x.TrialNumber == currentTrialNumber - 1); + var item1 = ActiveLogModel; + if(item == null || item1 == null) + return; + var deltaE_reg = DeltaE_regular(TargetL, TargetA, TargetB, (double)MeasuredL, (double)MeasuredA, (double)MeasuredB); if ((Math.Abs((double)item1.L - (double)item.L) < 0.1 && Math.Abs((double)item1.A - (double)item.A) < 0.1 && Math.Abs((double)item1.B - (double)item.B) < 0.1) || deltaE_reg < 0.2) diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/TrialsLogModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/TrialsLogModel.cs index c6dfdd4a9..b4e01c1bd 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/TrialsLogModel.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/TrialsLogModel.cs @@ -58,11 +58,11 @@ namespace Tango.PPC.Jobs.Models set { _b = value; RaisePropertyChanged(nameof(LAB)); OnLABChanged(); } } - [BsonIgnore] + public double SuggestionL { get; set; } - [BsonIgnore] + public double SuggestionA { get; set; } - [BsonIgnore] + public double SuggestionB { get; set; } public double C { get; set; } -- cgit v1.3.1 From 945e41b1d4307690b367d0441843c4d06aa88b83 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Tue, 9 Aug 2022 11:41:05 +0300 Subject: Add log with Suggestion LAB. --- .../PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'Software') 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 fed0a7043..688117b92 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 @@ -1195,6 +1195,7 @@ namespace Tango.PPC.Jobs.Dialogs trial.SuggestionL = LimitToRange((lastSuggestionL + (TargetL - (double)MeasuredL)),0, 100) ; trial.SuggestionA = LimitToRange((lastSuggestionA + (TargetA - (double)MeasuredA)), -128, 127); trial.SuggestionB = LimitToRange((lastSuggestionB + (TargetB - (double)MeasuredB )), -128, 127); + LogManager.Log($" Fine Tuning. Suggestion (calculated) LAB L:'{trial.SuggestionL}'A:'{trial.SuggestionA}' B:'{trial.SuggestionB}'."); return true; } -- cgit v1.3.1 From cad0138307f8f6b61ad5d58694331203a03b3c15 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 9 Aug 2022 14:09:44 +0300 Subject: PPC_v1.7.14 --- .../PPC Installer-cache/cacheIndex.txt | Bin 52 -> 52 bytes .../Advanced Installer Projects/PPC Installer.aip | 6 +++--- .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Software') diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt index 5fe5afe5a..1a2038cfa 100644 Binary files a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt and b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt differ diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip index 3dc4a6510..33d6d4850 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip @@ -18,10 +18,10 @@ - + - + @@ -502,7 +502,7 @@ - + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index ca1dbf9ea..8cc269f76 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("1.7.13.0")] +[assembly: AssemblyVersion("1.7.14.0")] -- cgit v1.3.1 From 3c0deb94bb7e0a758d35b7e4ebafb27f07fdc3a9 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Tue, 9 Aug 2022 16:15:14 +0300 Subject: Brush gradient problem in new PPC. Related Work Items: #7059 --- .../PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Software') diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs index dac84bc7b..1cc98bede 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobViewVM.cs @@ -1415,12 +1415,14 @@ namespace Tango.PPC.Jobs.ViewModels dbSegment.SegmentIndex = segment.SegmentIndex; dbSegment.Length = segment.Length; _db.Segments.Add(dbSegment); + List brushStopList = new List();//to prevent collection changed event and override offset in timer foreach (var stop in innerSegment.BrushStops.OrderBy(x => x.StopIndex).ToList()) { var dbStop = new BrushStop(); dbStop.Guid = stop.Guid; dbStop.Segment = dbSegment; - _db.BrushStops.Add(dbStop); + //_db.BrushStops.Add(dbStop); + brushStopList.Add(dbStop); dbStop.ColorSpace = colorSpaces.FirstOrDefault(x => x.Code == (int)stop.ColorSpace); dbStop.Red = stop.Red; @@ -1449,6 +1451,7 @@ namespace Tango.PPC.Jobs.ViewModels dbStop.ColorCatalog = stop.ColorCatalog; dbStop.ColorCatalogsItem = stop.ColorCatalogsItem; } + _db.BrushStops.AddRange(brushStopList); } else if( segment is SegmentsGroupModel group) { @@ -1469,11 +1472,13 @@ namespace Tango.PPC.Jobs.ViewModels dbSegment.Length = segm_group.Length; dbSegment.SegmentsGroupGuid = dbSegmentsGroup.Guid; _db.Segments.Add(dbSegment); + List brushStopList = new List();//to prevent collection changed event and override offset in timer foreach (var stop in segm_group.BrushStops.OrderBy(x => x.StopIndex).ToList()) { var dbStop = new BrushStop(); dbStop.Segment = dbSegment; - _db.BrushStops.Add(dbStop); + //_db.BrushStops.Add(dbStop); + brushStopList.Add(dbStop); dbStop.ColorSpace = colorSpaces.FirstOrDefault(x => x.Code == (int)stop.ColorSpace); dbStop.Red = stop.Red; @@ -1502,6 +1507,7 @@ namespace Tango.PPC.Jobs.ViewModels dbStop.ColorCatalog = stop.ColorCatalog; dbStop.ColorCatalogsItem = stop.ColorCatalogsItem; } + _db.BrushStops.AddRange(brushStopList); } } } -- cgit v1.3.1 From c6af962d6bdf0a2151231e72d5d145819657b0f1 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 14 Aug 2022 14:13:18 +0300 Subject: PPC. Prevent crash PPC when catalog was deleted but job has a brush stop with this catalog. Related Work Items: #7024 --- .../PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs | 4 ++-- .../PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'Software') diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs index 52f112954..607cc59d3 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs @@ -518,7 +518,7 @@ namespace Tango.PPC.Jobs.Dialogs else if (SelectedBrushStop.ColorSpace == ColorSpaces.Catalog) { SelectedColorTab = ColorTab.Catalog; - if (SelectedBrushStop.ColorCatalogsItem != null) + if (SelectedBrushStop.ColorCatalogsItem != null && SelectedBrushStop.ColorCatalogsItem.ColorCatalogsGroup != null && SelectedBrushStop.ColorCatalogsItem.ColorCatalogsGroup.ColorCatalog != null) { SelectedCatalog = SelectedBrushStop.ColorCatalogsItem.ColorCatalogsGroup.ColorCatalog; } @@ -614,7 +614,7 @@ namespace Tango.PPC.Jobs.Dialogs protected void OnColorSelectionItemChanged(object sender, EventArgs args) { - if (SelectedBrushStop.ColorCatalogsItem != null) + if (SelectedBrushStop.ColorCatalogsItem != null && SelectedBrushStop.ColorCatalogsItem.ColorCatalogsGroup != null && SelectedBrushStop.ColorCatalogsItem.ColorCatalogsGroup.ColorCatalog != null) { SelectedCatalog = SelectedBrushStop.ColorCatalogsItem.ColorCatalogsGroup.ColorCatalog; } 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 e71edc7a7..2775f33c4 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 @@ -518,8 +518,9 @@ namespace Tango.PPC.Jobs.Models get { if (ColorCatalogsItem != null && ColorCatalogsItem.ColorCatalogsGroup != null) + { return ColorCatalogsItem.ColorCatalogsGroup.ColorCatalog; - + } return null; } } -- cgit v1.3.1 From 39d93a8d49f620c15c66f9f9fb9ca153fb1f906a Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 14 Aug 2022 16:24:10 +0300 Subject: PPC. Bug in brush stop set offset. Related Work Items: #7059 --- .../Modules/Tango.PPC.JobsV2/Models/SegmentModel.cs | 9 --------- Software/Visual_Studio/Tango.BL/Entities/Segment.cs | 18 +++++++++--------- 2 files changed, 9 insertions(+), 18 deletions(-) (limited to 'Software') diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/SegmentModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/SegmentModel.cs index f8712fd35..1f1fe3034 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/SegmentModel.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/SegmentModel.cs @@ -782,15 +782,6 @@ namespace Tango.PPC.Jobs.Models { stop.RaiseOffsetChanged(); } - - if (BrushStops.Count > 0) - { - BrushStops.First().OffsetPercent = 0; - } - if (BrushStops.Count > 1) - { - BrushStops.Last().OffsetPercent = 100; - } RaiseSegmentBrushChanged(); }); } diff --git a/Software/Visual_Studio/Tango.BL/Entities/Segment.cs b/Software/Visual_Studio/Tango.BL/Entities/Segment.cs index f1e601f2a..be72100a5 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Segment.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Segment.cs @@ -167,15 +167,15 @@ namespace Tango.BL.Entities { stop.RaiseOffsetChanged(); } - - if (BrushStops.Count > 0) - { - BrushStops.First().OffsetPercent = 0; - } - if (BrushStops.Count > 1) - { - BrushStops.Last().OffsetPercent = 100; - } + //Item#7059 - + //if (BrushStops.Count > 0) + //{ + // BrushStops.First().OffsetPercent = 0; + //} + //if (BrushStops.Count > 1) + //{ + // BrushStops.Last().OffsetPercent = 100; + //} RaiseSegmentBrushChanged(); }); -- cgit v1.3.1 From 967c9ace0f91890c32e4ea8dfa38333d1a79a100 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Mon, 15 Aug 2022 15:24:51 +0300 Subject: Fine Tuning. Remove saved trials for color brush if the brush was changed but not saved. Related Work Items: #7132 --- .../Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs | 12 +++++++++--- .../Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs | 16 ++++++++++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) (limited to 'Software') diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs index 607cc59d3..6c402fe45 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/ColorSelectionViewVM.cs @@ -723,8 +723,14 @@ namespace Tango.PPC.Jobs.Dialogs protected override void Cancel() { if(IsOpenVectorFineTuningDialog) - return; - + return; + + var TestColor = TrialsLogEngine.Default.GetByBrushStopGuid(_selectedBrushStop.Guid); + if (TestColor != null && InitialBrushStop != null && (InitialBrushStop.ColorSpace != ColorSpaces.LAB || TestColor.L != InitialBrushStop.L || TestColor.A != InitialBrushStop.A || TestColor.B != InitialBrushStop.B )) + { + TrialsLogEngine.Default.Delete(TestColor); + } + _selectedBrushStop.LiquidVolumesOutOfRangeChanged -= OnLiquidVolumesOutOfRangeChanged; base.Cancel(); } @@ -1035,7 +1041,7 @@ namespace Tango.PPC.Jobs.Dialogs { SelectedBrushStop.SaveLABBeforeChanges(); - VectorFineTuningDialogVM.Init( SelectedBrushStop, SelectedBrushStop.L, SelectedBrushStop.A, SelectedBrushStop.B, SelectedBrushStop.Color); + VectorFineTuningDialogVM.Init( SelectedBrushStop, SelectedBrushStop.BestMatchL, SelectedBrushStop.BestMatchA, SelectedBrushStop.BestMatchB, SelectedBrushStop.Color); IsOpenVectorFineTuningDialog = true; 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 688117b92..f5cecd0c4 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 @@ -517,9 +517,21 @@ namespace Tango.PPC.Jobs.Dialogs } if (ActiveLogModel.IsTested == false) { - ActiveLogModel.L = ActiveLogModel.A = ActiveLogModel.B = null; - ActiveLogModel.DeltaE = null; + if(ActiveLogModel.L != null) + { + MeasuredL = ActiveLogModel.L; + } + if (ActiveLogModel.A != null) + { + MeasuredA = ActiveLogModel.A; + } + if (ActiveLogModel.B != null) + { + MeasuredB = ActiveLogModel.B; + } + TestCommand.RaiseCanExecuteChanged(); } + ActiveLogModel.IsActiveTrial = true; ActiveLogModel.IsSelectionEnable = true; -- cgit v1.3.1 From 4c5f0e61c389ec1f805e15139ef4ab55b5fc84ab Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Mon, 15 Aug 2022 16:04:04 +0300 Subject: PPC. RML display FinalName in selected item. Related Work Items: #7004 --- .../PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Software') diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml index dd98a8f71..97fb1d590 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/JobCreationView.xaml @@ -82,7 +82,7 @@ - + -- cgit v1.3.1 From 99d3f34bdf34a0f70aeba8e1700e4b30c5eff7c1 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Thu, 18 Aug 2022 11:30:23 +0300 Subject: Vector Fine Tuning. Removing the CMYK from the dialog box on the right. Related Work Items: #7184 --- .../PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialog.xaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Software') diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialog.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialog.xaml index 4c9ab61e0..56e3ff211 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialog.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialog.xaml @@ -197,7 +197,7 @@ - + -- cgit v1.3.1 From a07075624af377fe855bbef95a7bf784963bcc73 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Sun, 21 Aug 2022 09:13:04 +0300 Subject: VFT - the numbering of the tests is incorrect. Save VFT trials during adding gradient color. Related Work Items: #7175 --- .../Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialogVM.cs | 13 +++++++------ .../PPC/Modules/Tango.PPC.JobsV2/Models/SegmentModel.cs | 4 ++-- .../UndoRedoCommands/AddBrushStopCommand.cs | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'Software') 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 f5cecd0c4..8a464d911 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 @@ -756,9 +756,9 @@ namespace Tango.PPC.Jobs.Dialogs { OnClose(); - if (TestColor != null && TrialsLogitems.Count > 1) + if (TestColor != null ) { - if (TrialsLogitems.Count > 1) + if (TrialsLogitems.Count > 0) { TestColor.L = TargetL; TestColor.A = TargetA; @@ -768,10 +768,10 @@ namespace Tango.PPC.Jobs.Dialogs TestColor.TrialslogList.AddRange(TrialsLogitems); TrialsLogEngine.Default.UpdateTest(TestColor); } - else - TrialsLogEngine.Default.Delete(TestColor); + //else + // TrialsLogEngine.Default.Delete(TestColor); } - else if(TrialsLogitems.Count > 1) + else if(TrialsLogitems.Count > 0) { TestColor = new TestColor(); TestColor.BrushStopGuid = BrushStopModel.Guid; @@ -874,7 +874,8 @@ namespace Tango.PPC.Jobs.Dialogs job.EnableLubrication = true; job.Designation = JobDesignations.FineTuning; job.Machine = await new MachineBuilder(db).Set(MachineProvider.Machine.Guid).WithConfiguration().WithSpools().WithCats().WithVersion().BuildAsync(); - job.Name = $"Manual color test #{ActiveLogModel.TrialNumber}"; + var trialNumber = ActiveLogModel.TrialNumber + 1; + job.Name = $"Manual color test #{trialNumber}"; job.Rml = await new RmlBuilder(db).Set(BrushStopModel.SegmentModel.Job.Rml.Guid).WithActiveParametersGroup().WithCAT(MachineProvider.Machine.Guid).WithCCT().WithLiquidFactors().WithSpools().BuildAsync(); job.SpoolType = db.SpoolTypes.FirstOrDefault(x => x.Guid == settings.SpoolTypeGuid); job.WindingMethod = db.WindingMethods.FirstOrDefault(); diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/SegmentModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/SegmentModel.cs index 1f1fe3034..b8b19b42b 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/SegmentModel.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/SegmentModel.cs @@ -643,7 +643,7 @@ namespace Tango.PPC.Jobs.Models brushStop.IsOutOfGamut = false; BrushStops.Add(brushStop); - BrushStopModel colorbrushStop = firstBrush.Clone(); + BrushStopModel colorbrushStop = firstBrush; colorbrushStop.Position = BrushStopModel.PositionStatus.FirstColor; colorbrushStop.StopIndex = 2; colorbrushStop.OffsetPercent = 0; @@ -665,7 +665,7 @@ namespace Tango.PPC.Jobs.Models { RemoveSecondColorOfGradient(); - BrushStopModel secondbrushStop = secondBrush.Clone(); + BrushStopModel secondbrushStop = secondBrush; secondbrushStop.StopIndex = 4; secondbrushStop.Position = BrushStopModel.PositionStatus.SecondColor; secondbrushStop.OffsetPercent = 100; diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/UndoRedoCommands/AddBrushStopCommand.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/UndoRedoCommands/AddBrushStopCommand.cs index 1a9ee005b..1b07d9eac 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/UndoRedoCommands/AddBrushStopCommand.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/UndoRedoCommands/AddBrushStopCommand.cs @@ -48,7 +48,7 @@ namespace Tango.PPC.Jobs.UndoRedoCommands _createdNewSegment.Length = length; _segment.Length = length; _createdNewSegment.SegmentIndex = _segment.SegmentIndex + 1; - _createdNewSegment.CreateGradientBrushes(_brushStopModelToAdd, _segment.SecondBrushStop); + _createdNewSegment.CreateGradientBrushes(_brushStopModelToAdd.Clone(), _segment.SecondBrushStop); _createdNewSegment.RaiseSegmentBrushChanged(); _segment.AddOrReplaceSecondBrush(_brushStopModelToAdd); -- cgit v1.3.1 From c97019debd77e918f2c6c2eaef8a51ec8cba2127 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 21 Aug 2022 14:25:55 +0300 Subject: PPC_v1.7.15 --- .../PPC Installer-cache/cacheIndex.txt | Bin 52 -> 52 bytes .../Advanced Installer Projects/PPC Installer.aip | 25 +++++++++++++-------- .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) (limited to 'Software') diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt index 1a2038cfa..5fe5afe5a 100644 Binary files a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt and b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt differ diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip index 33d6d4850..f946c3818 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip @@ -18,10 +18,10 @@ - + - + @@ -217,11 +217,13 @@ + + + + - - @@ -493,6 +495,11 @@ + + + + + @@ -502,7 +509,7 @@ - + @@ -570,8 +577,6 @@ - - @@ -777,8 +782,10 @@ - - + + + + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index 8cc269f76..e024e020d 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("1.7.14.0")] +[assembly: AssemblyVersion("1.7.15.0")] -- cgit v1.3.1