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

11 files changed, 222 insertions, 184 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 5391cac3d..3c5fed026 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:{D45E486F-5547-4001-8933-4ED19088BD82} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{83078FE1-0B7E-4018-9975-DDAF264ECB2F} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Machine Studio"/>
-    <ROW Property="ProductVersion" Value="4.4.3.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="4.4.4.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="-"/>
@@ -836,7 +836,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.4.3" 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.4.3"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.4.4" 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.4.4"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
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 9453b5c13..abc8a3503 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
index f15d16b8d..3b7c0698a 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 @@
     <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{CA1E85B3-6475-48AA-8F9E-C220CE4C254C} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{F5B23ED2-7620-4066-915C-CE9AAFA8C321} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango"/>
-    <ROW Property="ProductVersion" Value="1.4.5.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.4.6.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{F8EAB8B4-FD57-45B7-8307-D52DF760273D}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -215,13 +215,11 @@
     <ROW Component="mscoree.dll" ComponentId="{85F439D0-8FD0-4B99-888D-336C7A125E3D}" Directory_="APPDIR" Attributes="0" KeyPath="mscoree.dll"/>
     <ROW Component="msvcp140d.dll" ComponentId="{69E32675-9ACF-4C23-A495-300B78913B66}" Directory_="APPDIR" Attributes="0" KeyPath="msvcp140d.dll"/>
     <ROW Component="protobufnet.dll" ComponentId="{163F1E17-6462-4ABE-BC86-E055F7690139}" Directory_="APPDIR" Attributes="0" KeyPath="protobufnet.dll"/>
-    <ROW Component="turbojpeg.dll" ComponentId="{3742798A-471F-4315-8DDF-E367A32319E9}" Directory_="win7x64_Dir" Attributes="256" KeyPath="turbojpeg.dll"/>
-    <ROW Component="turbojpeg.dll.meta" ComponentId="{4E562238-B34B-4F50-B219-A6C272879B1D}" Directory_="win7x64_Dir" Attributes="0" KeyPath="turbojpeg.dll.meta" Type="0"/>
-    <ROW Component="turbojpeg.dll.meta_1" ComponentId="{EEF98569-AF6C-4727-A23E-6894278B8FA5}" Directory_="win7x86_Dir" Attributes="0" KeyPath="turbojpeg.dll.meta_1" Type="0"/>
-    <ROW Component="turbojpeg.dll_1" ComponentId="{F6365B63-4E81-4685-B4CF-68ADCC16337D}" Directory_="win7x86_Dir" Attributes="0" KeyPath="turbojpeg.dll_1"/>
     <ROW Component="ucrtbased.dll" ComponentId="{B8D025EA-CD16-4EE7-A3E7-713E2BE82BF3}" Directory_="APPDIR" Attributes="0" KeyPath="ucrtbased.dll"/>
     <ROW Component="vcruntime140.dll" ComponentId="{144594CC-D19B-45E4-A420-7A1BBB122EE3}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140.dll"/>
     <ROW Component="vcruntime140d.dll" ComponentId="{7653420C-C6C3-4F31-97E8-D6DE417D3DF2}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140d.dll"/>
+    <ROW Component="win7x64" ComponentId="{2CDF6EA7-09E8-4BF1-A83F-4C8DCF47C865}" Directory_="win7x64_Dir" Attributes="0"/>
+    <ROW Component="win7x86" ComponentId="{319C3F36-D8D5-473C-AE32-3BE4CD06656F}" Directory_="win7x86_Dir" Attributes="0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
     <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0"/>
@@ -491,11 +489,6 @@
     <ROW File="Tango.DataStore.Remote.pdb" Component_="Tango.DataStore.Remote.dll" FileName="TANGOD~6.PDB|Tango.DataStore.Remote.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.DataStore.Remote.pdb" SelfReg="false"/>
     <ROW File="Tango.DataStore.Editing.dll" Component_="Tango.DataStore.Editing.dll" FileName="TANGOD~7.DLL|Tango.DataStore.Editing.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.DataStore.Editing.dll" SelfReg="false"/>
     <ROW File="Tango.DataStore.Editing.pdb" Component_="Tango.DataStore.Editing.dll" FileName="TANGOD~7.PDB|Tango.DataStore.Editing.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.DataStore.Editing.pdb" SelfReg="false"/>
