Use Lubricant Transform

13 files changed, 281 insertions, 104 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
index 0882d43e0..ca3c3e322 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs
@@ -245,6 +245,7 @@ namespace Tango.MachineStudio.RML.ViewModels
                     input.ThreadB = RML.WhitePointB;
 
                     input.UseLightInks = RML.UseLightInks;
+                    input.UseLubricantTransform = RML.UseLubricantTransform;
                     input.VMax = RML.VMax;
 
                     //Validate calibration data
@@ -383,6 +384,7 @@ namespace Tango.MachineStudio.RML.ViewModels
                 input.ThreadB = RML.WhitePointB;
 
                 input.UseLightInks = RML.UseLightInks;
+                input.UseLubricantTransform = RML.UseLubricantTransform;
                 input.VMax = RML.VMax;
 
                 foreach (var vm in LiquidsCalibrationData.Where(x => x.LiquidType.HasPigment))
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
index 7e3b4fa4a..08af47ef4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
@@ -267,6 +267,7 @@
 
                                                             <CheckBox ToolTip="Use the color conversion engine to generate gradients" IsChecked="{Binding ActiveRML.UseColorLibGradients}" HorizontalAlignment="Left" Margin="0 20 0 0">Enable Gradient Generation</CheckBox>
                                                             <CheckBox ToolTip="Use light inks when converting colors to liquid volumes" IsChecked="{Binding ActiveRML.UseLightInks}" HorizontalAlignment="Left" Margin="0 10 0 0">Use Light Inks</CheckBox>
+                                                            <CheckBox ToolTip="Use lubricant transformation when converting to liquid volumes" IsChecked="{Binding ActiveRML.UseLubricantTransform}" HorizontalAlignment="Left" Margin="0 10 0 0">Use Lubricant Transform</CheckBox>
 
                                                             <DockPanel Margin="0 10 0 0">
                                                                 <TextBlock VerticalAlignment="Center" Text="V-Max:" ></TextBlock>
diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
index be6c9486f..e3b9f676c 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs
@@ -270,6 +270,14 @@ namespace Tango.BL.DTO
         }
 
         /// <summary>
+        /// use lubricant transform
+        /// </summary>
+        public Boolean UseLubricantTransform 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// head type
         /// </summary>
         public Int32 HeadType 
diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
index 5aac56248..17b29d691 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs
@@ -71,6 +71,8 @@ namespace Tango.BL.Entities
 
         public event EventHandler<Boolean> UseLightInksChanged;
 
+        public event EventHandler<Boolean> UseLubricantTransformChanged;
+
         public event EventHandler<Int32> HeadTypeChanged;
 
         public event EventHandler<Int32> QualificationLevelChanged;
@@ -973,6 +975,33 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected Boolean _uselubricanttransform;
+
+        /// <summary>
+        /// Gets or sets the rmlbase use lubricant transform.
+        /// </summary>
+
+        [Column("USE_LUBRICANT_TRANSFORM")]
+
+        public  Boolean UseLubricantTransform
+        {
+            get 
+            {
+                return _uselubricanttransform; 
+            }
+
+            set 
+            {
+                if (_uselubricanttransform != value)
+                {
+                    _uselubricanttransform = value;
+
+                    OnUseLubricantTransformChanged(value);
+
+                }
+            }
+        }
+
         protected Int32 _headtype;
 
         /// <summary>
@@ -2262,6 +2291,15 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
+        /// Called when the UseLubricantTransform has changed.
+        /// </summary>
+        protected virtual void OnUseLubricantTransformChanged(Boolean uselubricanttransform)
+        {
+            UseLubricantTransformChanged?.Invoke(this, uselubricanttransform);
+            RaisePropertyChanged(nameof(UseLubricantTransform));
+        }
+
+        /// <summary>
         /// Called when the HeadType has changed.
         /// </summary>
         protected virtual void OnHeadTypeChanged(Int32 headtype)
diff --git a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
index cdb00a3ee..20e17bcc6 100644
--- a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
+++ b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs
@@ -149,6 +149,8 @@ namespace Tango.ColorConversion
 
             conversionInput.UseLightInks = rml.UseLightInks && lightInksInstalled && useLightInks && settings.UseLightInks;
 
