diff options
Diffstat (limited to 'Software')
30 files changed, 393 insertions, 68 deletions
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip index 92e83cb38..438eeef35 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip @@ -18,10 +18,10 @@ <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/> <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/> <ROW Property="Manufacturer" Value="Twine"/> - <ROW Property="ProductCode" Value="1033:{9F4AA763-C277-44CB-8CFE-DA4A7BC0419C} " Type="16"/> + <ROW Property="ProductCode" Value="1033:{1EB80931-A954-4B6C-8B98-860E4F2502D9} " Type="16"/> <ROW Property="ProductLanguage" Value="1033"/> <ROW Property="ProductName" Value="Tango"/> - <ROW Property="ProductVersion" Value="2.3.2.0" Type="32"/> + <ROW Property="ProductVersion" Value="2.3.3.0" Type="32"/> <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/> <ROW Property="UpgradeCode" Value="{F8EAB8B4-FD57-45B7-8307-D52DF760273D}"/> <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/> @@ -712,6 +712,7 @@ <ROW File="System.Xml.XPath.XDocument.dll" Component_="System.Xml.XPath.XDocument.dll" FileName="SYST~109.DLL|System.Xml.XPath.XDocument.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Xml.XPath.XDocument.dll" SelfReg="false"/> <ROW File="WPFMediaKit.dll" Component_="WPFMediaKit.dll" FileName="WPFMED~1.DLL|WPFMediaKit.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\WPFMediaKit.dll" SelfReg="false"/> <ROW File="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" FileName="MICRO~39.DLL|Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" SelfReg="false"/> + <ROW File="LibGit2Sharp.dll.config" Component_="CommandLine.xml" FileName="LIBGIT~1.CON|LibGit2Sharp.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\LibGit2Sharp.dll.config" SelfReg="false"/> <ATTRIBUTE name="DontAddFileAttributes" value="true"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent"> @@ -721,7 +722,7 @@ <ROW Action="AI_DetectSoftware" Sequence="101"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent"> - <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer_v2.3.2" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v2.3.2"/> + <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer_v2.3.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v2.3.3"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent"> <ROW Path="<AI_DICTS>ui.ail"/> diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Views/EnvironmentRollbackView.xaml b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Views/EnvironmentRollbackView.xaml index d3a198e21..fe147272c 100644 --- a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Views/EnvironmentRollbackView.xaml +++ b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Views/EnvironmentRollbackView.xaml @@ -25,7 +25,7 @@ <DockPanel> <ComboBox DockPanel.Dock="Top" ItemsSource="{Binding DeploymentSlots}" SelectedItem="{Binding SelectedDeploymentSlot}" DisplayMemberPath="Name"></ComboBox> - <localControls:WebAppPropertiesControl VerticalAlignment="Top" Margin="0 20 0 0" DataContext="{Binding SelectedDeploymentSlot}" /> + <localControls:WebAppPropertiesControl VerticalAlignment="Top" Margin="0 20 0 0" WebApp="{Binding SelectedDeploymentSlot}" /> </DockPanel> </GroupBox> diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/InputLiquid.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/InputLiquid.pb-c.c index 2d033e2a1..caf6b17a8 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/InputLiquid.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/InputLiquid.pb-c.c @@ -52,7 +52,7 @@ void input_liquid__free_unpacked assert(message->base.descriptor == &input_liquid__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] = +static const ProtobufCFieldDescriptor input_liquid__field_descriptors[6] = { { "LiquidType", @@ -102,9 +102,35 @@ static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] = 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "IsExtraInk", + 5, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_BOOL, + offsetof(InputLiquid, has_isextraink), + offsetof(InputLiquid, isextraink), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "Color", + 6, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_INT32, + offsetof(InputLiquid, has_color), + offsetof(InputLiquid, color), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned input_liquid__field_indices_by_name[] = { 1, /* field[1] = CalibrationData */ + 5, /* field[5] = Color */ + 4, /* field[4] = IsExtraInk */ 0, /* field[0] = LiquidType */ 2, /* field[2] = MaxNanoliterPerCentimeter */ 3, /* field[3] = Volume */ @@ -112,7 +138,7 @@ static const unsigned input_liquid__field_indices_by_name[] = { static const ProtobufCIntRange input_liquid__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 4 } + { 0, 6 } }; const ProtobufCMessageDescriptor input_liquid__descriptor = { @@ -122,7 +148,7 @@ const ProtobufCMessageDescriptor input_liquid__descriptor = "InputLiquid", "", sizeof(InputLiquid), - 4, + 6, input_liquid__field_descriptors, input_liquid__field_indices_by_name, 1, input_liquid__number_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/InputLiquid.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/InputLiquid.pb-c.h index c2a47b166..75d257e35 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/InputLiquid.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/InputLiquid.pb-c.h @@ -35,10 +35,14 @@ struct _InputLiquid double maxnanoliterpercentimeter; protobuf_c_boolean has_volume; double volume; + protobuf_c_boolean has_isextraink; + protobuf_c_boolean isextraink; + protobuf_c_boolean has_color; + int32_t color; }; #define INPUT_LIQUID__INIT \ { PROTOBUF_C_MESSAGE_INIT (&input_liquid__descriptor) \ - , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0 } + , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0, 0, 0, 0, 0 } /* InputLiquid methods */ diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/LiquidType.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/LiquidType.pb-c.c index d6d4117b7..e47246064 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/LiquidType.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/LiquidType.pb-c.c @@ -7,7 +7,7 @@ #endif #include "LiquidType.pb-c.h" -static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] = +static const ProtobufCEnumValue liquid_type__enum_values_by_number[18] = { { "Cyan", "LIQUID_TYPE__Cyan", 0 }, { "Magenta", "LIQUID_TYPE__Magenta", 1 }, @@ -19,21 +19,37 @@ static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] = { "LightCyan", "LIQUID_TYPE__LightCyan", 7 }, { "LightMagenta", "LIQUID_TYPE__LightMagenta", 8 }, { "LightYellow", "LIQUID_TYPE__LightYellow", 9 }, + { "Violet", "LIQUID_TYPE__Violet", 10 }, + { "Blue", "LIQUID_TYPE__Blue", 11 }, + { "LightBlue", "LIQUID_TYPE__LightBlue", 12 }, + { "Orange", "LIQUID_TYPE__Orange", 13 }, + { "LightOrange", "LIQUID_TYPE__LightOrange", 14 }, + { "Rubine", "LIQUID_TYPE__Rubine", 15 }, + { "LightRubine", "LIQUID_TYPE__LightRubine", 16 }, + { "Navy", "LIQUID_TYPE__Navy", 17 }, }; static const ProtobufCIntRange liquid_type__value_ranges[] = { -{0, 0},{0, 10} +{0, 0},{0, 18} }; -static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[10] = +static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[18] = { { "Black", 3 }, + { "Blue", 11 }, { "Cleaner", 6 }, { "Cyan", 0 }, + { "LightBlue", 12 }, { "LightCyan", 7 }, { "LightMagenta", 8 }, + { "LightOrange", 14 }, + { "LightRubine", 16 }, { "LightYellow", 9 }, { "Lubricant", 5 }, { "Magenta", 1 }, + { "Navy", 17 }, + { "Orange", 13 }, + { "Rubine", 15 }, { "TransparentInk", 4 }, + { "Violet", 10 }, { "Yellow", 2 }, }; const ProtobufCEnumDescriptor liquid_type__descriptor = @@ -43,9 +59,9 @@ const ProtobufCEnumDescriptor liquid_type__descriptor = "LiquidType", "LiquidType", "", - 10, + 18, liquid_type__enum_values_by_number, - 10, + 18, liquid_type__enum_values_by_name, 1, liquid_type__value_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/LiquidType.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/LiquidType.pb-c.h index eba52c4a7..c30bf0cd2 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/LiquidType.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/LiquidType.pb-c.h @@ -29,7 +29,15 @@ typedef enum _LiquidType { LIQUID_TYPE__Cleaner = 6, LIQUID_TYPE__LightCyan = 7, LIQUID_TYPE__LightMagenta = 8, - LIQUID_TYPE__LightYellow = 9 + LIQUID_TYPE__LightYellow = 9, + LIQUID_TYPE__Violet = 10, + LIQUID_TYPE__Blue = 11, + LIQUID_TYPE__LightBlue = 12, + LIQUID_TYPE__Orange = 13, + LIQUID_TYPE__LightOrange = 14, + LIQUID_TYPE__Rubine = 15, + LIQUID_TYPE__LightRubine = 16, + LIQUID_TYPE__Navy = 17 PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(LIQUID_TYPE) } LiquidType; diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/InputLiquid.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/InputLiquid.pb-c.c index 2d033e2a1..caf6b17a8 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/InputLiquid.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/InputLiquid.pb-c.c @@ -52,7 +52,7 @@ void input_liquid__free_unpacked assert(message->base.descriptor == &input_liquid__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] = +static const ProtobufCFieldDescriptor input_liquid__field_descriptors[6] = { { "LiquidType", @@ -102,9 +102,35 @@ static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] = 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "IsExtraInk", + 5, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_BOOL, + offsetof(InputLiquid, has_isextraink), + offsetof(InputLiquid, isextraink), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "Color", + 6, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_INT32, + offsetof(InputLiquid, has_color), + offsetof(InputLiquid, color), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned input_liquid__field_indices_by_name[] = { 1, /* field[1] = CalibrationData */ + 5, /* field[5] = Color */ + 4, /* field[4] = IsExtraInk */ 0, /* field[0] = LiquidType */ 2, /* field[2] = MaxNanoliterPerCentimeter */ 3, /* field[3] = Volume */ @@ -112,7 +138,7 @@ static const unsigned input_liquid__field_indices_by_name[] = { static const ProtobufCIntRange input_liquid__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 4 } + { 0, 6 } }; const ProtobufCMessageDescriptor input_liquid__descriptor = { @@ -122,7 +148,7 @@ const ProtobufCMessageDescriptor input_liquid__descriptor = "InputLiquid", "", sizeof(InputLiquid), - 4, + 6, input_liquid__field_descriptors, input_liquid__field_indices_by_name, 1, input_liquid__number_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/InputLiquid.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/InputLiquid.pb-c.h index c2a47b166..75d257e35 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/InputLiquid.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/InputLiquid.pb-c.h @@ -35,10 +35,14 @@ struct _InputLiquid double maxnanoliterpercentimeter; protobuf_c_boolean has_volume; double volume; + protobuf_c_boolean has_isextraink; + protobuf_c_boolean isextraink; + protobuf_c_boolean has_color; + int32_t color; }; #define INPUT_LIQUID__INIT \ { PROTOBUF_C_MESSAGE_INIT (&input_liquid__descriptor) \ - , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0 } + , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0, 0, 0, 0, 0 } /* InputLiquid methods */ diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/LiquidType.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/LiquidType.pb-c.c index d6d4117b7..e47246064 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/LiquidType.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/LiquidType.pb-c.c @@ -7,7 +7,7 @@ #endif #include "LiquidType.pb-c.h" -static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] = +static const ProtobufCEnumValue liquid_type__enum_values_by_number[18] = { { "Cyan", "LIQUID_TYPE__Cyan", 0 }, { "Magenta", "LIQUID_TYPE__Magenta", 1 }, @@ -19,21 +19,37 @@ static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] = { "LightCyan", "LIQUID_TYPE__LightCyan", 7 }, { "LightMagenta", "LIQUID_TYPE__LightMagenta", 8 }, { "LightYellow", "LIQUID_TYPE__LightYellow", 9 }, + { "Violet", "LIQUID_TYPE__Violet", 10 }, + { "Blue", "LIQUID_TYPE__Blue", 11 }, + { "LightBlue", "LIQUID_TYPE__LightBlue", 12 }, + { "Orange", "LIQUID_TYPE__Orange", 13 }, + { "LightOrange", "LIQUID_TYPE__LightOrange", 14 }, + { "Rubine", "LIQUID_TYPE__Rubine", 15 }, + { "LightRubine", "LIQUID_TYPE__LightRubine", 16 }, + { "Navy", "LIQUID_TYPE__Navy", 17 }, }; static const ProtobufCIntRange liquid_type__value_ranges[] = { -{0, 0},{0, 10} +{0, 0},{0, 18} }; -static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[10] = +static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[18] = { { "Black", 3 }, + { "Blue", 11 }, { "Cleaner", 6 }, { "Cyan", 0 }, + { "LightBlue", 12 }, { "LightCyan", 7 }, { "LightMagenta", 8 }, + { "LightOrange", 14 }, + { "LightRubine", 16 }, { "LightYellow", 9 }, { "Lubricant", 5 }, { "Magenta", 1 }, + { "Navy", 17 }, + { "Orange", 13 }, + { "Rubine", 15 }, { "TransparentInk", 4 }, + { "Violet", 10 }, { "Yellow", 2 }, }; const ProtobufCEnumDescriptor liquid_type__descriptor = @@ -43,9 +59,9 @@ const ProtobufCEnumDescriptor liquid_type__descriptor = "LiquidType", "LiquidType", "", - 10, + 18, liquid_type__enum_values_by_number, - 10, + 18, liquid_type__enum_values_by_name, 1, liquid_type__value_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/LiquidType.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/LiquidType.pb-c.h index eba52c4a7..c30bf0cd2 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/LiquidType.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/LiquidType.pb-c.h @@ -29,7 +29,15 @@ typedef enum _LiquidType { LIQUID_TYPE__Cleaner = 6, LIQUID_TYPE__LightCyan = 7, LIQUID_TYPE__LightMagenta = 8, - LIQUID_TYPE__LightYellow = 9 + LIQUID_TYPE__LightYellow = 9, + LIQUID_TYPE__Violet = 10, + LIQUID_TYPE__Blue = 11, + LIQUID_TYPE__LightBlue = 12, + LIQUID_TYPE__Orange = 13, + LIQUID_TYPE__LightOrange = 14, + LIQUID_TYPE__Rubine = 15, + LIQUID_TYPE__LightRubine = 16, + LIQUID_TYPE__Navy = 17 PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(LIQUID_TYPE) } LiquidType; diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/InputLiquid.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/InputLiquid.pb-c.c index 2d033e2a1..caf6b17a8 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/InputLiquid.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/InputLiquid.pb-c.c @@ -52,7 +52,7 @@ void input_liquid__free_unpacked assert(message->base.descriptor == &input_liquid__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] = +static const ProtobufCFieldDescriptor input_liquid__field_descriptors[6] = { { "LiquidType", @@ -102,9 +102,35 @@ static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] = 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "IsExtraInk", + 5, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_BOOL, + offsetof(InputLiquid, has_isextraink), + offsetof(InputLiquid, isextraink), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "Color", + 6, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_INT32, + offsetof(InputLiquid, has_color), + offsetof(InputLiquid, color), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned input_liquid__field_indices_by_name[] = { 1, /* field[1] = CalibrationData */ + 5, /* field[5] = Color */ + 4, /* field[4] = IsExtraInk */ 0, /* field[0] = LiquidType */ 2, /* field[2] = MaxNanoliterPerCentimeter */ 3, /* field[3] = Volume */ @@ -112,7 +138,7 @@ static const unsigned input_liquid__field_indices_by_name[] = { static const ProtobufCIntRange input_liquid__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 4 } + { 0, 6 } }; const ProtobufCMessageDescriptor input_liquid__descriptor = { @@ -122,7 +148,7 @@ const ProtobufCMessageDescriptor input_liquid__descriptor = "InputLiquid", "", sizeof(InputLiquid), - 4, + 6, input_liquid__field_descriptors, input_liquid__field_indices_by_name, 1, input_liquid__number_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/InputLiquid.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/InputLiquid.pb-c.h index c2a47b166..75d257e35 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/InputLiquid.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/InputLiquid.pb-c.h @@ -35,10 +35,14 @@ struct _InputLiquid double maxnanoliterpercentimeter; protobuf_c_boolean has_volume; double volume; + protobuf_c_boolean has_isextraink; + protobuf_c_boolean isextraink; + protobuf_c_boolean has_color; + int32_t color; }; #define INPUT_LIQUID__INIT \ { PROTOBUF_C_MESSAGE_INIT (&input_liquid__descriptor) \ - , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0 } + , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0, 0, 0, 0, 0 } /* InputLiquid methods */ diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/LiquidType.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/LiquidType.pb-c.c index d6d4117b7..e47246064 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/LiquidType.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/LiquidType.pb-c.c @@ -7,7 +7,7 @@ #endif #include "LiquidType.pb-c.h" -static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] = +static const ProtobufCEnumValue liquid_type__enum_values_by_number[18] = { { "Cyan", "LIQUID_TYPE__Cyan", 0 }, { "Magenta", "LIQUID_TYPE__Magenta", 1 }, @@ -19,21 +19,37 @@ static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] = { "LightCyan", "LIQUID_TYPE__LightCyan", 7 }, { "LightMagenta", "LIQUID_TYPE__LightMagenta", 8 }, { "LightYellow", "LIQUID_TYPE__LightYellow", 9 }, + { "Violet", "LIQUID_TYPE__Violet", 10 }, + { "Blue", "LIQUID_TYPE__Blue", 11 }, + { "LightBlue", "LIQUID_TYPE__LightBlue", 12 }, + { "Orange", "LIQUID_TYPE__Orange", 13 }, + { "LightOrange", "LIQUID_TYPE__LightOrange", 14 }, + { "Rubine", "LIQUID_TYPE__Rubine", 15 }, + { "LightRubine", "LIQUID_TYPE__LightRubine", 16 }, + { "Navy", "LIQUID_TYPE__Navy", 17 }, }; static const ProtobufCIntRange liquid_type__value_ranges[] = { -{0, 0},{0, 10} +{0, 0},{0, 18} }; -static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[10] = +static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[18] = { { "Black", 3 }, + { "Blue", 11 }, { "Cleaner", 6 }, { "Cyan", 0 }, + { "LightBlue", 12 }, { "LightCyan", 7 }, { "LightMagenta", 8 }, + { "LightOrange", 14 }, + { "LightRubine", 16 }, { "LightYellow", 9 }, { "Lubricant", 5 }, { "Magenta", 1 }, + { "Navy", 17 }, + { "Orange", 13 }, + { "Rubine", 15 }, { "TransparentInk", 4 }, + { "Violet", 10 }, { "Yellow", 2 }, }; const ProtobufCEnumDescriptor liquid_type__descriptor = @@ -43,9 +59,9 @@ const ProtobufCEnumDescriptor liquid_type__descriptor = "LiquidType", "LiquidType", "", - 10, + 18, liquid_type__enum_values_by_number, - 10, + 18, liquid_type__enum_values_by_name, 1, liquid_type__value_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/LiquidType.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/LiquidType.pb-c.h index eba52c4a7..c30bf0cd2 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/LiquidType.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/LiquidType.pb-c.h @@ -29,7 +29,15 @@ typedef enum _LiquidType { LIQUID_TYPE__Cleaner = 6, LIQUID_TYPE__LightCyan = 7, LIQUID_TYPE__LightMagenta = 8, - LIQUID_TYPE__LightYellow = 9 + LIQUID_TYPE__LightYellow = 9, + LIQUID_TYPE__Violet = 10, + LIQUID_TYPE__Blue = 11, + LIQUID_TYPE__LightBlue = 12, + LIQUID_TYPE__Orange = 13, + LIQUID_TYPE__LightOrange = 14, + LIQUID_TYPE__Rubine = 15, + LIQUID_TYPE__LightRubine = 16, + LIQUID_TYPE__Navy = 17 PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(LIQUID_TYPE) } LiquidType; diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/InputLiquid.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/InputLiquid.pb-c.c index 2d033e2a1..caf6b17a8 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/InputLiquid.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/InputLiquid.pb-c.c @@ -52,7 +52,7 @@ void input_liquid__free_unpacked assert(message->base.descriptor == &input_liquid__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] = +static const ProtobufCFieldDescriptor input_liquid__field_descriptors[6] = { { "LiquidType", @@ -102,9 +102,35 @@ static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] = 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "IsExtraInk", + 5, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_BOOL, + offsetof(InputLiquid, has_isextraink), + offsetof(InputLiquid, isextraink), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "Color", + 6, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_INT32, + offsetof(InputLiquid, has_color), + offsetof(InputLiquid, color), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned input_liquid__field_indices_by_name[] = { 1, /* field[1] = CalibrationData */ + 5, /* field[5] = Color */ + 4, /* field[4] = IsExtraInk */ 0, /* field[0] = LiquidType */ 2, /* field[2] = MaxNanoliterPerCentimeter */ 3, /* field[3] = Volume */ @@ -112,7 +138,7 @@ static const unsigned input_liquid__field_indices_by_name[] = { static const ProtobufCIntRange input_liquid__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 4 } + { 0, 6 } }; const ProtobufCMessageDescriptor input_liquid__descriptor = { @@ -122,7 +148,7 @@ const ProtobufCMessageDescriptor input_liquid__descriptor = "InputLiquid", "", sizeof(InputLiquid), - 4, + 6, input_liquid__field_descriptors, input_liquid__field_indices_by_name, 1, input_liquid__number_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/InputLiquid.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/InputLiquid.pb-c.h index c2a47b166..75d257e35 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/InputLiquid.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/InputLiquid.pb-c.h @@ -35,10 +35,14 @@ struct _InputLiquid double maxnanoliterpercentimeter; protobuf_c_boolean has_volume; double volume; + protobuf_c_boolean has_isextraink; + protobuf_c_boolean isextraink; + protobuf_c_boolean has_color; + int32_t color; }; #define INPUT_LIQUID__INIT \ { PROTOBUF_C_MESSAGE_INIT (&input_liquid__descriptor) \ - , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0 } + , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0, 0, 0, 0, 0 } /* InputLiquid methods */ diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.c index d6d4117b7..e47246064 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.c @@ -7,7 +7,7 @@ #endif #include "LiquidType.pb-c.h" -static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] = +static const ProtobufCEnumValue liquid_type__enum_values_by_number[18] = { { "Cyan", "LIQUID_TYPE__Cyan", 0 }, { "Magenta", "LIQUID_TYPE__Magenta", 1 }, @@ -19,21 +19,37 @@ static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] = { "LightCyan", "LIQUID_TYPE__LightCyan", 7 }, { "LightMagenta", "LIQUID_TYPE__LightMagenta", 8 }, { "LightYellow", "LIQUID_TYPE__LightYellow", 9 }, + { "Violet", "LIQUID_TYPE__Violet", 10 }, + { "Blue", "LIQUID_TYPE__Blue", 11 }, + { "LightBlue", "LIQUID_TYPE__LightBlue", 12 }, + { "Orange", "LIQUID_TYPE__Orange", 13 }, + { "LightOrange", "LIQUID_TYPE__LightOrange", 14 }, + { "Rubine", "LIQUID_TYPE__Rubine", 15 }, + { "LightRubine", "LIQUID_TYPE__LightRubine", 16 }, + { "Navy", "LIQUID_TYPE__Navy", 17 }, }; static const ProtobufCIntRange liquid_type__value_ranges[] = { -{0, 0},{0, 10} +{0, 0},{0, 18} }; -static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[10] = +static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[18] = { { "Black", 3 }, + { "Blue", 11 }, { "Cleaner", 6 }, { "Cyan", 0 }, + { "LightBlue", 12 }, { "LightCyan", 7 }, { "LightMagenta", 8 }, + { "LightOrange", 14 }, + { "LightRubine", 16 }, { "LightYellow", 9 }, { "Lubricant", 5 }, { "Magenta", 1 }, + { "Navy", 17 }, + { "Orange", 13 }, + { "Rubine", 15 }, { "TransparentInk", 4 }, + { "Violet", 10 }, { "Yellow", 2 }, }; const ProtobufCEnumDescriptor liquid_type__descriptor = @@ -43,9 +59,9 @@ const ProtobufCEnumDescriptor liquid_type__descriptor = "LiquidType", "LiquidType", "", - 10, + 18, liquid_type__enum_values_by_number, - 10, + 18, liquid_type__enum_values_by_name, 1, liquid_type__value_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.h index eba52c4a7..c30bf0cd2 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v4/PMR/ColorLab/LiquidType.pb-c.h @@ -29,7 +29,15 @@ typedef enum _LiquidType { LIQUID_TYPE__Cleaner = 6, LIQUID_TYPE__LightCyan = 7, LIQUID_TYPE__LightMagenta = 8, - LIQUID_TYPE__LightYellow = 9 + LIQUID_TYPE__LightYellow = 9, + LIQUID_TYPE__Violet = 10, + LIQUID_TYPE__Blue = 11, + LIQUID_TYPE__LightBlue = 12, + LIQUID_TYPE__Orange = 13, + LIQUID_TYPE__LightOrange = 14, + LIQUID_TYPE__Rubine = 15, + LIQUID_TYPE__LightRubine = 16, + LIQUID_TYPE__Navy = 17 PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(LIQUID_TYPE) } LiquidType; diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/InputLiquid.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/InputLiquid.pb-c.c index 2d033e2a1..caf6b17a8 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/InputLiquid.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/InputLiquid.pb-c.c @@ -52,7 +52,7 @@ void input_liquid__free_unpacked assert(message->base.descriptor == &input_liquid__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] = +static const ProtobufCFieldDescriptor input_liquid__field_descriptors[6] = { { "LiquidType", @@ -102,9 +102,35 @@ static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] = 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "IsExtraInk", + 5, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_BOOL, + offsetof(InputLiquid, has_isextraink), + offsetof(InputLiquid, isextraink), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "Color", + 6, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_INT32, + offsetof(InputLiquid, has_color), + offsetof(InputLiquid, color), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned input_liquid__field_indices_by_name[] = { 1, /* field[1] = CalibrationData */ + 5, /* field[5] = Color */ + 4, /* field[4] = IsExtraInk */ 0, /* field[0] = LiquidType */ 2, /* field[2] = MaxNanoliterPerCentimeter */ 3, /* field[3] = Volume */ @@ -112,7 +138,7 @@ static const unsigned input_liquid__field_indices_by_name[] = { static const ProtobufCIntRange input_liquid__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 4 } + { 0, 6 } }; const ProtobufCMessageDescriptor input_liquid__descriptor = { @@ -122,7 +148,7 @@ const ProtobufCMessageDescriptor input_liquid__descriptor = "InputLiquid", "", sizeof(InputLiquid), - 4, + 6, input_liquid__field_descriptors, input_liquid__field_indices_by_name, 1, input_liquid__number_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/InputLiquid.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/InputLiquid.pb-c.h index c2a47b166..75d257e35 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/InputLiquid.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/InputLiquid.pb-c.h @@ -35,10 +35,14 @@ struct _InputLiquid double maxnanoliterpercentimeter; protobuf_c_boolean has_volume; double volume; + protobuf_c_boolean has_isextraink; + protobuf_c_boolean isextraink; + protobuf_c_boolean has_color; + int32_t color; }; #define INPUT_LIQUID__INIT \ { PROTOBUF_C_MESSAGE_INIT (&input_liquid__descriptor) \ - , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0 } + , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0, 0, 0, 0, 0 } /* InputLiquid methods */ diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/LiquidType.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/LiquidType.pb-c.c index d6d4117b7..e47246064 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/LiquidType.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/LiquidType.pb-c.c @@ -7,7 +7,7 @@ #endif #include "LiquidType.pb-c.h" -static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] = +static const ProtobufCEnumValue liquid_type__enum_values_by_number[18] = { { "Cyan", "LIQUID_TYPE__Cyan", 0 }, { "Magenta", "LIQUID_TYPE__Magenta", 1 }, @@ -19,21 +19,37 @@ static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] = { "LightCyan", "LIQUID_TYPE__LightCyan", 7 }, { "LightMagenta", "LIQUID_TYPE__LightMagenta", 8 }, { "LightYellow", "LIQUID_TYPE__LightYellow", 9 }, + { "Violet", "LIQUID_TYPE__Violet", 10 }, + { "Blue", "LIQUID_TYPE__Blue", 11 }, + { "LightBlue", "LIQUID_TYPE__LightBlue", 12 }, + { "Orange", "LIQUID_TYPE__Orange", 13 }, + { "LightOrange", "LIQUID_TYPE__LightOrange", 14 }, + { "Rubine", "LIQUID_TYPE__Rubine", 15 }, + { "LightRubine", "LIQUID_TYPE__LightRubine", 16 }, + { "Navy", "LIQUID_TYPE__Navy", 17 }, }; static const ProtobufCIntRange liquid_type__value_ranges[] = { -{0, 0},{0, 10} +{0, 0},{0, 18} }; -static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[10] = +static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[18] = { { "Black", 3 }, + { "Blue", 11 }, { "Cleaner", 6 }, { "Cyan", 0 }, + { "LightBlue", 12 }, { "LightCyan", 7 }, { "LightMagenta", 8 }, + { "LightOrange", 14 }, + { "LightRubine", 16 }, { "LightYellow", 9 }, { "Lubricant", 5 }, { "Magenta", 1 }, + { "Navy", 17 }, + { "Orange", 13 }, + { "Rubine", 15 }, { "TransparentInk", 4 }, + { "Violet", 10 }, { "Yellow", 2 }, }; const ProtobufCEnumDescriptor liquid_type__descriptor = @@ -43,9 +59,9 @@ const ProtobufCEnumDescriptor liquid_type__descriptor = "LiquidType", "LiquidType", "", - 10, + 18, liquid_type__enum_values_by_number, - 10, + 18, liquid_type__enum_values_by_name, 1, liquid_type__value_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/LiquidType.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/LiquidType.pb-c.h index eba52c4a7..c30bf0cd2 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/LiquidType.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v5/PMR/ColorLab/LiquidType.pb-c.h @@ -29,7 +29,15 @@ typedef enum _LiquidType { LIQUID_TYPE__Cleaner = 6, LIQUID_TYPE__LightCyan = 7, LIQUID_TYPE__LightMagenta = 8, - LIQUID_TYPE__LightYellow = 9 + LIQUID_TYPE__LightYellow = 9, + LIQUID_TYPE__Violet = 10, + LIQUID_TYPE__Blue = 11, + LIQUID_TYPE__LightBlue = 12, + LIQUID_TYPE__Orange = 13, + LIQUID_TYPE__LightOrange = 14, + LIQUID_TYPE__Rubine = 15, + LIQUID_TYPE__LightRubine = 16, + LIQUID_TYPE__Navy = 17 PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(LIQUID_TYPE) } LiquidType; diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/InputLiquid.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/InputLiquid.pb-c.c index 2d033e2a1..caf6b17a8 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/InputLiquid.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/InputLiquid.pb-c.c @@ -52,7 +52,7 @@ void input_liquid__free_unpacked assert(message->base.descriptor == &input_liquid__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] = +static const ProtobufCFieldDescriptor input_liquid__field_descriptors[6] = { { "LiquidType", @@ -102,9 +102,35 @@ static const ProtobufCFieldDescriptor input_liquid__field_descriptors[4] = 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "IsExtraInk", + 5, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_BOOL, + offsetof(InputLiquid, has_isextraink), + offsetof(InputLiquid, isextraink), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "Color", + 6, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_INT32, + offsetof(InputLiquid, has_color), + offsetof(InputLiquid, color), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned input_liquid__field_indices_by_name[] = { 1, /* field[1] = CalibrationData */ + 5, /* field[5] = Color */ + 4, /* field[4] = IsExtraInk */ 0, /* field[0] = LiquidType */ 2, /* field[2] = MaxNanoliterPerCentimeter */ 3, /* field[3] = Volume */ @@ -112,7 +138,7 @@ static const unsigned input_liquid__field_indices_by_name[] = { static const ProtobufCIntRange input_liquid__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 4 } + { 0, 6 } }; const ProtobufCMessageDescriptor input_liquid__descriptor = { @@ -122,7 +148,7 @@ const ProtobufCMessageDescriptor input_liquid__descriptor = "InputLiquid", "", sizeof(InputLiquid), - 4, + 6, input_liquid__field_descriptors, input_liquid__field_indices_by_name, 1, input_liquid__number_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/InputLiquid.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/InputLiquid.pb-c.h index c2a47b166..75d257e35 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/InputLiquid.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/InputLiquid.pb-c.h @@ -35,10 +35,14 @@ struct _InputLiquid double maxnanoliterpercentimeter; protobuf_c_boolean has_volume; double volume; + protobuf_c_boolean has_isextraink; + protobuf_c_boolean isextraink; + protobuf_c_boolean has_color; + int32_t color; }; #define INPUT_LIQUID__INIT \ { PROTOBUF_C_MESSAGE_INIT (&input_liquid__descriptor) \ - , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0 } + , 0, LIQUID_TYPE__Cyan, NULL, 0, 0, 0, 0, 0, 0, 0, 0 } /* InputLiquid methods */ diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/LiquidType.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/LiquidType.pb-c.c index d6d4117b7..e47246064 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/LiquidType.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/LiquidType.pb-c.c @@ -7,7 +7,7 @@ #endif #include "LiquidType.pb-c.h" -static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] = +static const ProtobufCEnumValue liquid_type__enum_values_by_number[18] = { { "Cyan", "LIQUID_TYPE__Cyan", 0 }, { "Magenta", "LIQUID_TYPE__Magenta", 1 }, @@ -19,21 +19,37 @@ static const ProtobufCEnumValue liquid_type__enum_values_by_number[10] = { "LightCyan", "LIQUID_TYPE__LightCyan", 7 }, { "LightMagenta", "LIQUID_TYPE__LightMagenta", 8 }, { "LightYellow", "LIQUID_TYPE__LightYellow", 9 }, + { "Violet", "LIQUID_TYPE__Violet", 10 }, + { "Blue", "LIQUID_TYPE__Blue", 11 }, + { "LightBlue", "LIQUID_TYPE__LightBlue", 12 }, + { "Orange", "LIQUID_TYPE__Orange", 13 }, + { "LightOrange", "LIQUID_TYPE__LightOrange", 14 }, + { "Rubine", "LIQUID_TYPE__Rubine", 15 }, + { "LightRubine", "LIQUID_TYPE__LightRubine", 16 }, + { "Navy", "LIQUID_TYPE__Navy", 17 }, }; static const ProtobufCIntRange liquid_type__value_ranges[] = { -{0, 0},{0, 10} +{0, 0},{0, 18} }; -static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[10] = +static const ProtobufCEnumValueIndex liquid_type__enum_values_by_name[18] = { { "Black", 3 }, + { "Blue", 11 }, { "Cleaner", 6 }, { "Cyan", 0 }, + { "LightBlue", 12 }, { "LightCyan", 7 }, { "LightMagenta", 8 }, + { "LightOrange", 14 }, + { "LightRubine", 16 }, { "LightYellow", 9 }, { "Lubricant", 5 }, { "Magenta", 1 }, + { "Navy", 17 }, + { "Orange", 13 }, + { "Rubine", 15 }, { "TransparentInk", 4 }, + { "Violet", 10 }, { "Yellow", 2 }, }; const ProtobufCEnumDescriptor liquid_type__descriptor = @@ -43,9 +59,9 @@ const ProtobufCEnumDescriptor liquid_type__descriptor = "LiquidType", "LiquidType", "", - 10, + 18, liquid_type__enum_values_by_number, - 10, + 18, liquid_type__enum_values_by_name, 1, liquid_type__value_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/LiquidType.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/LiquidType.pb-c.h index eba52c4a7..c30bf0cd2 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/LiquidType.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v6/PMR/ColorLab/LiquidType.pb-c.h @@ -29,7 +29,15 @@ typedef enum _LiquidType { LIQUID_TYPE__Cleaner = 6, LIQUID_TYPE__LightCyan = 7, LIQUID_TYPE__LightMagenta = 8, - LIQUID_TYPE__LightYellow = 9 + LIQUID_TYPE__LightYellow = 9, + LIQUID_TYPE__Violet = 10, + LIQUID_TYPE__Blue = 11, + LIQUID_TYPE__LightBlue = 12, + LIQUID_TYPE__Orange = 13, + LIQUID_TYPE__LightOrange = 14, + LIQUID_TYPE__Rubine = 15, + LIQUID_TYPE__LightRubine = 16, + LIQUID_TYPE__Navy = 17 PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(LIQUID_TYPE) } LiquidType; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindow.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindow.xaml index 1c730bd9f..6d470bc8d 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindow.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/MainWindow.xaml @@ -56,8 +56,8 @@ <TextBlock VerticalAlignment="Center" Width="136" DockPanel.Dock="Left">Build Configuration:</TextBlock> <ComboBox Margin="20 0 0 0" SelectedItem="{Binding Options.BuildConfig}" SelectedIndex="0"> <sys:String>Release</sys:String> - <sys:String>Debug</sys:String> <sys:String>Eureka</sys:String> + <sys:String>X1</sys:String> </ComboBox> </DockPanel> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index 5756e29ec..1c893e81a 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("2.3.2.0")] +[assembly: AssemblyVersion("2.3.3.0")] diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index d72e75011..efc5f8179 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> + <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />--> </requestedPrivileges> </security> </trustInfo> diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs index 501dc7fd9..1852e2e00 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs @@ -28,7 +28,7 @@ namespace Tango.BL.Entities { get { - return (MachineTypes)(Version + 1); + return (MachineTypes)(Version - 1); } } } |