diff options
Diffstat (limited to 'Software/Visual_Studio')
5 files changed, 15 insertions, 8 deletions
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<AnalyzerSettingsEnum, object>(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 @@ <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <Deterministic>true</Deterministic> <IsWebBootstrapper>false</IsWebBootstrapper> - <PublishUrl>P:\Dispenser Analyzer Installer\</PublishUrl> + <PublishUrl>X:\Dispenser Analyzer Installer\Version 5.1.1.1\</PublishUrl> <Install>true</Install> <InstallFrom>Disk</InstallFrom> <UpdateEnabled>false</UpdateEnabled> @@ -29,8 +29,8 @@ <ProductName>Dispenser Analyser</ProductName> <PublisherName>Twine</PublisherName> <OpenBrowserOnPublish>false</OpenBrowserOnPublish> - <ApplicationRevision>7</ApplicationRevision> - <ApplicationVersion>4.1.1.%2a</ApplicationVersion> + <ApplicationRevision>1</ApplicationRevision> + <ApplicationVersion>5.1.1.%2a</ApplicationVersion> <UseApplicationTrust>true</UseApplicationTrust> <CreateDesktopShortcut>true</CreateDesktopShortcut> <PublishWizardCompleted>true</PublishWizardCompleted> @@ -58,6 +58,9 @@ <PropertyGroup> <ApplicationIcon>twin.ico</ApplicationIcon> </PropertyGroup> + <PropertyGroup> + <GenerateManifests>true</GenerateManifests> + </PropertyGroup> <ItemGroup> <Reference Include="MahApps.Metro"> <HintPath>..\..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath> 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); |