-    <ROW File="LibGit2Sharp.dll.config" Component_="CommandLine.xml" FileName="LIBGIT~1.CON|LibGit2Sharp.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\LibGit2Sharp.dll.config" SelfReg="false"/>
-    <ROW File="turbojpeg.dll" Component_="turbojpeg.dll" FileName="TURBOJ~1.DLL|turbojpeg.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\win7-x64\turbojpeg.dll" SelfReg="false"/>
-    <ROW File="turbojpeg.dll.meta" Component_="turbojpeg.dll.meta" FileName="TURBOJ~1.MET|turbojpeg.dll.meta" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\win7-x64\turbojpeg.dll.meta" SelfReg="false"/>
-    <ROW File="turbojpeg.dll_1" Component_="turbojpeg.dll_1" FileName="TURBOJ~1.DLL|turbojpeg.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\win7-x86\turbojpeg.dll" SelfReg="false"/>
-    <ROW File="turbojpeg.dll.meta_1" Component_="turbojpeg.dll.meta_1" FileName="TURBOJ~1.MET|turbojpeg.dll.meta" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\win7-x86\turbojpeg.dll.meta" SelfReg="false"/>
     <ATTRIBUTE name="DontAddFileAttributes" value="true"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent">
@@ -505,7 +498,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\PPC" PackageFileName="PPC Installer_v1.4.5" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.4.5"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer_v1.4.6" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.4.6"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -573,6 +566,8 @@
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
     <ROW Directory_="SHORTCUTDIR" Component_="SHORTCUTDIR" ManualDelete="false"/>
     <ROW Directory_="APPDIR" Component_="APPDIR" ManualDelete="true"/>
+    <ROW Directory_="win7x64_Dir" Component_="win7x64" ManualDelete="false"/>
+    <ROW Directory_="win7x86_Dir" Component_="win7x86" ManualDelete="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
     <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/>
@@ -776,10 +771,8 @@
     <ROW Feature_="MainFeature" Component_="Tango.DataStore.Lite.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.DataStore.Remote.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.DataStore.Editing.dll"/>
-    <ROW Feature_="MainFeature" Component_="turbojpeg.dll"/>
-    <ROW Feature_="MainFeature" Component_="turbojpeg.dll.meta"/>
-    <ROW Feature_="MainFeature" Component_="turbojpeg.dll_1"/>
-    <ROW Feature_="MainFeature" Component_="turbojpeg.dll.meta_1"/>
+    <ROW Feature_="MainFeature" Component_="win7x86"/>
+    <ROW Feature_="MainFeature" Component_="win7x64"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
     <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1502"/>
diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs b/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs
index 123c94f7d..8c6c745a9 100644
--- a/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs
+++ b/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs
@@ -388,11 +388,11 @@ namespace Tango.AzureUtils.Environment
             if (config.CopyMachineServiceFiles)
             {
                 await _ftpManager.CopyAppFiles(sourceApp, targetApp);
-            }
 
-            //Restart slot.
-            OnProgress(AzureUtilsStage.Environment, "Restarting traget deployment slot...");
-            await targetApp.RestartAsync();
+                //Restart slot.
+                OnProgress(AzureUtilsStage.Environment, "Restarting target deployment slot...");
+                await targetApp.RestartAsync();
+            }
 
             OnCompleted("Environment upgraded successfully.");
         }
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp
index 9d8715b3a..1f0978364 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/ColorConverter.cpp
@@ -1375,12 +1375,12 @@ void Tango::ColorLib::ColorConverter::ConvertVolumeToRGBDisplay(InputCoordinates
 			VolumeNoLI(i) = Volume(i);
 	}
 	//Verify Volume is within the allowed limits
-	
-	GamutRegion = GetGamutRegion(VolumeNoLI, m_ProcessRangesMaxP);
 	for (int i = 0; i < m_nInks; ++i)  // % to nl/cm
 		VolumeNoLI(i) *= (m_maxNlPerCM(i)/100);
 
