Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software

10 files changed, 51 insertions, 16 deletions

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 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPNOREPAIR" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{7B884D81-783D-485D-A274-9AD3D0134DF7} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{85D07BEE-84BA-4E70-96CB-5EF0C0F9A58B} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Machine Studio"/>
-    <ROW Property="ProductVersion" Value="4.6.1.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="4.7.0.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{CBEE5CAE-7C5A-4280-98DE-AA98113764E4}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -300,6 +300,7 @@
     <ROW Component="Tango.MachineStudio.Storage.dll" ComponentId="{150A14D5-9060-43B4-A065-F06BCB79754C}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.MachineStudio.Storage.dll"/>
     <ROW Component="Tango.MachineStudio.Stubs.dll" ComponentId="{024CD63F-A137-4361-9EC6-3E01973D2AD0}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.MachineStudio.Stubs.dll"/>
     <ROW Component="Tango.MachineStudio.Technician.dll" ComponentId="{17B02BB8-CEFB-4443-AC64-7DEA8DD011A0}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.MachineStudio.Technician.dll"/>
+    <ROW Component="Tango.MachineStudio.ThreadExtensions.dll" ComponentId="{7ED78001-3874-487A-8FD4-9EB90064A12E}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.MachineStudio.ThreadExtensions.dll"/>
     <ROW Component="Tango.MachineStudio.UI.exe" ComponentId="{07F681E1-2AA2-4807-AD8C-E34D9569AB96}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.MachineStudio.UI.exe"/>
     <ROW Component="Tango.MachineStudio.Updater.exe" ComponentId="{5FA7D1EC-ED4A-46D6-BD92-42479D1BD560}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.MachineStudio.Updater.exe"/>
     <ROW Component="Tango.MachineStudio.UsersAndRoles.dll" ComponentId="{03566F7E-9428-46EF-991F-4524511179B0}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.MachineStudio.UsersAndRoles.dll"/>
@@ -826,6 +827,9 @@
     <ROW File="Z.Expressions.Eval.dll" Component_="Z.Expressions.Eval.dll" FileName="ZEXPRE~1.DLL|Z.Expressions.Eval.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Z.Expressions.Eval.dll" SelfReg="false"/>
     <ROW File="Tango.Colorful.dll" Component_="Tango.Colorful.dll" FileName="TANGO~22.DLL|Tango.Colorful.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.Colorful.dll" SelfReg="false"/>
     <ROW File="Tango.Colorful.pdb" Component_="Tango.Colorful.dll" FileName="TANGOC~8.PDB|Tango.Colorful.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.Colorful.pdb" SelfReg="false"/>
+    <ROW File="Tango.MachineStudio.ThreadExtensions.dll" Component_="Tango.MachineStudio.ThreadExtensions.dll" FileName="TANGOM~5.DLL|Tango.MachineStudio.ThreadExtensions.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.MachineStudio.ThreadExtensions.dll" SelfReg="false"/>
+    <ROW File="Tango.MachineStudio.ThreadExtensions.dll.config" Component_="Dragablz.xml" FileName="TANGOM~5.CON|Tango.MachineStudio.ThreadExtensions.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.MachineStudio.ThreadExtensions.dll.config" SelfReg="false"/>
+    <ROW File="Tango.MachineStudio.ThreadExtensions.pdb" Component_="Tango.MachineStudio.ThreadExtensions.dll" FileName="TANGOM~5.PDB|Tango.MachineStudio.ThreadExtensions.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\Tango.MachineStudio.ThreadExtensions.pdb" SelfReg="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.AiRemoveFileComponent">
     <ROW RemoveFile="_" Options="3"/>
@@ -837,7 +841,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.6.1" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v4.6.1"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.7.0" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v4.7.0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -1310,6 +1314,7 @@
     <ROW Feature_="MachineStudio" Component_="Z.EntityFramework.Plus.EF6.dll"/>
     <ROW Feature_="MachineStudio" Component_="Z.Expressions.Eval.dll"/>
     <ROW Feature_="MachineStudio" Component_="Tango.Colorful.dll"/>
+    <ROW Feature_="MachineStudio" Component_="Tango.MachineStudio.ThreadExtensions.dll"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
     <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="210"/>
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
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<DataPoint>();
             APoints = new List<DataPoint>();
             BPoints = new List<DataPoint>();
+            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 @@
                                             <oxy:LineSeries ItemsSource="{Binding LinearizationPoints}"  Color="#73B6EC" MarkerFill="SteelBlue" MarkerType="Circle"/>
                                         </oxy:Plot.Series>
                                         <oxy:Plot.Axes>
-                                            <oxy:LinearAxis Position="Bottom"  Title = "In Ink" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" Minimum="0" Maximum="100"/>
-                                            <oxy:LinearAxis Position="Left"  Title = "Out Ink" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" Minimum="0" Maximum="100"/>
+                                            <oxy:LinearAxis Position="Bottom"  Title = "In Ink" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" Minimum="0" Maximum="{Binding LinearizationXMaxValue}"/>
+                                            <oxy:LinearAxis Position="Left"  Title = "Out Ink" MajorGridlineStyle="Solid" MinorGridlineStyle="Dot" IsZoomEnabled="True" Minimum="0" Maximum="{Binding LinearizationYMaxValue}"/>
                                         </oxy:Plot.Axes>
                                     </oxy:Plot>
                                 </Border>
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
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);