After Mirta ColorLib Integration.

9 files changed, 118 insertions, 119 deletions

diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/ColorConverter.cpp b/Software/Visual_Studio/Native/Tango.ColorLib/ColorConverter.cpp
index d8abe700f..1295b3488 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/ColorConverter.cpp
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/ColorConverter.cpp
@@ -1085,7 +1085,7 @@ void Tango::ColorLib::ColorConverter::ConvertColorToLinearInks(ConversionInput*
 		}
 		break;
 	}
-	case(COLOR_SPACE__Coats):
+	case(COLOR_SPACE__Catalog):
 	{
 		int32_t inData;
 		if (conversionInput->inputcoordinates->has_pantoncode)
@@ -1304,7 +1304,7 @@ void Tango::ColorLib::ColorConverter::ConvertVolumeToRGBDisplay(ConversionInput*
 	double *LinInkP = new double[m_nA2BnSepIn];
 	double NormFactor =100/ m_ProcessRangesMaxP[m_nProcessRanges - 1];
 
-	if (conversionInput->colorspace == COLOR_SPACE__Twine)
+	if (conversionInput->colorspace == COLOR_SPACE__Catalog)
 	{
 		for (int i = 0; i < m_nB2AnSepOut; ++i)
 		{
@@ -1543,7 +1543,7 @@ size_t Tango::ColorLib::ColorConverter::Convert(uint8_t * input_buffer, size_t i
 	m_nVolumes = m_nB2AnSepOut;
 	int GamutRegion = 0;
 		//Convert input data to linear inks
-	if (conversionInput->colorspace == COLOR_SPACE__Volume  || conversionInput->colorspace == COLOR_SPACE__Twine)
+	if (conversionInput->colorspace == COLOR_SPACE__Volume  || conversionInput->colorspace == COLOR_SPACE__Catalog)
 	{
 		ConvertVolumeToRGBDisplay(conversionInput, Volume, RGBOut, LabOut, GamutRegion);
 		InGamut = true;
@@ -2443,26 +2443,26 @@ size_t Tango::ColorLib::ColorConverter::P_IsInGamut(uint8_t * input_buffer, size
 		}
 		case(COLOR_SPACE__CMYK):
 		case(COLOR_SPACE__Volume):
-		case(COLOR_SPACE__Twine):
+		case(COLOR_SPACE__Catalog):
 		{//no conversion
 		 //missing from structure light inks or special colors
 		 //	just convert Lab for rgb display	
 			InGamut = true;
 		}
-		case(COLOR_SPACE__Coats):
-		{
-			int32_t inData;
-			if (conversionInput->inputcoordinates->has_pantoncode)
-				inData = conversionInput->inputcoordinates->pantoncode;
-			else
-			{
-				//mismatch between color space and data
-				throw std::exception("Mismatch between color space and data");
-				return(0);
-			}
-			break;
-			//missing calclulation method and pantone table, either in terms of RGB or CMY or Lab
-		}
+		//case(COLOR_SPACE__Catalog):
+		//{
+		//	int32_t inData;
+		//	if (conversionInput->inputcoordinates->has_pantoncode)
+		//		inData = conversionInput->inputcoordinates->pantoncode;
+		//	else
+		//	{
+		//		//mismatch between color space and data
+		//		throw std::exception("Mismatch between color space and data");
+		//		return(0);
+		//	}
+		//	break;
+		//	//missing calclulation method and pantone table, either in terms of RGB or CMY or Lab
+		//}
 		default:
 		{
 			throw std::exception(" Unsupported Color Space");
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.c
index 78cae4462..8ea22ca90 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.c
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.c
@@ -7,25 +7,23 @@
 #endif
 
 #include "ColorSpace.pb-c.h"
-static const ProtobufCEnumValue color_space__enum_values_by_number[6] =
+static const ProtobufCEnumValue color_space__enum_values_by_number[5] =
 {
   { "Volume", "COLOR_SPACE__Volume", 0 },
   { "RGB", "COLOR_SPACE__RGB", 1 },
   { "CMYK", "COLOR_SPACE__CMYK", 2 },
   { "LAB", "COLOR_SPACE__LAB", 3 },
-  { "Coats", "COLOR_SPACE__Coats", 4 },
-  { "Twine", "COLOR_SPACE__Twine", 5 },
+  { "Catalog", "COLOR_SPACE__Catalog", 4 },
 };
 static const ProtobufCIntRange color_space__value_ranges[] = {
-{0, 0},{0, 6}
+{0, 0},{0, 5}
 };
-static const ProtobufCEnumValueIndex color_space__enum_values_by_name[6] =
+static const ProtobufCEnumValueIndex color_space__enum_values_by_name[5] =
 {
   { "CMYK", 2 },
-  { "Coats", 4 },
+  { "Catalog", 4 },
   { "LAB", 3 },
   { "RGB", 1 },
-  { "Twine", 5 },
   { "Volume", 0 },
 };
 const ProtobufCEnumDescriptor color_space__descriptor =
@@ -35,9 +33,9 @@ const ProtobufCEnumDescriptor color_space__descriptor =
   "ColorSpace",
   "ColorSpace",
   "",
-  6,
+  5,
   color_space__enum_values_by_number,
-  6,
+  5,
   color_space__enum_values_by_name,
   1,
   color_space__value_ranges,
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.h
index 17bfb420f..defb93aa2 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.h
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.h
@@ -24,8 +24,7 @@ typedef enum _ColorSpace {
   COLOR_SPACE__RGB = 1,
   COLOR_SPACE__CMYK = 2,
   COLOR_SPACE__LAB = 3,
-  COLOR_SPACE__Coats = 4,
-  COLOR_SPACE__Twine = 5
+  COLOR_SPACE__Catalog = 4
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(COLOR_SPACE)
 } ColorSpace;
 
diff --git a/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs
index 7b73c4f64..41fa3ed57 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs
@@ -278,9 +278,9 @@ namespace Tango.BL.DTO
         }
 
         /// <summary>
-        /// color catalog item guid
+        /// color catalogs item guid
         /// </summary>
-        public String ColorCatalogItemGuid 
+        public String ColorCatalogsItemGuid 
         {
             get; set; 
         }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs
index affa6fba9..7397d952d 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs
@@ -952,27 +952,27 @@ namespace Tango.BL.Entities
             }
         }
 
-        protected String _colorcatalogitemguid;
+        protected String _colorcatalogsitemguid;
 
         /// <summary>
-        /// Gets or sets the brushstopbase color catalog item guid.
+        /// Gets or sets the brushstopbase color catalogs item guid.
         /// </summary>
 
-        [Column("COLOR_CATALOG_ITEM_GUID")]
-        [ForeignKey("ColorCatalogItem")]
+        [Column("COLOR_CATALOGS_ITEM_GUID")]
+        [ForeignKey("ColorCatalogsItem")]
 
-        public  String ColorCatalogItemGuid
+        public  String ColorCatalogsItemGuid
         {
             get 
             {
-                return _colorcatalogitemguid; 
+                return _colorcatalogsitemguid; 
             }
 
             set 
             {
-                if (_colorcatalogitemguid != value)
+                if (_colorcatalogsitemguid != value)
                 {
-                    _colorcatalogitemguid = value;
+                    _colorcatalogsitemguid = value;
 
                 }
             }
@@ -1033,7 +1033,7 @@ namespace Tango.BL.Entities
 
                     if (ColorCatalogsItem != null)
                     {
-                        ColorCatalogItemGuid = ColorCatalogsItem.Guid;
+                        ColorCatalogsItemGuid = ColorCatalogsItem.Guid;
                     }
 
                     OnColorCatalogsItemChanged(value);
diff --git a/Software/Visual_Studio/Tango.BL/Entities/Job.cs b/Software/Visual_Studio/Tango.BL/Entities/Job.cs
index 54ec4bd27..0bc784d30 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/Job.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Job.cs
@@ -608,6 +608,7 @@ namespace Tango.BL.Entities
                         {
                             JobFileBrushStop st = new JobFileBrushStop();
                             stop.MapPrimitivesWithStringsNoNullsTo(st);
+                            st.ColorCatalogItemGuid = stop.ColorCatalogsItemGuid;
                             s.BrushStops.Add(st);
                         }
                     }
@@ -718,6 +719,7 @@ namespace Tango.BL.Entities
                             st.StopIndex = j + 1;
                             st.SegmentGuid = s.Guid;
                             stop.MapPrimitivesWithStringsNoNullsTo(st);
+                            st.ColorCatalogsItemGuid = stop.ColorCatalogItemGuid;
                             s.BrushStops.Add(st);
                         }
                     }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs
index 9d45214fb..60d4a2e98 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs
@@ -49,7 +49,7 @@ namespace Tango.DAL.Remote.DB
         public int V7_DIV { get; set; }
         public bool CORRECTED { get; set; }
         public string COLOR_CATALOG_GUID { get; set; }
-        public string COLOR_CATALOG_ITEM_GUID { get; set; }
+        public string COLOR_CATALOGS_ITEM_GUID { get; set; }
     
         public virtual COLOR_CATALOGS COLOR_CATALOGS { get; set; }
         public virtual COLOR_CATALOGS_ITEMS COLOR_CATALOGS_ITEMS { 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 bd09ed8e6..9fdf8bf36 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -89,7 +89,7 @@
           <Property Name="V7_DIV" Type="int" Nullable="false" />
           <Property Name="CORRECTED" Type="bit" Nullable="false" />
           <Property Name="COLOR_CATALOG_GUID" Type="varchar" MaxLength="36" />
-          <Property Name="COLOR_CATALOG_ITEM_GUID" Type="varchar" MaxLength="36" />
+          <Property Name="COLOR_CATALOGS_ITEM_GUID" Type="varchar" MaxLength="36" />
         </EntityType>
         <EntityType Name="CARTRIDGE_TYPES">
           <Key>
@@ -1113,7 +1113,7 @@
               <PropertyRef Name="GUID" />
             </Principal>
             <Dependent Role="BRUSH_STOPS">
-              <PropertyRef Name="COLOR_CATALOG_ITEM_GUID" />
+              <PropertyRef Name="COLOR_CATALOGS_ITEM_GUID" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
@@ -3060,7 +3060,7 @@
           <Property Name="V7_DIV" Type="Int32" Nullable="false" />
           <Property Name="CORRECTED" Type="Boolean" Nullable="false" />
           <Property Name="COLOR_CATALOG_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="COLOR_CATALOG_ITEM_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="COLOR_CATALOGS_ITEM_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <NavigationProperty Name="COLOR_CATALOGS" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_CATALOGS" FromRole="BRUSH_STOPS" ToRole="COLOR_CATALOGS" />
           <NavigationProperty Name="COLOR_CATALOGS_ITEMS" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_CATALOGS_ITEMS" FromRole="BRUSH_STOPS" ToRole="COLOR_CATALOGS_ITEMS" />
           <NavigationProperty Name="COLOR_SPACES" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_SPACES" FromRole="BRUSH_STOPS" ToRole="COLOR_SPACES" />
@@ -4297,7 +4297,7 @@
               <PropertyRef Name="GUID" />
             </Principal>
             <Dependent Role="BRUSH_STOPS">
-              <PropertyRef Name="COLOR_CATALOG_ITEM_GUID" />
+              <PropertyRef Name="COLOR_CATALOGS_ITEM_GUID" />
             </Dependent>
           </ReferentialConstraint>
         </Association>
@@ -5340,7 +5340,7 @@
           <EntitySetMapping Name="BRUSH_STOPS">
             <EntityTypeMapping TypeName="RemoteModel.BRUSH_STOPS">
               <MappingFragment StoreEntitySet="BRUSH_STOPS">
-                <ScalarProperty Name="COLOR_CATALOG_ITEM_GUID" ColumnName="COLOR_CATALOG_ITEM_GUID" />
+                <ScalarProperty Name="COLOR_CATALOGS_ITEM_GUID" ColumnName="COLOR_CATALOGS_ITEM_GUID" />
                 <ScalarProperty Name="COLOR_CATALOG_GUID" ColumnName="COLOR_CATALOG_GUID" />
                 <ScalarProperty Name="CORRECTED" ColumnName="CORRECTED" />
                 <ScalarProperty Name="V7_DIV" ColumnName="V7_DIV" />
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 d03fb67c4..186b09ee4 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,79 +5,79 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3.75" PointY="39" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="3.75" PointY="62.125" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="59.25" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="3.75" PointY="52" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="21.875" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="9" PointY="67.125" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="18.75" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="32.5" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="5.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="11.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="9.875" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="22.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="6" PointY="15" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6" PointY="54.75" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3.75" PointY="43.125" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="39.75" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="6.75" PointY="71.625" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="9" PointY="71.125" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="49.125" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="8.25" PointY="1.875" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="26.625" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="35.75" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="6.75" PointY="67.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="9" PointY="51.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="75.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="12" PointY="55.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="3.75" PointY="35.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6" PointY="49.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="9.75" PointY="47.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="12" PointY="45.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="3.75" PointY="65.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="6" PointY="59.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="79.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="9" PointY="59.25" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="54.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="6.75" PointY="75.5" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="9" PointY="55.375" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="9" PointY="63.875" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="11.25" PointY="35" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="13.5" PointY="21.125" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="19.375" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="23.25" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="15.75" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="23" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="10.5" PointY="8.5" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6" PointY="35.75" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="8.25" PointY="13.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="10.5" PointY="14.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="15.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="18.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="29.5" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="9" PointY="43.75" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="6" PointY="41.125" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="11.25" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="28.875" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="30.5" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="19.875" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="11.25" PointY="4.625" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="13.5" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="24.875" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="45" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="13.5" PointY="15.75" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="2.5" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="16.5" PointY="17.375" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="3.75" PointY="2.5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="3.75" PointY="6.5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="12.75" PointY="12.5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="15.75" PointY="2.5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="15.75" PointY="7.5" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="15.75" PointY="12.5" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="8.25" PointY="7.75" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="13.5" PointY="8.75" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="36.625" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="6.75" PointY="11" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="6.75" PointY="34" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="37" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="6.75" PointY="31.125" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="18" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="12" PointY="9.875" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="22.625" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="18.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="5.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="11" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="9.75" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="18.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="15" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="9" PointY="36.75" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="6.75" PointY="7.125" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="11.25" PointY="30" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="9.75" PointY="5" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="12" PointY="4.5" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="39.875" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="18.25" PointY="13.125" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="29.75" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="35.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="9.75" PointY="56.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="12" PointY="43" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="52.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="12" PointY="39.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.75" PointY="60.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="12" PointY="47.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="6.75" PointY="47.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9" PointY="42.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="12.75" PointY="57.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="15" PointY="41.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="12.75" PointY="61.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="15" PointY="49.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="42.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="12.75" PointY="53.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="15" PointY="37.25" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="12" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="14.25" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="15.75" PointY="24.5" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="13.5" PointY="19.25" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="23.125" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="1" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="22.875" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="13.5" PointY="33" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="9" PointY="18.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="11.25" PointY="20" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="20.5" PointY="22.5" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="26.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="15.625" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="32.75" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="12" PointY="13.75" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="9" PointY="9.125" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="15.25" PointY="57.125" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="52.375" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="54" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="19.75" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="15.25" PointY="53" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="17.5" PointY="53.125" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="21" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="27" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="18.5" PointY="27.625" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="3.75" PointY="5.25" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="16.5" PointY="31.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="5.75" PointY="2.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="5.75" PointY="15.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="14.75" PointY="2.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="14.75" PointY="5.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="16.75" PointY="2.25" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="16.75" PointY="7.25" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="11.25" PointY="33.125" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="17.5" PointY="36.125" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="11.25" PointY="16.875" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" />