-	GetClosestInk(VolumeNoLI, GamutRegion, VolumeNoLI);
+	GamutRegion = GetGamutRegion(VolumeNoLI, m_ProcessRangesMaxP);
+	
+	GetClosestInk(VolumeNoLI, GamutRegion, VolumeNoLI);  //VolumeNoLI is in [%]
 
 	VolumeToNLInkP(VolumeNoLI, NLInkP);   //NLInkP is in %
 	//Limit Inks
@@ -1434,7 +1434,7 @@ void Tango::ColorLib::ColorConverter::ConvertVolumeToRGBDisplay(InputCoordinates
 	//July 29 2020
 	//Inks are limited in their nonlinear form
 	LimitInks(Ink4Vol, InkOutP);  //in [nl/cm]
-	NLInkPToVolume(DoubleToVector(InkOutP, m_nInks), VolumeNoLI);
+	NLInkPToVolume(DoubleToVector(InkOutP, m_nInks), VolumeNoLI);   //VolumeNoLI in [nl/cm]
 	GamutRegion = GetGamutRegion(VolumeNoLI, m_ProcessRangesMaxP);
 	NLcmtoPercentage(VolumeNoLI, VolumeNoLI);
 	
@@ -3103,7 +3103,7 @@ void Tango::ColorLib::ColorConverter::findStops(Gradient &GradStop1, Gradient &G
 		nOut = indGrad + 1;
 	else
 	{
-		throw std::exception("Number of subdivisions exceed allocation");
+		throw std::exception("Number of subdivisions exceeds allocation");
 		if (VecLabOut_tmp != NULL)
 		{
 			delete[] VecLabOut_tmp;
@@ -3432,7 +3432,7 @@ void Tango::ColorLib::ColorConverter::PrepareGradient(GradientConversionInput* c
 
 	//m_nVolumes = m_nB2AnSepOut;
 	int GamutRegion = 0;
-	for (int i = 0; i < m_nGradStops; ++i)
+/*	for (int i = 0; i < m_nGradStops; ++i)
 	{
 		inputcoordinates[i]->n_inputliquids = m_nInks;
 		inputcoordinates[i]->inputliquids = (InputLiquid**)malloc(sizeof(InputLiquid*) *m_nInks);
@@ -3441,7 +3441,7 @@ void Tango::ColorLib::ColorConverter::PrepareGradient(GradientConversionInput* c
 			inputcoordinates[i]->inputliquids[j] = (InputLiquid*)malloc(sizeof(InputLiquid));
 			input_liquid__init(inputcoordinates[i]->inputliquids[j]);
 		}
-	}
+	}*/
 	ProcessGradientStops(inputcoordinates);
 
 	//are all stops in the same region?
@@ -3761,16 +3761,34 @@ void  Tango::ColorLib::ColorConverter::GradInput2InputCoords(GradientConversionI
 			inputcoordinates[i]->has_b = true;
 			break;
 		case COLOR_SPACE__Catalog:
-			inputcoordinates[i]->cyan = conversionInput->stops[i]->cyan;
-			inputcoordinates[i]->magenta = conversionInput->stops[i]->magenta;
-			inputcoordinates[i]->yellow = conversionInput->stops[i]->yellow;
-			inputcoordinates[i]->key = conversionInput->stops[i]->key;
-			inputcoordinates[i]->has_cyan = conversionInput->stops[i]->has_cyan;
-			inputcoordinates[i]->has_magenta = conversionInput->stops[i]->has_magenta;
-			inputcoordinates[i]->has_yellow = conversionInput->stops[i]->has_yellow;
-			inputcoordinates[i]->has_key = conversionInput->stops[i]->has_key;
+		{
+			InputLiquid** InputLiquidsIC = (InputLiquid**)malloc(sizeof(InputLiquid*) *m_TotalNumberofInks);
+			for (int j = 0; j < m_TotalNumberofInks; j++)
+			{
+				InputLiquidsIC[j] = (InputLiquid*)malloc(sizeof(InputLiquid));
+				input_liquid__init(InputLiquidsIC[j]);
+			}
+	
+			/*LiquidVolume* liquidVolume = conversionInput->stops[i]->liquidvolumes[j];*/
+			GradientInputStop *ColorStop = conversionInput->stops[i]; 
+			InputLiquidsIC[0]->volume = ColorStop->cyan;
+			InputLiquidsIC[0]->liquidtype = LIQUID_TYPE__Cyan;
+
+			InputLiquidsIC[1]->volume = ColorStop->magenta;
+			InputLiquidsIC[1]->liquidtype = LIQUID_TYPE__Magenta;
+					
+			InputLiquidsIC[2]->volume = ColorStop->yellow;
+			InputLiquidsIC[2]->liquidtype = LIQUID_TYPE__Yellow;
+
+			InputLiquidsIC[3]->volume = ColorStop->key;
+			InputLiquidsIC[3]->liquidtype = LIQUID_TYPE__Black;
+
+			inputcoordinates[i]->inputliquids = InputLiquidsIC;
+			inputcoordinates[i]->n_inputliquids = m_TotalNumberofInks;
 			break;
+		}
 		case COLOR_SPACE__Volume: //Case Volume	
+		{
 			//int  size= (int)conversionInput->stops[i]->n_liquidvolumes;
 			InputLiquid** InputLiquidsIC = (InputLiquid**)malloc(sizeof(InputLiquid*) *m_TotalNumberofInks);
 			for (int j = 0; j < m_TotalNumberofInks; j++)
@@ -3807,6 +3825,7 @@ void  Tango::ColorLib::ColorConverter::GradInput2InputCoords(GradientConversionI
 			inputcoordinates[i]->n_inputliquids = m_TotalNumberofInks;
 			break;
 		}
+		}
 	}
 }
 
@@ -3978,8 +3997,9 @@ int  Tango::ColorLib::ColorConverter::GetGamutRegion(VectorXd Volume, double *Ga
 	int nGR = m_colortable->GetnGamutRegions();
 	for (int i = 0; i < m_nInks; ++i)
 	{ 
-		Volnlcm = m_maxNlPerCM(i)*Volume(i)/100.0;
-		TotalVolume += Volnlcm;
+		//Volnlcm = m_maxNlPerCM(i)*Volume(i)/100.0;
+		//TotalVolume += Volnlcm;
+		TotalVolume += Volume(i);
 	}
 	for (int i = 0; i < nGR - 1; ++i)
 	{
@@ -4026,7 +4046,7 @@ void Tango::ColorLib::ColorConverter::ProcessGradientStops(InputCoordinates **in
 		if (m_GradStops[i].Get_ColorSpace() == COLOR_SPACE__Volume || m_GradStops[i].Get_ColorSpace() == COLOR_SPACE__Catalog)
 		{ //Convert volume to Lab
 			//Convert lab to rgb
-			if (m_GradStops[i].Get_ColorSpace() == COLOR_SPACE__Catalog)
+			/*if (m_GradStops[i].Get_ColorSpace() == COLOR_SPACE__Catalog)
 			{ 
 				inputcoordinates[i]->inputliquids[0]->volume = inputcoordinates[i]->cyan;
 				inputcoordinates[i]->inputliquids[1]->volume = inputcoordinates[i]->magenta;
@@ -4034,7 +4054,7 @@ void Tango::ColorLib::ColorConverter::ProcessGradientStops(InputCoordinates **in
 				inputcoordinates[i]->inputliquids[3]->volume = inputcoordinates[i]->key;
 				for (int i_hv =0; i_hv<4; ++i_hv)
 					inputcoordinates[i]->inputliquids[i_hv]->has_volume = true;
-			}
+			}*/
 			ConvertVolumeToRGBDisplay(inputcoordinates[i], m_nProcessRanges, m_GradStops[i].Get_ColorSpace(), Volume, 
 				RGBOut, LabOut, GamutRegion);
 			VectorToDouble(LabOut, LabOutV);
@@ -4149,8 +4169,8 @@ void Tango::ColorLib::ColorConverter::LimitNLInks2Volume(VectorXd NLInks, int &G
 // NLInks are in the full thread range
 	LimitInks(NLInks, InkOutL); // InkOutL in [nl/cm]
 	NLInkPToVolume(DoubleToVector(InkOutL, m_nInks), Volume);
-	GamutRegion = GetGamutRegion(Volume, m_ProcessRangesMaxP); 
-	GetClosestInk(Volume, GamutRegion, Volume);
+	GamutRegion = GetGamutRegion(Volume, m_ProcessRangesMaxP);  //Volume in [nl/cm]
+	GetClosestInk(Volume, GamutRegion, Volume);  //Volume is in [%]
 	//NLcmtoPercentage(Volume, Volume);
 	ConfineVolumes(Volume);
 	if (InkOutL != NULL)
@@ -4340,7 +4360,7 @@ void Tango::ColorLib::ColorConverter::ConvertVolumeToLabRel(VectorXd &Volume, Ve
 	//Inks are limited in their nonlinear form
 
 	LimitInks(NLInkP, InkOutP);  //InkOutP is in [nl/cm]
-	NLInkPToVolume(DoubleToVector(InkOutP, m_nInks), Volume);
+	NLInkPToVolume(DoubleToVector(InkOutP, m_nInks), Volume); //Volume is in [nl/cm]
 	GamutRegion = GetGamutRegion(Volume, m_ProcessRangesMaxP);
 	NLcmtoPercentage(Volume, Volume); //Volume is back to percentage
 	VolumeToNLInkP(Volume, NLInkP);	
@@ -4747,15 +4767,15 @@ size_t Tango::ColorLib::ColorConverter::GetRecommendedProcessParameters(uint8_t
 				//Assumption: Input is given without light iks
 				//The volumes are given in Thread units in %
 				for (int jV = 0; jV < m_nInks; ++jV)
-					Volume(jV) = inputcoordinates[istops]->inputliquids[jV]->volume;
+					Volume(jV) = inputcoordinates[istops]->inputliquids[jV]->volume;  //volumes are in [%]
 
 				if (Input->uselightinks)
 				{   //Convert to light inks
-					SplitVolume(Volume, VolumeLi, GamutRegion[istops]);
+					SplitVolume(Volume, VolumeLi, GamutRegion[istops]);  //VolumeLi is in [%]
 				}
 				else
 				{
-					GamutRegion[istops] = GetGamutRegion(Volume, m_ProcessRangesMaxP);
+					GamutRegion[istops] = GetGamutRegion(Volume, m_ProcessRangesMaxP);//Volume is in [%]
 				}
 			}
 			else if (Input->stops[istops]->colorspace == COLOR_SPACE__Catalog)
@@ -4786,11 +4806,11 @@ size_t Tango::ColorLib::ColorConverter::GetRecommendedProcessParameters(uint8_t
 					Volume(jV) =IC->inputliquids[jV]->volume;
 				if (Input->uselightinks)
 				{   //Convert to light inks
-					SplitVolume(Volume, VolumeLi, GamutRegion[istops]);
+					SplitVolume(Volume, VolumeLi, GamutRegion[istops]);  //VolumeLi is in [%]
 				}
 				else
 				{
-					GamutRegion[istops] = GetGamutRegion(Volume, m_ProcessRangesMaxP);
+					GamutRegion[istops] = GetGamutRegion(Volume, m_ProcessRangesMaxP);  //Volume is in [%]
 				}
 			}
 			else
@@ -4805,10 +4825,10 @@ size_t Tango::ColorLib::ColorConverter::GetRecommendedProcessParameters(uint8_t
 				if (m_CalibMode == 1)
 				{
 					ConvertToNLInks(InkOut, NLInkOut);
-					LimitNLInks2Volume(NLInkOut, GamutRegion[istops], Volume);
+					LimitNLInks2Volume(NLInkOut, GamutRegion[istops], Volume);  //Volume is in [%]
 				}
 				else
-					LimitNLInks2Volume(InkOut, GamutRegion[istops], Volume);
+					LimitNLInks2Volume(InkOut, GamutRegion[istops], Volume);   //Volume is in [%]
 		
 				if (Input->uselightinks)
 				{   //Convert to light inks
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/Utils/Gradient.cpp b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/Utils/Gradient.cpp
index 63a93de54..c2878d156 100644
--- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/Utils/Gradient.cpp
+++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/Utils/Gradient.cpp
@@ -41,5 +41,5 @@ void Gradient::SetVolumeValue(double val, int ind)
 
 void Gradient::SetCatalogInkValues(double val, int ind)
 {
-
+	m_Volume[ind] = val;
 }
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 cfa23aa1e..9408391ac 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.4.3.0")]
+[assembly: AssemblyVersion("4.4.4.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
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 e968c2572..596c5ad85 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.4.5.0")]
+[assembly: AssemblyVersion("1.4.6.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index efc5f8179..d72e75011 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>
diff --git a/Software/Visual_Studio/Tango.ColorLib.GradientTest.CLI/Program.cs b/Software/Visual_Studio/Tango.ColorLib.GradientTest.CLI/Program.cs
index 75746c7bc..576592c66 100644
--- a/Software/Visual_Studio/Tango.ColorLib.GradientTest.CLI/Program.cs
+++ b/Software/Visual_Studio/Tango.ColorLib.GradientTest.CLI/Program.cs
@@ -774,81 +774,93 @@ namespace Tango.ColorLib.GradientTest.CLI
             {
                 ColorSpace = ColorSpace.Catalog,
                 Offset = 0.0,
+                Cyan = 50.0,
+                Magenta = 50.0,
+                Yellow = 0.0,
+                Key = 0.0,
             };
-            gradientInputStop1.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Cyan,
-                Volume = 50
-            });
-            gradientInputStop1.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Magenta,
-                Volume = 50
-            });
-            gradientInputStop1.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Yellow,
-                Volume = 0
-            });
-            gradientInputStop1.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Black,
-                Volume = 0
-            });
+            //gradientInputStop1.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Cyan,
+            //    Volume = 50
+            //});
+            //gradientInputStop1.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Magenta,
+            //    Volume = 50
+            //});
+            //gradientInputStop1.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Yellow,
+            //    Volume = 0
+            //});
+            //gradientInputStop1.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Black,
+            //    Volume = 0
+            //});
             input.Stops.Add(gradientInputStop1);
 
             GradientInputStop gradientInputStop2 = new GradientInputStop()
             {
                 ColorSpace = ColorSpace.Catalog,
                 Offset = 0.5,
+                Cyan = 0.0,
+                Magenta = 50.0,
+                Yellow = 50.0,
+                Key = 0.0,
             };
-            gradientInputStop2.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Cyan,
-                Volume = 0
-            });
-            gradientInputStop2.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Magenta,
-                Volume = 50
-            });
-            gradientInputStop2.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Yellow,
-                Volume = 50
-            });
-            gradientInputStop2.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Black,
-                Volume = 0
-            });
+            //gradientInputStop2.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Cyan,
+            //    Volume = 0
+            //});
+            //gradientInputStop2.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Magenta,
+            //    Volume = 50
+            //});
+            //gradientInputStop2.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Yellow,
+            //    Volume = 50
+            //});
+            //gradientInputStop2.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Black,
+            //    Volume = 0
+            //});
             input.Stops.Add(gradientInputStop2);
 
             GradientInputStop gradientInputStop3 = new GradientInputStop()
             {
                 ColorSpace = ColorSpace.Catalog,
                 Offset = 1,
+                Cyan = 50.0,
+                Magenta = 50.0,
+                Yellow = 0.0,
+                Key = 0.0,
             };