+            conversionInput.UseLubricantTransform = rml.UseLubricantTransform;
+
             conversionInput.VMax = rml.VMax;
 
             conversionInput.ForwardData = ByteString.CopyFrom(rml.Cct.Data);
@@ -337,6 +339,8 @@ namespace Tango.ColorConversion
             input.ThreadA = rml.WhitePointA;
             input.ThreadB = rml.WhitePointB;
 
+            input.UseLubricantTransform = rml.UseLubricantTransform;
+
             input.InputCoordinates = new InputCoordinates();
 
             if (stop.BrushColorSpace == ColorSpaces.RGB)
@@ -553,6 +557,8 @@ namespace Tango.ColorConversion
 
             var settings = SettingsManager.Default.GetOrCreate<ColorConversionSettings>();
             input.UseLightInks = settings.UseLightInks && rml.UseLightInks && machine.LightInksInstalled && useLightInks;
+            input.UseLubricantTransform = rml.UseLubricantTransform;
+            
             //TODO: Do we need input.Vmax ?? (Mirta)
 
             foreach (var prTable in rml.GetActiveProcessGroup().ProcessParametersTables)
@@ -802,6 +808,8 @@ namespace Tango.ColorConversion
                 conversionInput.LubData = ByteString.CopyFrom(rml.Lub.Data);
             }
 
+            conversionInput.UseLubricantTransform = rml.UseLubricantTransform;
+
             conversionInput.ThreadL = rml.WhitePointL;
             conversionInput.ThreadA = rml.WhitePointA;
             conversionInput.ThreadB = rml.WhitePointB;
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
index 5488e8c54..b1f71c687 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
@@ -61,6 +61,7 @@ namespace Tango.DAL.Remote.DB
         public int COLOR_CONVERSION_VERSION { get; set; }
         public bool USE_COLOR_LIB_GRADIENTS { get; set; }
         public bool USE_LIGHT_INKS { get; set; }
