From 3bc1ca3796e262f32b2eb50cd96c5ffb6b107e6d Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 8 Aug 2019 16:42:22 +0300 Subject: After Mirta ColorLib Integration. --- .../Native/Tango.ColorLib/ColorConverter.cpp | 36 ++--- .../Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.c | 16 +-- .../Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.h | 3 +- .../Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs | 4 +- .../Tango.BL/Entities/BrushStopBase.cs | 18 +-- Software/Visual_Studio/Tango.BL/Entities/Job.cs | 2 + .../Tango.DAL.Remote/DB/BRUSH_STOPS.cs | 2 +- .../Tango.DAL.Remote/DB/RemoteADO.edmx | 10 +- .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 146 ++++++++++----------- 9 files changed, 118 insertions(+), 119 deletions(-) (limited to 'Software/Visual_Studio') 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 } /// - /// color catalog item guid + /// color catalogs item guid /// - 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; /// - /// Gets or sets the brushstopbase color catalog item guid. + /// Gets or sets the brushstopbase color catalogs item guid. /// - [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 @@ - + @@ -1113,7 +1113,7 @@ - + @@ -3060,7 +3060,7 @@ - + @@ -4297,7 +4297,7 @@ - + @@ -5340,7 +5340,7 @@ - + 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.3.1