-            gradientInputStop3.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Cyan,
-                Volume = 50
-            });
-            gradientInputStop3.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Magenta,
-                Volume = 0
-            });
-            gradientInputStop3.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Yellow,
-                Volume = 50
-            });
-            gradientInputStop3.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Black,
-                Volume = 0
-            });
+            //gradientInputStop3.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Cyan,
+            //    Volume = 50
+            //});
+            //gradientInputStop3.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Magenta,
+            //    Volume = 0
+            //});
+            //gradientInputStop3.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Yellow,
+            //    Volume = 50
+            //});
+            //gradientInputStop3.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Black,
+            //    Volume = 0
+            //});
             input.Stops.Add(gradientInputStop3);
 
             Console.WriteLine($"TestCatalogGamutRegion0 input:\n{input.ToJsonString(nameof(input.ForwardData), nameof(CalibrationData))}");
@@ -874,27 +886,31 @@ namespace Tango.ColorLib.GradientTest.CLI
             {
                 ColorSpace = ColorSpace.Catalog,
                 Offset = 0.0,
+                Cyan = 100.0,
+                Magenta = 50.0,
+                Yellow = 0.0,
+                Key = 0.0,
             };
-            gradientInputStop1.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Cyan,
-                Volume = 100
-            });
-            gradientInputStop1.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Magenta,
-                Volume = 50
-            });
-            gradientInputStop1.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Yellow,
-                Volume = 0
-            });
-            gradientInputStop1.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Black,
-                Volume = 0
-            });
+            //gradientInputStop1.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Cyan,
+            //    Volume = 100
+            //});
+            //gradientInputStop1.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Magenta,
+            //    Volume = 50
+            //});
+            //gradientInputStop1.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Yellow,
+            //    Volume = 0
+            //});
+            //gradientInputStop1.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Black,
+            //    Volume = 0
+            //});
             input.Stops.Add(gradientInputStop1);
 
             //Volume, Gamut Region 1, In Gamut