+        public bool USE_LUBRICANT_TRANSFORM { get; set; }
         public int HEAD_TYPE { get; set; }
         public int QUALIFICATION_LEVEL { get; set; }
         public Nullable<System.DateTime> QUALIFICATION_DATE { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index d52f40cab..dc068684b 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -1309,6 +1309,7 @@
           <Property Name="COLOR_CONVERSION_VERSION" Type="int" Nullable="false" />
           <Property Name="USE_COLOR_LIB_GRADIENTS" Type="bit" Nullable="false" />
           <Property Name="USE_LIGHT_INKS" Type="bit" Nullable="false" />
+          <Property Name="USE_LUBRICANT_TRANSFORM" Type="bit" Nullable="false" />
           <Property Name="HEAD_TYPE" Type="int" Nullable="false" />
           <Property Name="QUALIFICATION_LEVEL" Type="int" Nullable="false" />
           <Property Name="QUALIFICATION_DATE" Type="datetime2" Precision="3" />
@@ -6823,6 +6824,7 @@
           <Property Name="COLOR_CONVERSION_VERSION" Type="Int32" Nullable="false" />
           <Property Name="USE_COLOR_LIB_GRADIENTS" Type="Boolean" Nullable="false" />
           <Property Name="USE_LIGHT_INKS" Type="Boolean" Nullable="false" />
+          <Property Name="USE_LUBRICANT_TRANSFORM" Type="Boolean" Nullable="false" />
           <Property Name="HEAD_TYPE" Type="Int32" Nullable="false" />
           <Property Name="QUALIFICATION_LEVEL" Type="Int32" Nullable="false" />
           <Property Name="QUALIFICATION_DATE" Type="DateTime" Precision="3" />
@@ -10214,6 +10216,7 @@
                 <ScalarProperty Name="QUALIFICATION_DATE" ColumnName="QUALIFICATION_DATE" />
                 <ScalarProperty Name="QUALIFICATION_LEVEL" ColumnName="QUALIFICATION_LEVEL" />
                 <ScalarProperty Name="HEAD_TYPE" ColumnName="HEAD_TYPE" />
+                <ScalarProperty Name="USE_LUBRICANT_TRANSFORM" ColumnName="USE_LUBRICANT_TRANSFORM" />
                 <ScalarProperty Name="USE_LIGHT_INKS" ColumnName="USE_LIGHT_INKS" />
                 <ScalarProperty Name="USE_COLOR_LIB_GRADIENTS" ColumnName="USE_COLOR_LIB_GRADIENTS" />
                 <ScalarProperty Name="COLOR_CONVERSION_VERSION" ColumnName="COLOR_CONVERSION_VERSION" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index f48276400..5beb4e96f 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,102 +5,102 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="87">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="8" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="68.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="86.875" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="83.875" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="89.75" />
-        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="5.75" PointY="9.375" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="17.5" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="35" />
-        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="21.375" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="47.25" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="17.125" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="16.25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="9" PointY="40.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="13.5" PointY="16.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="15.75" PointY="15.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="25" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="5.75" PointY="13.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="30.625" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="78.5" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="64.75" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="34.125" />
-        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="64.75" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="105.25" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="104.625" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="73" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="57.75" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="38.25" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="29.125" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="62.125" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="82.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="79.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="69.5" />
+        <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="5.75" PointY="7.25" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="17.375" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="25" />
+        <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="31.25" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3.75" PointY="44.5" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="21" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="7.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="1.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="2.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="1" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="16.875" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="2.75" PointY="6.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="33.75" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3.75" PointY="75.125" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="58.25" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="37.25" />
+        <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="8.25" PointY="78.25" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="1.5" PointY="90" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3.75" PointY="89.375" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="76.75" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="41.5" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="28.375" />
         <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="10.5" />
-        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="11.625" />
-        <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="41.25" />
-        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="13.75" PointY="8.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="4.5" PointY="79.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6.75" PointY="92.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="83.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="89" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="1.5" PointY="97.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3.75" PointY="87.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="85.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="89.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="1.5" PointY="109.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="3.75" PointY="97.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="101.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3.75" PointY="93" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="92.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="109.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="97.125" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="43.875" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="40.75" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="16.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="17.375" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="32" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="3.125" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="17.25" />
-        <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="25.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="16.75" PointY="10.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="29.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="52.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="52.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="35.125" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="13.375" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="28.875" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="7.5" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="36.375" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="46.625" />
+        <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="8" />
+        <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="16.75" />
+        <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="7.75" PointY="7.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="9.5" PointY="85" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="11.75" PointY="72.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="9.5" PointY="59" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="11.75" PointY="68.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="1.5" PointY="94" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3.75" PointY="80" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="6.5" PointY="62" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="8.75" PointY="62.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="8.5" PointY="89" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="10.75" PointY="77.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="6.5" PointY="83" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="8.75" PointY="72.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="72.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="1.5" PointY="86" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3.75" PointY="70.875" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3.75" PointY="37.875" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="6" PointY="42.25" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="20.75" PointY="9.25" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="17.25" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="40.625" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="9.5" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="13.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="8.75" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="11.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="3.75" PointY="66.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="6" PointY="66.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="41.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="21.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="37.5" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="34.625" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3.75" PointY="41.125" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="3.75" PointY="60.25" />
         <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="48.125" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="51.125" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="5.75" PointY="5.625" />
-        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="8" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="8" PointY="1.625" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="15.125" />
-        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="21" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="48" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="51" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="16.75" PointY="5.5" />
+        <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="19" PointY="5.625" />
+        <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="19" PointY="1.5" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="14.875" />
+        <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="20.875" />
         <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="4.625" />
         <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="17.75" PointY="13.375" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="21.125" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="21.375" />
-        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="11.125" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="14.25" PointY="29.375" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="21.5" />
-        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="14.25" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="13.75" PointY="15.25" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="21" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="21.25" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="31" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="13.625" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="25.375" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="14.25" PointY="28.375" />
         <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="25.25" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="42.625" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="8.375" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="18.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="33" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="18.75" PointY="6.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="18.75" PointY="10.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="19.75" PointY="13.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="20.75" PointY="1.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="20.75" PointY="6.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="20.75" PointY="16.375" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="49.375" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="8.75" PointY="4.25" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="16.75" PointY="9.25" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="11.25" PointY="36.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="13.75" PointY="8.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="16.75" PointY="14.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="20.75" PointY="18.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="20.75" PointY="21.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="21.75" PointY="1.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="22.75" PointY="6.25" />
         <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="10.375" />
         <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="11.75" />
-        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="5.75" PointY="2.125" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="37.25" />
+        <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="16.75" PointY="1.875" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="30.625" />
         <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
index 592297ca0..a1f1538d3 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs
@@ -24,7 +24,7 @@ namespace Tango.PMR.ColorLab {
           string.Concat(
             "ChVDb252ZXJzaW9uSW5wdXQucHJvdG8SElRhbmdvLlBNUi5Db2xvckxhYhoW",
             "SW5wdXRDb29yZGluYXRlcy5wcm90bxoQQ29sb3JTcGFjZS5wcm90bxoSUHJv",
-            "Y2Vzc1JhbmdlLnByb3RvIrMDCg9Db252ZXJzaW9uSW5wdXQSDwoHVGhyZWFk",
+            "Y2Vzc1JhbmdlLnByb3RvItIDCg9Db252ZXJzaW9uSW5wdXQSDwoHVGhyZWFk",
             "TBgBIAEoARIPCgdUaHJlYWRBGAIgASgBEg8KB1RocmVhZEIYAyABKAESMgoK",
             "Q29sb3JTcGFjZRgEIAEoDjIeLlRhbmdvLlBNUi5Db2xvckxhYi5Db2xvclNw",
             "YWNlEj4KEElucHV0Q29vcmRpbmF0ZXMYBSABKAsyJC5UYW5nby5QTVIuQ29s",
@@ -34,11 +34,12 @@ namespace Tango.PMR.ColorLab {
             "UmFuZ2VzGAsgAygLMiAuVGFuZ28uUE1SLkNvbG9yTGFiLlByb2Nlc3NSYW5n",
             "ZRIUCgxHZW5lcmF0ZUhpdmUYDCABKAgSFAoMVXNlTGlnaHRJbmtzGA0gASgI",
             "EgwKBFZNYXgYDiABKAESDwoHR2JkRGF0YRgPIAEoDBIPCgdMdWJEYXRhGBAg",
-            "ASgMQh4KHGNvbS50d2luZS50YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
+            "ASgMEh0KFVVzZUx1YnJpY2FudFRyYW5zZm9ybRgRIAEoCEIeChxjb20udHdp",
+            "bmUudGFuZ28ucG1yLmNvbG9ybGFiYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.InputCoordinatesReflection.Descriptor, global::Tango.PMR.ColorLab.ColorSpaceReflection.Descriptor, global::Tango.PMR.ColorLab.ProcessRangeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.ConversionInput), global::Tango.PMR.ColorLab.ConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "InverseData", "SegmentLength", "DeltaChroma", "DeltaL", "ProcessRanges", "GenerateHive", "UseLightInks", "VMax", "GbdData", "LubData" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.ConversionInput), global::Tango.PMR.ColorLab.ConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "InverseData", "SegmentLength", "DeltaChroma", "DeltaL", "ProcessRanges", "GenerateHive", "UseLightInks", "VMax", "GbdData", "LubData", "UseLubricantTransform" }, null, null, null)
           }));
     }
     #endregion
