From b7a18e72dd25049bab9ff670f9141862fdf13c51 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Thu, 25 Jun 2020 09:01:16 +0300 Subject: Flow analyzer. Changed allowed error from >=1.3 to >=1.5 --- .gitignore | 2 ++ .../Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp | 8 ++++++++ Software/Visual_Studio/Tango.ColorLib.GradientTest.CLI/Program.cs | 2 +- .../Tango.DispenserAnalyzer.UI/Analyzers/FlowAnalyser.cs | 2 +- .../Tango.DispenserAnalyzer.UI/Properties/AssemblyInfo.cs | 2 +- .../Tango.DispenserAnalyzer.UI/Tango.DispenserAnalyzer.UI.csproj | 4 ++-- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6a3fd134c..49a7f63ee 100644 --- a/.gitignore +++ b/.gitignore @@ -314,3 +314,5 @@ __pycache__/ # OpenCV binaries !/Software/External_Repositories/OpenCV/bin /Software/PMR/Messages/.metadata +/Software/Visual_Studio/.tfignore.txt +/Software/Visual_Studio/.nuget/NuGet.config diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp index 7d70aa72c..8f4b55db9 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp @@ -2806,5 +2806,13 @@ size_t Tango::ColorLib::ColorConverter::GenerateGradient(uint8_t * input_buffer, //RELEASE MEMORY HERE !!! +#pragma region Free Conversion Input & Output + + gradient_conversion_input__free_unpacked(conversionInput, NULL); + + gradient_conversion_output__free_unpacked(conversionOutput, NULL); + +#pragma endregion + return size; } diff --git a/Software/Visual_Studio/Tango.ColorLib.GradientTest.CLI/Program.cs b/Software/Visual_Studio/Tango.ColorLib.GradientTest.CLI/Program.cs index 629f1c148..811f53841 100644 --- a/Software/Visual_Studio/Tango.ColorLib.GradientTest.CLI/Program.cs +++ b/Software/Visual_Studio/Tango.ColorLib.GradientTest.CLI/Program.cs @@ -20,7 +20,7 @@ namespace Tango.ColorLib.GradientTest.CLI GradientConversionInput input = new GradientConversionInput(); //CCT - input.ForwardData = ByteString.CopyFrom(File.ReadAllBytes("Path To Local File")); //TODO: Load CCT file from local drive. + input.ForwardData = ByteString.CopyFrom(File.ReadAllBytes(@"C:\Test\CMYKSylko.cct")); //TODO: Load CCT file from local drive. //RML Liquid Factors input.InputLiquids.Add(new InputLiquid() diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analyzers/FlowAnalyser.cs b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analyzers/FlowAnalyser.cs index 1eff213ee..60ca14fa9 100644 --- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analyzers/FlowAnalyser.cs +++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analyzers/FlowAnalyser.cs @@ -184,7 +184,7 @@ namespace Tango.DispenserAnalyzer.UI.Analyzers } //Result = (range <= 25 && range >= 20) ? AnalyzerResultValue.Passed : AnalyzerResultValue.Failed; var res = range / AverageValue * 100; - Result = res < 1.3 ? AnalyzerResultValue.Passed : AnalyzerResultValue.Failed; + Result = res <= 1.5 ? AnalyzerResultValue.Passed : AnalyzerResultValue.Failed; return max_key; } } diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Properties/AssemblyInfo.cs index cb1cadaaf..7b95ba36b 100644 --- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Properties/AssemblyInfo.cs @@ -51,7 +51,7 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.0.0")] +[assembly: AssemblyVersion("1.2.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] [assembly: NeutralResourcesLanguage("en-AS")] diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Tango.DispenserAnalyzer.UI.csproj b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Tango.DispenserAnalyzer.UI.csproj index 3fa2fbae4..373654985 100644 --- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Tango.DispenserAnalyzer.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Tango.DispenserAnalyzer.UI.csproj @@ -19,7 +19,7 @@ true Disk false - Foreground + Background 7 Days false @@ -29,7 +29,7 @@ Dispenser Analyser Twine false - 3 + 4 1.2.1.%2a true true -- cgit v1.3.1