@@ -902,54 +918,63 @@ namespace Tango.ColorLib.GradientTest.CLI
             {
                 ColorSpace = ColorSpace.Catalog,
                 Offset = 0.5,
+                Cyan = 100.0,
+                Magenta = 50.0,
+                Yellow = 0.0,
+                Key = 0.0,
             };
-            gradientInputStop2.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Cyan,
-                Volume = 0
-            });
-            gradientInputStop2.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Magenta,
-                Volume = 100
-            });
-            gradientInputStop2.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Yellow,
-                Volume = 50
-            });
-            gradientInputStop2.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Black,
-                Volume = 0
-            });
+            //gradientInputStop2.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Cyan,
+            //    Volume = 100
+            //});
+            //gradientInputStop2.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Magenta,
+            //    Volume = 50
+            //});
+            //gradientInputStop2.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Yellow,
+            //    Volume = 0
+            //});
+            //gradientInputStop2.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Black,
+            //    Volume = 0
+            //});
             input.Stops.Add(gradientInputStop2);
 
             GradientInputStop gradientInputStop3 = new GradientInputStop()
             {
                 ColorSpace = ColorSpace.Catalog,
                 Offset = 1,
+                Cyan = 50.0,
+                Magenta = 0.0,
+                Yellow = 100.0,
+                Key = 0.0,
             };