@@ -85,6 +86,7 @@ namespace Tango.PMR.ColorLab {
       vMax_ = other.vMax_;
       gbdData_ = other.gbdData_;
       lubData_ = other.lubData_;
+      useLubricantTransform_ = other.useLubricantTransform_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -267,6 +269,17 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
+    /// <summary>Field number for the "UseLubricantTransform" field.</summary>
+    public const int UseLubricantTransformFieldNumber = 17;
+    private bool useLubricantTransform_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool UseLubricantTransform {
+      get { return useLubricantTransform_; }
+      set {
+        useLubricantTransform_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as ConversionInput);
@@ -296,6 +309,7 @@ namespace Tango.PMR.ColorLab {
       if (VMax != other.VMax) return false;
       if (GbdData != other.GbdData) return false;
       if (LubData != other.LubData) return false;
+      if (UseLubricantTransform != other.UseLubricantTransform) return false;
       return true;
     }
 
@@ -318,6 +332,7 @@ namespace Tango.PMR.ColorLab {
       if (VMax != 0D) hash ^= VMax.GetHashCode();
       if (GbdData.Length != 0) hash ^= GbdData.GetHashCode();
       if (LubData.Length != 0) hash ^= LubData.GetHashCode();
+      if (UseLubricantTransform != false) hash ^= UseLubricantTransform.GetHashCode();
       return hash;
     }
 
@@ -389,6 +404,10 @@ namespace Tango.PMR.ColorLab {
         output.WriteRawTag(130, 1);
         output.WriteBytes(LubData);
       }
+      if (UseLubricantTransform != false) {
+        output.WriteRawTag(136, 1);
+        output.WriteBool(UseLubricantTransform);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -440,6 +459,9 @@ namespace Tango.PMR.ColorLab {
       if (LubData.Length != 0) {
         size += 2 + pb::CodedOutputStream.ComputeBytesSize(LubData);
       }
+      if (UseLubricantTransform != false) {
+        size += 2 + 1;
+      }
       return size;
     }
 
@@ -497,6 +519,9 @@ namespace Tango.PMR.ColorLab {
       if (other.LubData.Length != 0) {
         LubData = other.LubData;
       }
+      if (other.UseLubricantTransform != false) {
+        UseLubricantTransform = other.UseLubricantTransform;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -574,6 +599,10 @@ namespace Tango.PMR.ColorLab {
             LubData = input.ReadBytes();
             break;
           }
+          case 136: {
+            UseLubricantTransform = input.ReadBool();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/GradientConversionInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/GradientConversionInput.cs
index abb24ddb0..37e3642fa 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/GradientConversionInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/GradientConversionInput.cs
@@ -24,19 +24,20 @@ namespace Tango.PMR.ColorLab {
           string.Concat(
             "Ch1HcmFkaWVudENvbnZlcnNpb25JbnB1dC5wcm90bxISVGFuZ28uUE1SLkNv",
             "bG9yTGFiGhJQcm9jZXNzUmFuZ2UucHJvdG8aEUlucHV0TGlxdWlkLnByb3Rv",
-            "GhdHcmFkaWVudElucHV0U3RvcC5wcm90byLAAgoXR3JhZGllbnRDb252ZXJz",
+            "GhdHcmFkaWVudElucHV0U3RvcC5wcm90byLfAgoXR3JhZGllbnRDb252ZXJz",
             "aW9uSW5wdXQSDwoHVGhyZWFkTBgBIAEoARIPCgdUaHJlYWRBGAIgASgBEg8K",
             "B1RocmVhZEIYAyABKAESEwoLRm9yd2FyZERhdGEYBCABKAwSFQoNU2VnbWVu",
             "dExlbmd0aBgFIAEoARI0CgVTdG9wcxgGIAMoCzIlLlRhbmdvLlBNUi5Db2xv",
             "ckxhYi5HcmFkaWVudElucHV0U3RvcBI1CgxJbnB1dExpcXVpZHMYByADKAsy",
             "Hy5UYW5nby5QTVIuQ29sb3JMYWIuSW5wdXRMaXF1aWQSNwoNUHJvY2Vzc1Jh",
             "bmdlcxgIIAMoCzIgLlRhbmdvLlBNUi5Db2xvckxhYi5Qcm9jZXNzUmFuZ2US",
-            "DwoHR2JkRGF0YRgJIAEoDBIPCgdMdWJEYXRhGAogASgMQh4KHGNvbS50d2lu",
-            "ZS50YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
+            "DwoHR2JkRGF0YRgJIAEoDBIPCgdMdWJEYXRhGAogASgMEh0KFVVzZUx1YnJp",
+            "Y2FudFRyYW5zZm9ybRgLIAEoCEIeChxjb20udHdpbmUudGFuZ28ucG1yLmNv",
+            "bG9ybGFiYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.ProcessRangeReflection.Descriptor, global::Tango.PMR.ColorLab.InputLiquidReflection.Descriptor, global::Tango.PMR.ColorLab.GradientInputStopReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.GradientConversionInput), global::Tango.PMR.ColorLab.GradientConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ForwardData", "SegmentLength", "Stops", "InputLiquids", "ProcessRanges", "GbdData", "LubData" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.GradientConversionInput), global::Tango.PMR.ColorLab.GradientConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ForwardData", "SegmentLength", "Stops", "InputLiquids", "ProcessRanges", "GbdData", "LubData", "UseLubricantTransform" }, null, null, null)
           }));
     }
     #endregion
@@ -77,6 +78,7 @@ namespace Tango.PMR.ColorLab {
       processRanges_ = other.processRanges_.Clone();
       gbdData_ = other.gbdData_;
       lubData_ = other.lubData_;
+      useLubricantTransform_ = other.useLubricantTransform_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -191,6 +193,17 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
+    /// <summary>Field number for the "UseLubricantTransform" field.</summary>
+    public const int UseLubricantTransformFieldNumber = 11;
+    private bool useLubricantTransform_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool UseLubricantTransform {
+      get { return useLubricantTransform_; }
+      set {
+        useLubricantTransform_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as GradientConversionInput);
@@ -214,6 +227,7 @@ namespace Tango.PMR.ColorLab {
       if(!processRanges_.Equals(other.processRanges_)) return false;
       if (GbdData != other.GbdData) return false;
       if (LubData != other.LubData) return false;
+      if (UseLubricantTransform != other.UseLubricantTransform) return false;
       return true;
     }
 
@@ -230,6 +244,7 @@ namespace Tango.PMR.ColorLab {
       hash ^= processRanges_.GetHashCode();
       if (GbdData.Length != 0) hash ^= GbdData.GetHashCode();
       if (LubData.Length != 0) hash ^= LubData.GetHashCode();
+      if (UseLubricantTransform != false) hash ^= UseLubricantTransform.GetHashCode();
       return hash;
     }
 
@@ -271,6 +286,10 @@ namespace Tango.PMR.ColorLab {
         output.WriteRawTag(82);
         output.WriteBytes(LubData);
       }
+      if (UseLubricantTransform != false) {
+        output.WriteRawTag(88);
+        output.WriteBool(UseLubricantTransform);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -300,6 +319,9 @@ namespace Tango.PMR.ColorLab {
       if (LubData.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(LubData);
       }
+      if (UseLubricantTransform != false) {
+        size += 1 + 1;
+      }
       return size;
     }
 
@@ -332,6 +354,9 @@ namespace Tango.PMR.ColorLab {
       if (other.LubData.Length != 0) {
         LubData = other.LubData;
       }
+      if (other.UseLubricantTransform != false) {
+        UseLubricantTransform = other.UseLubricantTransform;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -382,6 +407,10 @@ namespace Tango.PMR.ColorLab {
             LubData = input.ReadBytes();
             break;
           }
+          case 88: {
+            UseLubricantTransform = input.ReadBool();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs
index e56cf37fe..ebde255c5 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/OutOfGamutInput.cs
@@ -24,18 +24,19 @@ namespace Tango.PMR.ColorLab {
           string.Concat(
             "ChVPdXRPZkdhbXV0SW5wdXQucHJvdG8SElRhbmdvLlBNUi5Db2xvckxhYhoW",
             "SW5wdXRDb29yZGluYXRlcy5wcm90bxoQQ29sb3JTcGFjZS5wcm90bxoSUHJv",
-            "Y2Vzc1JhbmdlLnByb3RvIqgCCg9PdXRPZkdhbXV0SW5wdXQSDwoHVGhyZWFk",
+            "Y2Vzc1JhbmdlLnByb3RvIscCCg9PdXRPZkdhbXV0SW5wdXQSDwoHVGhyZWFk",
             "TBgBIAEoARIPCgdUaHJlYWRBGAIgASgBEg8KB1RocmVhZEIYAyABKAESMgoK",
             "Q29sb3JTcGFjZRgEIAEoDjIeLlRhbmdvLlBNUi5Db2xvckxhYi5Db2xvclNw",
             "YWNlEj4KEElucHV0Q29vcmRpbmF0ZXMYBSABKAsyJC5UYW5nby5QTVIuQ29s",
             "b3JMYWIuSW5wdXRDb29yZGluYXRlcxITCgtGb3J3YXJkRGF0YRgGIAEoDBI3",
             "Cg1Qcm9jZXNzUmFuZ2VzGAcgAygLMiAuVGFuZ28uUE1SLkNvbG9yTGFiLlBy",
-            "b2Nlc3NSYW5nZRIPCgdHYmREYXRhGAggASgMEg8KB0x1YkRhdGEYCSABKAxC",
-            "HgocY29tLnR3aW5lLnRhbmdvLnBtci5jb2xvcmxhYmIGcHJvdG8z"));
+            "b2Nlc3NSYW5nZRIPCgdHYmREYXRhGAggASgMEg8KB0x1YkRhdGEYCSABKAwS",
+            "HQoVVXNlTHVicmljYW50VHJhbnNmb3JtGAogASgIQh4KHGNvbS50d2luZS50",
+            "YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.InputCoordinatesReflection.Descriptor, global::Tango.PMR.ColorLab.ColorSpaceReflection.Descriptor, global::Tango.PMR.ColorLab.ProcessRangeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.OutOfGamutInput), global::Tango.PMR.ColorLab.OutOfGamutInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "ProcessRanges", "GbdData", "LubData" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.OutOfGamutInput), global::Tango.PMR.ColorLab.OutOfGamutInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "ProcessRanges", "GbdData", "LubData", "UseLubricantTransform" }, null, null, null)
           }));
     }
     #endregion
@@ -75,6 +76,7 @@ namespace Tango.PMR.ColorLab {
       processRanges_ = other.processRanges_.Clone();
       gbdData_ = other.gbdData_;
       lubData_ = other.lubData_;
+      useLubricantTransform_ = other.useLubricantTransform_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -180,6 +182,17 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
+    /// <summary>Field number for the "UseLubricantTransform" field.</summary>
+    public const int UseLubricantTransformFieldNumber = 10;
+    private bool useLubricantTransform_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool UseLubricantTransform {
+      get { return useLubricantTransform_; }
+      set {
+        useLubricantTransform_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as OutOfGamutInput);
@@ -202,6 +215,7 @@ namespace Tango.PMR.ColorLab {
       if(!processRanges_.Equals(other.processRanges_)) return false;
       if (GbdData != other.GbdData) return false;
       if (LubData != other.LubData) return false;
+      if (UseLubricantTransform != other.UseLubricantTransform) return false;
       return true;
     }
 
@@ -217,6 +231,7 @@ namespace Tango.PMR.ColorLab {
       hash ^= processRanges_.GetHashCode();
       if (GbdData.Length != 0) hash ^= GbdData.GetHashCode();
       if (LubData.Length != 0) hash ^= LubData.GetHashCode();
+      if (UseLubricantTransform != false) hash ^= UseLubricantTransform.GetHashCode();
       return hash;
     }
 
@@ -260,6 +275,10 @@ namespace Tango.PMR.ColorLab {
         output.WriteRawTag(74);
         output.WriteBytes(LubData);
       }
+      if (UseLubricantTransform != false) {
+        output.WriteRawTag(80);
+        output.WriteBool(UseLubricantTransform);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -290,6 +309,9 @@ namespace Tango.PMR.ColorLab {
       if (LubData.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(LubData);
       }
+      if (UseLubricantTransform != false) {
+        size += 1 + 1;
+      }
       return size;
     }
 
@@ -326,6 +348,9 @@ namespace Tango.PMR.ColorLab {
       if (other.LubData.Length != 0) {
         LubData = other.LubData;
       }
+      if (other.UseLubricantTransform != false) {
+        UseLubricantTransform = other.UseLubricantTransform;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -375,6 +400,10 @@ namespace Tango.PMR.ColorLab {
             LubData = input.ReadBytes();
             break;
           }
+          case 80: {
+            UseLubricantTransform = input.ReadBool();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs
index 8384769a6..4e5a52d8d 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/RecommendedProcessTableInput.cs
@@ -24,19 +24,20 @@ namespace Tango.PMR.ColorLab {
           string.Concat(
             "CiJSZWNvbW1lbmRlZFByb2Nlc3NUYWJsZUlucHV0LnByb3RvEhJUYW5nby5Q",
             "TVIuQ29sb3JMYWIaElByb2Nlc3NSYW5nZS5wcm90bxoRSW5wdXRMaXF1aWQu",
-            "cHJvdG8aF0dyYWRpZW50SW5wdXRTdG9wLnByb3RvIsQCChxSZWNvbW1lbmRl",
+            "cHJvdG8aF0dyYWRpZW50SW5wdXRTdG9wLnByb3RvIuMCChxSZWNvbW1lbmRl",
             "ZFByb2Nlc3NUYWJsZUlucHV0Eg8KB1RocmVhZEwYASABKAESDwoHVGhyZWFk",
             "QRgCIAEoARIPCgdUaHJlYWRCGAMgASgBEhMKC0ZvcndhcmREYXRhGAQgASgM",
             "EjQKBVN0b3BzGAUgAygLMiUuVGFuZ28uUE1SLkNvbG9yTGFiLkdyYWRpZW50",
             "SW5wdXRTdG9wEjUKDElucHV0TGlxdWlkcxgGIAMoCzIfLlRhbmdvLlBNUi5D",
             "b2xvckxhYi5JbnB1dExpcXVpZBI3Cg1Qcm9jZXNzUmFuZ2VzGAcgAygLMiAu",
             "VGFuZ28uUE1SLkNvbG9yTGFiLlByb2Nlc3NSYW5nZRIUCgxVc2VMaWdodElu",
-            "a3MYCCABKAgSDwoHR2JkRGF0YRgJIAEoDBIPCgdMdWJEYXRhGAogASgMQh4K",
-            "HGNvbS50d2luZS50YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw=="));
+            "a3MYCCABKAgSDwoHR2JkRGF0YRgJIAEoDBIPCgdMdWJEYXRhGAogASgMEh0K",
+            "FVVzZUx1YnJpY2FudFRyYW5zZm9ybRgLIAEoCEIeChxjb20udHdpbmUudGFu",
+            "Z28ucG1yLmNvbG9ybGFiYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.ProcessRangeReflection.Descriptor, global::Tango.PMR.ColorLab.InputLiquidReflection.Descriptor, global::Tango.PMR.ColorLab.GradientInputStopReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.RecommendedProcessTableInput), global::Tango.PMR.ColorLab.RecommendedProcessTableInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ForwardData", "Stops", "InputLiquids", "ProcessRanges", "UseLightInks", "GbdData", "LubData" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.RecommendedProcessTableInput), global::Tango.PMR.ColorLab.RecommendedProcessTableInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ForwardData", "Stops", "InputLiquids", "ProcessRanges", "UseLightInks", "GbdData", "LubData", "UseLubricantTransform" }, null, null, null)
           }));
     }
     #endregion
@@ -77,6 +78,7 @@ namespace Tango.PMR.ColorLab {
       useLightInks_ = other.useLightInks_;
       gbdData_ = other.gbdData_;
       lubData_ = other.lubData_;
+      useLubricantTransform_ = other.useLubricantTransform_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -191,6 +193,17 @@ namespace Tango.PMR.ColorLab {
       }
     }
 
+    /// <summary>Field number for the "UseLubricantTransform" field.</summary>
+    public const int UseLubricantTransformFieldNumber = 11;
+    private bool useLubricantTransform_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool UseLubricantTransform {
+      get { return useLubricantTransform_; }
+      set {
+        useLubricantTransform_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as RecommendedProcessTableInput);
@@ -214,6 +227,7 @@ namespace Tango.PMR.ColorLab {
       if (UseLightInks != other.UseLightInks) return false;
       if (GbdData != other.GbdData) return false;
       if (LubData != other.LubData) return false;
+      if (UseLubricantTransform != other.UseLubricantTransform) return false;
       return true;
     }
 
@@ -230,6 +244,7 @@ namespace Tango.PMR.ColorLab {
       if (UseLightInks != false) hash ^= UseLightInks.GetHashCode();
       if (GbdData.Length != 0) hash ^= GbdData.GetHashCode();
       if (LubData.Length != 0) hash ^= LubData.GetHashCode();
+      if (UseLubricantTransform != false) hash ^= UseLubricantTransform.GetHashCode();
       return hash;
     }
 
@@ -271,6 +286,10 @@ namespace Tango.PMR.ColorLab {
         output.WriteRawTag(82);
         output.WriteBytes(LubData);
       }
+      if (UseLubricantTransform != false) {
+        output.WriteRawTag(88);
+        output.WriteBool(UseLubricantTransform);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -300,6 +319,9 @@ namespace Tango.PMR.ColorLab {
       if (LubData.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeBytesSize(LubData);
       }
+      if (UseLubricantTransform != false) {
+        size += 1 + 1;
+      }
       return size;
     }
 
@@ -332,6 +354,9 @@ namespace Tango.PMR.ColorLab {
       if (other.LubData.Length != 0) {
         LubData = other.LubData;
       }
+      if (other.UseLubricantTransform != false) {
+        UseLubricantTransform = other.UseLubricantTransform;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -382,6 +407,10 @@ namespace Tango.PMR.ColorLab {
             LubData = input.ReadBytes();
             break;
           }
+          case 88: {
+            UseLubricantTransform = input.ReadBool();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml
index d89a2de1f..9e3db5c20 100644
--- a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml
+++ b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml