From d9600b7013eaf652e65b54f85618c75b5d0e0066 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 22 Aug 2021 13:15:32 +0300 Subject: Machine_Studio_v4.7.0 --- .../Advanced Installer Projects/Machine Studio Installer.aip | 11 ++++++++--- .../Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio') 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 00a1d7d21..27b703409 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 @@ - + - + @@ -300,6 +300,7 @@ + @@ -826,6 +827,9 @@ + + + @@ -837,7 +841,7 @@ - + @@ -1310,6 +1314,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 73bbd1b03..25d3f14e1 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.6.1.0")] +[assembly: AssemblyVersion("4.7.0.0")] [assembly: ComVisible(false)] \ No newline at end of file -- cgit v1.3.1 From 46c6b9854e9355b45739bf6d0bc23a47583d6b01 Mon Sep 17 00:00:00 2001 From: Mirta Date: Mon, 23 Aug 2021 15:30:31 +0300 Subject: Removed smoothing from Linearization calculation --- Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorCalibrator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Software/Visual_Studio') diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorCalibrator.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorCalibrator.cpp index b468eca56..9234a9ed7 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorCalibrator.cpp +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorCalibrator.cpp @@ -440,7 +440,7 @@ void Tango::ColorLib::ColorCalibrator::Linearizaton(double *InkVals, double *&Li return; //Values are sorted and unique - SmoothCurveData(InkVals, yVal, 7); + //SmoothCurveData(InkVals, yVal, 7); if (CheckMonotonicity(yVal, error)) return; //Values are monotonic, therefore can be inverted -- cgit v1.3.1 From e8f482f7802624caf526b619d922dcb59be27e63 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Thu, 30 Sep 2021 14:23:41 +0300 Subject: MS. Set Max and Min values to Linearization graph in both directions according to data. --- .../ViewModels/ColorCalibrationViewVM.cs | 25 +++++++++++++++++++++- .../Views/ColorCalibrationView.xaml | 4 ++-- 2 files changed, 26 insertions(+), 3 deletions(-) (limited to 'Software/Visual_Studio') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs index 4e4a0edc3..1d45b8c12 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorCalibrationViewVM.cs @@ -232,6 +232,26 @@ namespace Tango.MachineStudio.RML.ViewModels set { _BPoints = value; } } + private double _linearizationXMaxValue; + + public double LinearizationXMaxValue + { + get { return _linearizationXMaxValue; } + set { _linearizationXMaxValue = value; + RaisePropertyChangedAuto(); + } + } + + private double _linearizationYMaxValue; + + public double LinearizationYMaxValue + { + get { return _linearizationYMaxValue; } + set { _linearizationYMaxValue = value; + RaisePropertyChangedAuto(); + } + } + #endregion @@ -257,6 +277,7 @@ namespace Tango.MachineStudio.RML.ViewModels LPoints = new List(); APoints = new List(); BPoints = new List(); + LinearizationXMaxValue = LinearizationYMaxValue = 100; } public void Loading() @@ -463,7 +484,9 @@ namespace Tango.MachineStudio.RML.ViewModels { LinearizationPoints.Add(new DataPoint(nw.Item1.InkPercentage, nw.Item2)); } - + LinearizationXMaxValue = Math.Max( 100, LinearizationPoints.Max(x => x.X)); + LinearizationYMaxValue = Math.Max(100, LinearizationPoints.Max(x => x.Y)); + LinearizationPlotControl.InvalidatePlot(true); } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml index d0c2af490..01119b3e1 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorCalibrationView.xaml @@ -186,8 +186,8 @@ - - + + -- cgit v1.3.1 From 0efcffe3bfcd8a561a1dbca7ce01db3115d98440 Mon Sep 17 00:00:00 2001 From: Victoria Plitt Date: Thu, 30 Sep 2021 15:40:52 +0300 Subject: Dispenser analyzer upgrade. New version. Settings: DividerMaxError, value = 1500. --- .../Tango.DispenserAnalyzer.UI/Analyzers/FlowAnalyser.cs | 7 ++++--- .../Tango.DispenserAnalyzer.UI/Properties/AssemblyInfo.cs | 2 +- .../Utilities/Tango.DispenserAnalyzer.UI/Settings.cs | 4 +++- .../Tango.DispenserAnalyzer.UI/Tango.DispenserAnalyzer.UI.csproj | 9 ++++++--- .../Tango.DispenserAnalyzer.UI/ViewModels/SettingsVM.cs | 1 + 5 files changed, 15 insertions(+), 8 deletions(-) (limited to 'Software/Visual_Studio') 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 59722d499..ed37daf43 100644 --- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analyzers/FlowAnalyser.cs +++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Analyzers/FlowAnalyser.cs @@ -217,6 +217,7 @@ namespace Tango.DispenserAnalyzer.UI.Analyzers { var countValArr = range_values.GroupBy(x => x).Select(t => new { Key = t.Key, Value = t.Count() }).OrderBy(x=>x.Key).ToArray(); double merror = (double)Settings.GetValueByName(AnalyzerSettingsEnum.TakeOffMaxMin);// BuildMeasurementError(range_values); + double dividerMaxError = (double)Settings.GetValueByName(AnalyzerSettingsEnum.DividerMaxError);// BuildMeasurementError(range_values); double sum = 0; int max_key = 0; int range = 0; @@ -227,15 +228,15 @@ namespace Tango.DispenserAnalyzer.UI.Analyzers max_key = (int)countValArr[i].Key; if (sum > merror) { - double persentageOfError = countValArr[i].Key / AverageValue * 100; - range = (int)countValArr[i].Key; + double persentageOfError = countValArr[i].Key / dividerMaxError * 100; + range = countValArr[i].Key; int occurrence = countValArr[i].Value; LocalErrors = $" {persentageOfError.ToString("F2")}% where max local error = {range.ToString()} and occurrence = {occurrence.ToString()}"; break; } } - var res = range / AverageValue * 100; + var res = range / dividerMaxError * 100; Result = res <= (double)Settings.GetValueByName(AnalyzerSettingsEnum.MaxError) ? 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 6a78631b7..58206ce7c 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("4.1.1.1")] +[assembly: AssemblyVersion("5.1.1.0")] [assembly: AssemblyFileVersion("1.0.0.0")] [assembly: NeutralResourcesLanguage("en-AS")] diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Settings.cs b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Settings.cs index ef45e654e..177756b0f 100644 --- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Settings.cs +++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/Settings.cs @@ -41,7 +41,8 @@ namespace Tango.DispenserAnalyzer.UI MovingAvg, [Description("Cancel Moving AVG")] CancelMovingAVG, - + [Description("Divider for calculation max error")] + DividerMaxError, } @@ -67,6 +68,7 @@ namespace Tango.DispenserAnalyzer.UI DefaultValues[AnalyzerSettingsEnum.EndCalculation] = 900.0; DefaultValues[AnalyzerSettingsEnum.MovingAvg] = 50.0; DefaultValues[AnalyzerSettingsEnum.CancelMovingAVG] = false; + DefaultValues[AnalyzerSettingsEnum.DividerMaxError] = 1500.0; CurrentValues = new Dictionary(DefaultValues); 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 242391f72..d0317431b 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 @@ -15,7 +15,7 @@ true true false - P:\Dispenser Analyzer Installer\ + X:\Dispenser Analyzer Installer\Version 5.1.1.1\ true Disk false @@ -29,8 +29,8 @@ Dispenser Analyser Twine false - 7 - 4.1.1.%2a + 1 + 5.1.1.%2a true true true @@ -58,6 +58,9 @@ twin.ico + + true + ..\..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll diff --git a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/ViewModels/SettingsVM.cs b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/ViewModels/SettingsVM.cs index fd21794f4..74ec5db79 100644 --- a/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/ViewModels/SettingsVM.cs +++ b/Software/Visual_Studio/Utilities/Tango.DispenserAnalyzer.UI/ViewModels/SettingsVM.cs @@ -91,6 +91,7 @@ namespace Tango.DispenserAnalyzer.UI.ViewModels list.Add(new BaseSettingModel(AnalyzerSettingsEnum.MaxError, "1.5%")); list.Add(new BaseSettingModel(AnalyzerSettingsEnum.TakeOffMaxMin, "3")); list.Add(new BaseSettingModel(AnalyzerSettingsEnum.CancelMovingAVG, "False")); + list.Add(new BaseSettingModel(AnalyzerSettingsEnum.DividerMaxError, "1500")); list.ForEach(x => x.SettingValueEvent += new EventHandler(OnSettingValueChanged)); model.AddSettings(list); Settings.Add(model); -- cgit v1.3.1