-            gradientInputStop3.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Cyan,
-                Volume = 50
-            });
-            gradientInputStop3.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Magenta,
-                Volume = 0
-            });
-            gradientInputStop3.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Yellow,
-                Volume = 100
-            });
-            gradientInputStop3.LiquidVolumes.Add(new LiquidVolume()
-            {
-                LiquidType = LiquidType.Black,
-                Volume = 0
-            });
+  
+            //gradientInputStop3.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Cyan,
+            //    Volume = 50
+            //});
+            //gradientInputStop3.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Magenta,
+            //    Volume = 0
+            //});
+            //gradientInputStop3.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Yellow,
+            //    Volume = 100
+            //});
+            //gradientInputStop3.LiquidVolumes.Add(new LiquidVolume()
+            //{
+            //    LiquidType = LiquidType.Black,
+            //    Volume = 0
+            //});
             input.Stops.Add(gradientInputStop3);
 
             Console.WriteLine($"TestCatalogGamutRegion1 input:\n{input.ToJsonString(nameof(input.ForwardData), nameof(CalibrationData))}");
diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln
index 3c9c43561..b94961e47 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -551,8 +551,8 @@ Global
 		{DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Debug|x64.Build.0 = Debug|Any CPU
 		{DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Debug|x86.Build.0 = Debug|Any CPU
-		{DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Release|ARM.ActiveCfg = Release|Any CPU
 		{DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Release|ARM.Build.0 = Release|Any CPU
 		{DE5AB980-A9AD-4273-8272-C4E1E062E3EC}.Release|ARM64.ActiveCfg = Release|Any CPU
@@ -4609,12 +4609,12 @@ Global
 		{B356201F-F958-4AC9-BBEB-E4EAE9DA9EC6} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
-		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
-		BuildVersion_UpdateAssemblyVersion = True
-		BuildVersion_UpdateFileVersion = False
-		BuildVersion_StartDate = 2000/1/1
-		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
 		BuildVersion_UseGlobalSettings = False
+		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
+		BuildVersion_StartDate = 2000/1/1
+		BuildVersion_UpdateFileVersion = False
+		BuildVersion_UpdateAssemblyVersion = True
+		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
+		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
 	EndGlobalSection
 EndGlobal