diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-02-15 17:19:40 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-02-15 17:19:40 +0200 |
| commit | 2bfa60ab677ec1da8f968614015ac0147694d31e (patch) | |
| tree | 3af8f956cc678961ae69cf4813a7d3f7c762c0df | |
| parent | 8a4a7818428d7b203cb28082c720c74831b2165f (diff) | |
| download | Tango-2bfa60ab677ec1da8f968614015ac0147694d31e.tar.gz Tango-2bfa60ab677ec1da8f968614015ac0147694d31e.zip | |
BTSR DB, BL & PMR.
50 files changed, 2490 insertions, 256 deletions
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf Binary files differindex 45f004182..f10a52074 100644 --- a/Software/DB/Tango.mdf +++ b/Software/DB/Tango.mdf diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf Binary files differindex 5035ba95d..50eba7ef2 100644 --- a/Software/DB/Tango_log.ldf +++ b/Software/DB/Tango_log.ldf diff --git a/Software/PMR/Messages/.vscode/settings.json b/Software/PMR/Messages/.vscode/settings.json index 95568d220..3018dfeee 100644 --- a/Software/PMR/Messages/.vscode/settings.json +++ b/Software/PMR/Messages/.vscode/settings.json @@ -25,6 +25,7 @@ "--proto_path=ThreadLoading", "--proto_path=IFS", "--proto_path=DataStore", + "--proto_path=BTSR", "--csharp_out=../Out" ] } diff --git a/Software/PMR/Messages/BTSR/BtsrApplicationType.proto b/Software/PMR/Messages/BTSR/BtsrApplicationType.proto new file mode 100644 index 000000000..d8de524fc --- /dev/null +++ b/Software/PMR/Messages/BTSR/BtsrApplicationType.proto @@ -0,0 +1,53 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango PMR Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +syntax = "proto3"; + +package Tango.PMR.BTSR; +option java_package = "com.twine.tango.pmr.btsr"; + +enum BtsrApplicationType +{ + + UNDEFINED_APPLICATION = 0; + + SOCKS = 1; + + REVERSE_SOCKS = 2; + + MEDICAL_SOCKS = 3; + + PANTYHOSE = 4; + + SEAMLESS = 5; + + KNIT = 6; + + REVERSE_KNIT = 7; + + RASCHEL = 8; + + SEWING = 9; + + FLAT_KNIT = 10; + + SMALL_LOOM = 11; + + SHOES = 12; + + FLAT_SHOES = 17; + + INLAY = 18; + + WARP = 30; + + REWIND = 31; + +} diff --git a/Software/PMR/Messages/BTSR/BtsrParameters.proto b/Software/PMR/Messages/BTSR/BtsrParameters.proto new file mode 100644 index 000000000..8ffbbd648 --- /dev/null +++ b/Software/PMR/Messages/BTSR/BtsrParameters.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +import "BtsrApplicationType.proto"; +import "BtsrYarnType.proto"; + +package Tango.PMR.BTSR; +option java_package = "com.twine.tango.pmr.btsr"; + +message BtsrParameters +{ + BtsrApplicationType BtsrApplicationType = 1; + BtsrYarnType BtsrYarnType = 2; + float TensionError = 3; +} diff --git a/Software/PMR/Messages/BTSR/BtsrYarnType.proto b/Software/PMR/Messages/BTSR/BtsrYarnType.proto new file mode 100644 index 000000000..01225f317 --- /dev/null +++ b/Software/PMR/Messages/BTSR/BtsrYarnType.proto @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango PMR Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +syntax = "proto3"; + +package Tango.PMR.BTSR; +option java_package = "com.twine.tango.pmr.btsr"; + +enum BtsrYarnType +{ + + UNDEFINED_YARN = 0; + + ELASTIC_1 = 1; + + ALL_YARN_1 = 2; + + ALL_YARN_2 = 3; + + ALL_YARN_3 = 4; + + ELASTIC_2 = 5; + + ELASTIC_3 = 6; + +} diff --git a/Software/PMR/Messages/Diagnostics/EventType.proto b/Software/PMR/Messages/Diagnostics/EventType.proto index d24afb50b..2d5b64afe 100644 --- a/Software/PMR/Messages/Diagnostics/EventType.proto +++ b/Software/PMR/Messages/Diagnostics/EventType.proto @@ -688,52 +688,52 @@ enum EventType //Mixer current loop break. Cannot execute job (Group = Mixer, Category = Error) MIXER_CURRENT_LOOP_BREAK = 6005; - //Overpressure in @ dispenser . Cannot execute job (Group = Dispensers, Category = Critical) + //Overpressure in the @ dispenser . Cannot execute job (Group = Dispensers, Category = Critical) DISPENSER_1_OVERPRESSURE = 7000; - //Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + //Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) DISPENSER_2_OVERPRESSURE = 7001; - //Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + //Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) DISPENSER_3_OVERPRESSURE = 7002; - //Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + //Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) DISPENSER_4_OVERPRESSURE = 7003; - //Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + //Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) DISPENSER_5_OVERPRESSURE = 7004; - //Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + //Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) DISPENSER_6_OVERPRESSURE = 7005; - //Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + //Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) DISPENSER_7_OVERPRESSURE = 7006; - //Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + //Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) DISPENSER_8_OVERPRESSURE = 7007; - //The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_1_UNDERPRESSURE = 7008; - //The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_2_UNDERPRESSURE = 7009; - //The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_3_UNDERPRESSURE = 7010; - //The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_4_UNDERPRESSURE = 7011; - //The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_5_UNDERPRESSURE = 7012; - //The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_6_UNDERPRESSURE = 7013; - //The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_7_UNDERPRESSURE = 7014; - //The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_8_UNDERPRESSURE = 7015; //The @ dispenser is empty (Group = Dispensers, Category = Error) @@ -928,172 +928,172 @@ enum EventType //The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_8_LOWER_HARD_LIMIT = 7079; - //Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_1_HIGH_PRESSURE = 7080; - //Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_2_HIGH_PRESSURE = 7081; - //Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_3_HIGH_PRESSURE = 7082; - //Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_4_HIGH_PRESSURE = 7083; - //Pressure in @ dispenser is too high. Cannot execue job (Group = Dispensers, Category = Error) + //The pressure in @ dispenser is too high. Cannot execue job (Group = Dispensers, Category = Error) DISPENSER_5_HIGH_PRESSURE = 7084; - //Pressure in@ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_6_HIGH_PRESSURE = 7085; - //Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_7_HIGH_PRESSURE = 7086; - //Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_8_HIGH_PRESSURE = 7087; - //Overpressure in @. Cannot execute job (Group = Dispensers, Category = Error) + //Overpressure in @ module. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_9_OVERPRESSURE = 7088; - //Pressure in @ is too low. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in @ module is too low. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_9_UNDERPRESSURE = 7089; - //Overpressure in @. Cannot execute job (Group = Dispensers, Category = Error) + //Overpressure in @ module. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_10_OVERPRESSURE = 7090; - //Pressure in @ is too low. Cannot execute job (Group = Dispensers, Category = Error) + //The pressure in @ module is too low. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_10_UNDERPRESSURE = 7091; - //Malfunction in @ motor 1. Cannot execute job (Group = Dispensers, Category = Error) + //Malfunction in @ module motor 1. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_9_MOTOR_1_MALFUNCTION = 7092; - //Malfunction in @ motor 2. Cannot execute job (Group = Dispensers, Category = Error) + //Malfunction in @ module motor 2. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_9_MOTOR_2_MALFUNCTION = 7093; - //Malfunction in @ motor 1. Cannot execute job (Group = Dispensers, Category = Error) + //Malfunction in @ module motor 1. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_10_MOTOR_1_MALFUNCTION = 7094; - //Malfunction in @ motor 2. Cannot execute job (Group = Dispensers, Category = Error) + //Malfunction in @ module motor 2. Cannot execute job (Group = Dispensers, Category = Error) DISPENSER_10_MOTOR_2_MALFUNCTION = 7095; - //Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + //The @ tank level is low (Group = InkDeliverySystem, Category = Warning) MID_TANK_1_LOW_LEVEL = 8000; - //Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + //The @ tank level is low (Group = InkDeliverySystem, Category = Warning) MID_TANK_2_LOW_LEVEL = 8001; - //Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + //The @ tank level is low (Group = InkDeliverySystem, Category = Warning) MID_TANK_3_LOW_LEVEL = 8002; - //Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + //The @ tank level is low (Group = InkDeliverySystem, Category = Warning) MID_TANK_4_LOW_LEVEL = 8003; - //Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + //The @ tank level is low (Group = InkDeliverySystem, Category = Warning) MID_TANK_5_LOW_LEVEL = 8004; - //Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + //The @ tank level is low (Group = InkDeliverySystem, Category = Warning) MID_TANK_6_LOW_LEVEL = 8005; - //Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + //The @ tank level is low (Group = InkDeliverySystem, Category = Warning) MID_TANK_7_LOW_LEVEL = 8006; - //Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + //The @ tank level is low (Group = InkDeliverySystem, Category = Warning) MID_TANK_8_LOW_LEVEL = 8007; - //The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_1_EMPTY = 8008; - //The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_2_EMPTY = 8009; - //The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_3_EMPTY = 8010; - //The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_4_EMPTY = 8011; - //The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_5_EMPTY = 8012; - //The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_6_EMPTY = 8013; - //The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_7_EMPTY = 8014; - //The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_8_EMPTY = 8015; - //Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_1_OVERFLOW = 8016; - //Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_2_OVERFLOW = 8017; - //Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_3_OVERFLOW = 8018; - //Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_4_OVERFLOW = 8019; - //Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_5_OVERFLOW = 8020; - //Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_6_OVERFLOW = 8021; - //Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_7_OVERFLOW = 8022; - //Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_8_OVERFLOW = 8023; - //Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_1_FILL_TIMEOUT = 8024; - //Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_2_FILL_TIMEOUT = 8025; - //Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_3_FILL_TIMEOUT = 8026; - //Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_4_FILL_TIMEOUT = 8027; - //Failed to fill @ ink. Canot execute job (Group = InkDeliverySystem, Category = Error) + //Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_5_FILL_TIMEOUT = 8028; - //Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_6_FILL_TIMEOUT = 8029; - //Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_7_FILL_TIMEOUT = 8030; - //Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_8_FILL_TIMEOUT = 8031; - //Level of @ is low (Group = InkDeliverySystem, Category = Warning) + //The @ tank level is low (Group = InkDeliverySystem, Category = Warning) MID_TANK_9_LOW_LEVEL = 8032; - //The @ is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_9_EMPTY = 8033; - //Overflow in @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_9_OVERFLOW = 8034; - //Failed to fill @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_9_FILL_TIMEOUT = 8035; - //Level of @ is low (Group = InkDeliverySystem, Category = Warning) + //The @ tank level is low (Group = InkDeliverySystem, Category = Warning) MID_TANK_10_LOW_LEVEL = 8036; - //The @ is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_10_EMPTY = 8037; - //Overflow in @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_10_OVERFLOW = 8038; - //Failed to fill @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + //Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) MID_TANK_10_FILL_TIMEOUT = 8039; //Cannot detect air filter. Cannot execute job (Group = WasteHandlingSystem, Category = Critical) diff --git a/Software/PMR/Messages/Printing/JobSpool.proto b/Software/PMR/Messages/Printing/JobSpool.proto index e9fa8ae5f..c08c40424 100644 --- a/Software/PMR/Messages/Printing/JobSpool.proto +++ b/Software/PMR/Messages/Printing/JobSpool.proto @@ -38,4 +38,6 @@ message JobSpool int32 LimitSwitchStartPointOffset = 10; + int32 BtsrSpoolTension = 11; + } diff --git a/Software/PMR/Messages/Printing/JobTicket.proto b/Software/PMR/Messages/Printing/JobTicket.proto index 141adff01..2941a7e61 100644 --- a/Software/PMR/Messages/Printing/JobTicket.proto +++ b/Software/PMR/Messages/Printing/JobTicket.proto @@ -7,6 +7,7 @@ import "JobSpool.proto"; import "JobUploadStrategy.proto"; import "ThreadParameters.proto"; import "HeadCleaningParameters.proto"; +import "BtsrParameters.proto"; package Tango.PMR.Printing; option java_package = "com.twine.tango.pmr.printing"; @@ -40,4 +41,5 @@ message JobTicket ThreadParameters ThreadParameters = 15; HeadCleaningParameters HeadCleaningParameters = 16; + PMR.BTSR.BtsrParameters BtsrParameters = 17; }
\ No newline at end of file diff --git a/Software/PMR/Messages/Printing/ProcessParameters.proto b/Software/PMR/Messages/Printing/ProcessParameters.proto index 0a483d9bb..71ecc9564 100644 --- a/Software/PMR/Messages/Printing/ProcessParameters.proto +++ b/Software/PMR/Messages/Printing/ProcessParameters.proto @@ -78,4 +78,10 @@ message ProcessParameters double PressureBuildUp = 31; + double BtsrFeedingTension = 32; + + double BtsrExitTension = 33; + + double BtsrThreadLengthOffset = 34; + } diff --git a/Software/Visual_Studio/Tango.BL/DTO/BtsrApplicationTypeDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/BtsrApplicationTypeDTO.cs new file mode 100644 index 000000000..5b70ab2db --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/BtsrApplicationTypeDTO.cs @@ -0,0 +1,14 @@ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.DTO +{ + public class BtsrApplicationTypeDTO : BtsrApplicationTypeDTOBase + { + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/BtsrApplicationTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/BtsrApplicationTypeDTOBase.cs new file mode 100644 index 000000000..31aef5fca --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/BtsrApplicationTypeDTOBase.cs @@ -0,0 +1,49 @@ + +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; + +namespace Tango.BL.DTO +{ + public abstract class BtsrApplicationTypeDTOBase : ObservableEntityDTO<BtsrApplicationTypeDTO, BtsrApplicationType> + { + + /// <summary> + /// code + /// </summary> + public Int32 Code + { + get; set; + } + + /// <summary> + /// name + /// </summary> + public String Name + { + get; set; + } + + /// <summary> + /// description + /// </summary> + public String Description + { + get; set; + } + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/BtsrYarnTypeDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/BtsrYarnTypeDTO.cs new file mode 100644 index 000000000..41f2b3fd4 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/BtsrYarnTypeDTO.cs @@ -0,0 +1,14 @@ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.BL.DTO +{ + public class BtsrYarnTypeDTO : BtsrYarnTypeDTOBase + { + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/BtsrYarnTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/BtsrYarnTypeDTOBase.cs new file mode 100644 index 000000000..31b7f04f0 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/DTO/BtsrYarnTypeDTOBase.cs @@ -0,0 +1,49 @@ + +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; + +namespace Tango.BL.DTO +{ + public abstract class BtsrYarnTypeDTOBase : ObservableEntityDTO<BtsrYarnTypeDTO, BtsrYarnType> + { + + /// <summary> + /// code + /// </summary> + public Int32 Code + { + get; set; + } + + /// <summary> + /// name + /// </summary> + public String Name + { + get; set; + } + + /// <summary> + /// description + /// </summary> + public String Description + { + get; set; + } + + } +} diff --git a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs index f0699bc72..3207c0a0d 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs @@ -285,5 +285,29 @@ namespace Tango.BL.DTO get; set; } + /// <summary> + /// btsr feeding tension + /// </summary> + public Double BtsrFeedingTension + { + get; set; + } + + /// <summary> + /// btsr exit tension + /// </summary> + public Double BtsrExitTension + { + get; set; + } + + /// <summary> + /// btsr thread length offset + /// </summary> + public Double BtsrThreadLengthOffset + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs index 4530ae25d..5a13afe18 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs @@ -389,5 +389,21 @@ namespace Tango.BL.DTO get; set; } + /// <summary> + /// btsr application type guid + /// </summary> + public String BtsrApplicationTypeGuid + { + get; set; + } + + /// <summary> + /// btsr yarn type guid + /// </summary> + public String BtsrYarnTypeGuid + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs index 1598a321f..c17e2b426 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlsSpoolDTOBase.cs @@ -69,5 +69,13 @@ namespace Tango.BL.DTO get; set; } + /// <summary> + /// btsr spool tension + /// </summary> + public Nullable<Int32> BtsrSpoolTension + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs index 5b02cb536..f16b07d53 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/SpoolTypeDTOBase.cs @@ -109,5 +109,13 @@ namespace Tango.BL.DTO get; set; } + /// <summary> + /// btsr spool tension + /// </summary> + public Int32 BtsrSpoolTension + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationType.cs b/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationType.cs new file mode 100644 index 000000000..1ebb4dcae --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationType.cs @@ -0,0 +1,36 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; +using Tango.Core; +using System.ComponentModel; +using Tango.Core.CustomAttributes; +using Tango.BL.Enumerations; + +namespace Tango.BL.Entities +{ + public class BtsrApplicationType: BtsrApplicationTypeBase + { + [NotMapped] + [JsonIgnore] + public BtsrApplicationTypes Type + { + get { return (BtsrApplicationTypes)Code; } + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs new file mode 100644 index 000000000..ee1ff6ecc --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/BtsrApplicationTypeBase.cs @@ -0,0 +1,190 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; +using Tango.Core; +using System.ComponentModel; +using Tango.Core.CustomAttributes; + +namespace Tango.BL.Entities +{ + [Table("BTSR_APPLICATION_TYPES")] + public abstract class BtsrApplicationTypeBase : ObservableEntity<BtsrApplicationType> + { + + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<SynchronizedObservableCollection<Rml>> RmlsChanged; + + protected Int32 _code; + + /// <summary> + /// Gets or sets the btsrapplicationtypebase code. + /// </summary> + + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + if (_code != value) + { + _code = value; + + OnCodeChanged(value); + + } + } + } + + protected String _name; + + /// <summary> + /// Gets or sets the btsrapplicationtypebase name. + /// </summary> + + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + if (_name != value) + { + _name = value; + + OnNameChanged(value); + + } + } + } + + protected String _description; + + /// <summary> + /// Gets or sets the btsrapplicationtypebase description. + /// </summary> + + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + if (_description != value) + { + _description = value; + + OnDescriptionChanged(value); + + } + } + } + + protected SynchronizedObservableCollection<Rml> _rmls; + + /// <summary> + /// Gets or sets the btsrapplicationtypebase rmls. + /// </summary> + + public virtual SynchronizedObservableCollection<Rml> Rmls + { + get + { + return _rmls; + } + + set + { + if (_rmls != value) + { + _rmls = value; + + OnRmlsChanged(value); + + } + } + } + + /// <summary> + /// Called when the Code has changed. + /// </summary> + protected virtual void OnCodeChanged(Int32 code) + { + CodeChanged?.Invoke(this, code); + RaisePropertyChanged(nameof(Code)); + } + + /// <summary> + /// Called when the Name has changed. + /// </summary> + protected virtual void OnNameChanged(String name) + { + NameChanged?.Invoke(this, name); + RaisePropertyChanged(nameof(Name)); + } + + /// <summary> + /// Called when the Description has changed. + /// </summary> + protected virtual void OnDescriptionChanged(String description) + { + DescriptionChanged?.Invoke(this, description); + RaisePropertyChanged(nameof(Description)); + } + + /// <summary> + /// Called when the Rmls has changed. + /// </summary> + protected virtual void OnRmlsChanged(SynchronizedObservableCollection<Rml> rmls) + { + RmlsChanged?.Invoke(this, rmls); + RaisePropertyChanged(nameof(Rmls)); + } + + /// <summary> + /// Initializes a new instance of the <see cref="BtsrApplicationTypeBase" /> class. + /// </summary> + public BtsrApplicationTypeBase() : base() + { + + Rmls = new SynchronizedObservableCollection<Rml>(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnType.cs b/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnType.cs new file mode 100644 index 000000000..036f64ee0 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnType.cs @@ -0,0 +1,36 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; +using Tango.Core; +using System.ComponentModel; +using Tango.Core.CustomAttributes; +using Tango.BL.Enumerations; + +namespace Tango.BL.Entities +{ + public class BtsrYarnType : BtsrYarnTypeBase + { + [NotMapped] + [JsonIgnore] + public BtsrYarnTypes Type + { + get { return (BtsrYarnTypes)Code; } + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs new file mode 100644 index 000000000..608989fab --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Entities/BtsrYarnTypeBase.cs @@ -0,0 +1,190 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using System.Xml.Serialization; +using Newtonsoft.Json; +using System.Linq; +using Tango.DAL.Remote.DB; +using Tango.Core; +using System.ComponentModel; +using Tango.Core.CustomAttributes; + +namespace Tango.BL.Entities +{ + [Table("BTSR_YARN_TYPES")] + public abstract class BtsrYarnTypeBase : ObservableEntity<BtsrYarnType> + { + + public event EventHandler<Int32> CodeChanged; + + public event EventHandler<String> NameChanged; + + public event EventHandler<String> DescriptionChanged; + + public event EventHandler<SynchronizedObservableCollection<Rml>> RmlsChanged; + + protected Int32 _code; + + /// <summary> + /// Gets or sets the btsryarntypebase code. + /// </summary> + + [Column("CODE")] + + public Int32 Code + { + get + { + return _code; + } + + set + { + if (_code != value) + { + _code = value; + + OnCodeChanged(value); + + } + } + } + + protected String _name; + + /// <summary> + /// Gets or sets the btsryarntypebase name. + /// </summary> + + [Column("NAME")] + + public String Name + { + get + { + return _name; + } + + set + { + if (_name != value) + { + _name = value; + + OnNameChanged(value); + + } + } + } + + protected String _description; + + /// <summary> + /// Gets or sets the btsryarntypebase description. + /// </summary> + + [Column("DESCRIPTION")] + + public String Description + { + get + { + return _description; + } + + set + { + if (_description != value) + { + _description = value; + + OnDescriptionChanged(value); + + } + } + } + + protected SynchronizedObservableCollection<Rml> _rmls; + + /// <summary> + /// Gets or sets the btsryarntypebase rmls. + /// </summary> + + public virtual SynchronizedObservableCollection<Rml> Rmls + { + get + { + return _rmls; + } + + set + { + if (_rmls != value) + { + _rmls = value; + + OnRmlsChanged(value); + + } + } + } + + /// <summary> + /// Called when the Code has changed. + /// </summary> + protected virtual void OnCodeChanged(Int32 code) + { + CodeChanged?.Invoke(this, code); + RaisePropertyChanged(nameof(Code)); + } + + /// <summary> + /// Called when the Name has changed. + /// </summary> + protected virtual void OnNameChanged(String name) + { + NameChanged?.Invoke(this, name); + RaisePropertyChanged(nameof(Name)); + } + + /// <summary> + /// Called when the Description has changed. + /// </summary> + protected virtual void OnDescriptionChanged(String description) + { + DescriptionChanged?.Invoke(this, description); + RaisePropertyChanged(nameof(Description)); + } + + /// <summary> + /// Called when the Rmls has changed. + /// </summary> + protected virtual void OnRmlsChanged(SynchronizedObservableCollection<Rml> rmls) + { + RmlsChanged?.Invoke(this, rmls); + RaisePropertyChanged(nameof(Rmls)); + } + + /// <summary> + /// Initializes a new instance of the <see cref="BtsrYarnTypeBase" /> class. + /// </summary> + public BtsrYarnTypeBase() : base() + { + + Rmls = new SynchronizedObservableCollection<Rml>(); + + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs index 498bafc85..06248ab32 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs @@ -91,6 +91,12 @@ namespace Tango.BL.Entities public event EventHandler<Double> PressureBuildUpChanged; + public event EventHandler<Double> BtsrFeedingTensionChanged; + + public event EventHandler<Double> BtsrExitTensionChanged; + + public event EventHandler<Double> BtsrThreadLengthOffsetChanged; + public event EventHandler<ProcessParametersTablesGroup> ProcessParametersTablesGroupChanged; protected String _name; @@ -1107,6 +1113,99 @@ namespace Tango.BL.Entities } } + protected Double _btsrfeedingtension; + + /// <summary> + /// Gets or sets the processparameterstablebase btsr feeding tension. + /// </summary> + + [Column("BTSR_FEEDING_TENSION")] + + [StringFormat("0.0")] + + [PropertyIndex(30)] + + public Double BtsrFeedingTension + { + get + { + return _btsrfeedingtension; + } + + set + { + if (_btsrfeedingtension != value) + { + _btsrfeedingtension = value; + + OnBtsrFeedingTensionChanged(value); + + } + } + } + + protected Double _btsrexittension; + + /// <summary> + /// Gets or sets the processparameterstablebase btsr exit tension. + /// </summary> + + [Column("BTSR_EXIT_TENSION")] + + [StringFormat("0.0")] + + [PropertyIndex(31)] + + public Double BtsrExitTension + { + get + { + return _btsrexittension; + } + + set + { + if (_btsrexittension != value) + { + _btsrexittension = value; + + OnBtsrExitTensionChanged(value); + + } + } + } + + protected Double _btsrthreadlengthoffset; + + /// <summary> + /// Gets or sets the processparameterstablebase btsr thread length offset. + /// </summary> + + [Column("BTSR_THREAD_LENGTH_OFFSET")] + + [StringFormat("0.0")] + + [PropertyIndex(32)] + + public Double BtsrThreadLengthOffset + { + get + { + return _btsrthreadlengthoffset; + } + + set + { + if (_btsrthreadlengthoffset != value) + { + _btsrthreadlengthoffset = value; + + OnBtsrThreadLengthOffsetChanged(value); + + } + } + } + protected ProcessParametersTablesGroup _processparameterstablesgroup; /// <summary> @@ -1428,6 +1527,33 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the BtsrFeedingTension has changed. + /// </summary> + protected virtual void OnBtsrFeedingTensionChanged(Double btsrfeedingtension) + { + BtsrFeedingTensionChanged?.Invoke(this, btsrfeedingtension); + RaisePropertyChanged(nameof(BtsrFeedingTension)); + } + + /// <summary> + /// Called when the BtsrExitTension has changed. + /// </summary> + protected virtual void OnBtsrExitTensionChanged(Double btsrexittension) + { + BtsrExitTensionChanged?.Invoke(this, btsrexittension); + RaisePropertyChanged(nameof(BtsrExitTension)); + } + + /// <summary> + /// Called when the BtsrThreadLengthOffset has changed. + /// </summary> + protected virtual void OnBtsrThreadLengthOffsetChanged(Double btsrthreadlengthoffset) + { + BtsrThreadLengthOffsetChanged?.Invoke(this, btsrthreadlengthoffset); + RaisePropertyChanged(nameof(BtsrThreadLengthOffset)); + } + + /// <summary> /// Called when the ProcessParametersTablesGroup has changed. /// </summary> protected virtual void OnProcessParametersTablesGroupChanged(ProcessParametersTablesGroup processparameterstablesgroup) diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs index cb081f263..f3851ab6d 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs @@ -105,6 +105,10 @@ namespace Tango.BL.Entities public event EventHandler<Double> VMaxChanged; + public event EventHandler<BtsrApplicationType> BtsrApplicationTypeChanged; + + public event EventHandler<BtsrYarnType> BtsrYarnTypeChanged; + public event EventHandler<SynchronizedObservableCollection<Cat>> CatsChanged; public event EventHandler<Cct> CctChanged; @@ -1368,6 +1372,122 @@ namespace Tango.BL.Entities } } + protected String _btsrapplicationtypeguid; + + /// <summary> + /// Gets or sets the rmlbase btsr application type guid. + /// </summary> + + [Column("BTSR_APPLICATION_TYPE_GUID")] + [ForeignKey("BtsrApplicationType")] + + public String BtsrApplicationTypeGuid + { + get + { + return _btsrapplicationtypeguid; + } + + set + { + if (_btsrapplicationtypeguid != value) + { + _btsrapplicationtypeguid = value; + + } + } + } + + protected String _btsryarntypeguid; + + /// <summary> + /// Gets or sets the rmlbase btsr yarn type guid. + /// </summary> + + [Column("BTSR_YARN_TYPE_GUID")] + [ForeignKey("BtsrYarnType")] + + public String BtsrYarnTypeGuid + { + get + { + return _btsryarntypeguid; + } + + set + { + if (_btsryarntypeguid != value) + { + _btsryarntypeguid = value; + + } + } + } + + protected BtsrApplicationType _btsrapplicationtype; + + /// <summary> + /// Gets or sets the rmlbase btsr application types. + /// </summary> + + [XmlIgnore] + [JsonIgnore] + public virtual BtsrApplicationType BtsrApplicationType + { + get + { + return _btsrapplicationtype; + } + + set + { + if (_btsrapplicationtype != value) + { + _btsrapplicationtype = value; + + if (BtsrApplicationType != null) + { + BtsrApplicationTypeGuid = BtsrApplicationType.Guid; + } + + OnBtsrApplicationTypeChanged(value); + + } + } + } + + protected BtsrYarnType _btsryarntype; + + /// <summary> + /// Gets or sets the rmlbase btsr yarn types. + /// </summary> + + [XmlIgnore] + [JsonIgnore] + public virtual BtsrYarnType BtsrYarnType + { + get + { + return _btsryarntype; + } + + set + { + if (_btsryarntype != value) + { + _btsryarntype = value; + + if (BtsrYarnType != null) + { + BtsrYarnTypeGuid = BtsrYarnType.Guid; + } + + OnBtsrYarnTypeChanged(value); + + } + } + } + protected SynchronizedObservableCollection<Cat> _cats; /// <summary> @@ -2119,6 +2239,24 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the BtsrApplicationType has changed. + /// </summary> + protected virtual void OnBtsrApplicationTypeChanged(BtsrApplicationType btsrapplicationtype) + { + BtsrApplicationTypeChanged?.Invoke(this, btsrapplicationtype); + RaisePropertyChanged(nameof(BtsrApplicationType)); + } + + /// <summary> + /// Called when the BtsrYarnType has changed. + /// </summary> + protected virtual void OnBtsrYarnTypeChanged(BtsrYarnType btsryarntype) + { + BtsrYarnTypeChanged?.Invoke(this, btsryarntype); + RaisePropertyChanged(nameof(BtsrYarnType)); + } + + /// <summary> /// Called when the Cats has changed. /// </summary> protected virtual void OnCatsChanged(SynchronizedObservableCollection<Cat> cats) diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlsSpoolBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlsSpoolBase.cs index fee4ef6b4..0edd11cfd 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlsSpoolBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlsSpoolBase.cs @@ -35,6 +35,8 @@ namespace Tango.BL.Entities public event EventHandler<Nullable<Int32>> BottomBackingRateChanged; + public event EventHandler<Nullable<Int32>> BtsrSpoolTensionChanged; + public event EventHandler<Rml> RmlChanged; public event EventHandler<SpoolType> SpoolTypeChanged; @@ -199,6 +201,33 @@ namespace Tango.BL.Entities } } + protected Nullable<Int32> _btsrspooltension; + + /// <summary> + /// Gets or sets the rmlsspoolbase btsr spool tension. + /// </summary> + + [Column("BTSR_SPOOL_TENSION")] + + public Nullable<Int32> BtsrSpoolTension + { + get + { + return _btsrspooltension; + } + + set + { + if (_btsrspooltension != value) + { + _btsrspooltension = value; + + OnBtsrSpoolTensionChanged(value); + + } + } + } + protected Rml _rml; /// <summary> @@ -300,6 +329,15 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the BtsrSpoolTension has changed. + /// </summary> + protected virtual void OnBtsrSpoolTensionChanged(Nullable<Int32> btsrspooltension) + { + BtsrSpoolTensionChanged?.Invoke(this, btsrspooltension); + RaisePropertyChanged(nameof(BtsrSpoolTension)); + } + + /// <summary> /// Called when the Rml has changed. /// </summary> protected virtual void OnRmlChanged(Rml rml) diff --git a/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs index a3e59bbc7..5939a3c62 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/SpoolTypeBase.cs @@ -49,6 +49,8 @@ namespace Tango.BL.Entities public event EventHandler<Int32> LimitSwitchStartPointOffsetChanged; + public event EventHandler<Int32> BtsrSpoolTensionChanged; + public event EventHandler<SynchronizedObservableCollection<Job>> JobsChanged; public event EventHandler<SynchronizedObservableCollection<RmlsSpool>> RmlsSpoolsChanged; @@ -352,6 +354,33 @@ namespace Tango.BL.Entities } } + protected Int32 _btsrspooltension; + + /// <summary> + /// Gets or sets the spooltypebase btsr spool tension. + /// </summary> + + [Column("BTSR_SPOOL_TENSION")] + + public Int32 BtsrSpoolTension + { + get + { + return _btsrspooltension; + } + + set + { + if (_btsrspooltension != value) + { + _btsrspooltension = value; + + OnBtsrSpoolTensionChanged(value); + + } + } + } + protected SynchronizedObservableCollection<Job> _jobs; /// <summary> @@ -527,6 +556,15 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the BtsrSpoolTension has changed. + /// </summary> + protected virtual void OnBtsrSpoolTensionChanged(Int32 btsrspooltension) + { + BtsrSpoolTensionChanged?.Invoke(this, btsrspooltension); + RaisePropertyChanged(nameof(BtsrSpoolTension)); + } + + /// <summary> /// Called when the Jobs has changed. /// </summary> protected virtual void OnJobsChanged(SynchronizedObservableCollection<Job> jobs) diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/BtsrApplicationTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/BtsrApplicationTypes.cs new file mode 100644 index 000000000..e3dad13b3 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Enumerations/BtsrApplicationTypes.cs @@ -0,0 +1,119 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.BL.Enumerations +{ + public enum BtsrApplicationTypes + { + + /// <summary> + /// (Socks) + /// </summary> + [Description("Socks")] + SOCKS = 1, + + /// <summary> + /// (Reverse Socks) + /// </summary> + [Description("Reverse Socks")] + REVERSE_SOCKS = 2, + + /// <summary> + /// (Medical Socks) + /// </summary> + [Description("Medical Socks")] + MEDICAL_SOCKS = 3, + + /// <summary> + /// (Pantyhose) + /// </summary> + [Description("Pantyhose")] + PANTYHOSE = 4, + + /// <summary> + /// (Seamless) + /// </summary> + [Description("Seamless")] + SEAMLESS = 5, + + /// <summary> + /// (Knit) + /// </summary> + [Description("Knit")] + KNIT = 6, + + /// <summary> + /// (Reverse Knit) + /// </summary> + [Description("Reverse Knit")] + REVERSE_KNIT = 7, + + /// <summary> + /// (Raschel) + /// </summary> + [Description("Raschel")] + RASCHEL = 8, + + /// <summary> + /// (Sewing) + /// </summary> + [Description("Sewing")] + SEWING = 9, + + /// <summary> + /// (Flat Knit) + /// </summary> + [Description("Flat Knit")] + FLAT_KNIT = 10, + + /// <summary> + /// (Small Loom) + /// </summary> + [Description("Small Loom")] + SMALL_LOOM = 11, + + /// <summary> + /// (Shoes) + /// </summary> + [Description("Shoes")] + SHOES = 12, + + /// <summary> + /// (Flat Shoes) + /// </summary> + [Description("Flat Shoes")] + FLAT_SHOES = 17, + + /// <summary> + /// (Inlay) + /// </summary> + [Description("Inlay")] + INLAY = 18, + + /// <summary> + /// (Warp) + /// </summary> + [Description("Warp")] + WARP = 30, + + /// <summary> + /// (Rewind) + /// </summary> + [Description("Rewind")] + REWIND = 31, + + } +} diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/BtsrYarnTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/BtsrYarnTypes.cs new file mode 100644 index 000000000..0c29e8006 --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Enumerations/BtsrYarnTypes.cs @@ -0,0 +1,59 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated by a tool. +// Tango Observables Generator +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. Do not modify! +// </auto-generated> +//------------------------------------------------------------------------------ + +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; +using System.ComponentModel; + +namespace Tango.BL.Enumerations +{ + public enum BtsrYarnTypes + { + + /// <summary> + /// (Elastic 1) + /// </summary> + [Description("Elastic 1")] + ELASTIC_1 = 1, + + /// <summary> + /// (All Yarn 1) + /// </summary> + [Description("All Yarn 1")] + ALL_YARN_1 = 2, + + /// <summary> + /// (All Yarn 2) + /// </summary> + [Description("All Yarn 2")] + ALL_YARN_2 = 3, + + /// <summary> + /// (All Yarn 3) + /// </summary> + [Description("All Yarn 3")] + ALL_YARN_3 = 4, + + /// <summary> + /// (Elastic 2) + /// </summary> + [Description("Elastic 2")] + ELASTIC_2 = 5, + + /// <summary> + /// (Elastic 3) + /// </summary> + [Description("Elastic 3")] + ELASTIC_3 = 6, + + } +} diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs index 9f3deb2d2..73d51e4d4 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs @@ -79,6 +79,22 @@ namespace Tango.BL } /// <summary> + /// Gets or sets the BtsrApplicationTypes. + /// </summary> + public DbSet<BtsrApplicationType> BtsrApplicationTypes + { + get; set; + } + + /// <summary> + /// Gets or sets the BtsrYarnTypes. + /// </summary> + public DbSet<BtsrYarnType> BtsrYarnTypes + { + get; set; + } + + /// <summary> /// Gets or sets the CartridgeTypes. /// </summary> public DbSet<CartridgeType> CartridgeTypes diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs index ef6704031..075760170 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs @@ -269,6 +269,78 @@ namespace Tango.BL } + private ObservableCollection<BtsrApplicationType> _btsrapplicationtypes; + /// <summary> + /// Gets or sets the BtsrApplicationTypes. + /// </summary> + public ObservableCollection<BtsrApplicationType> BtsrApplicationTypes + { + get + { + return _btsrapplicationtypes; + } + + set + { + _btsrapplicationtypes = value; RaisePropertyChanged(nameof(BtsrApplicationTypes)); + } + + } + + private ICollectionView _btsrapplicationtypesViewSource; + /// <summary> + /// Gets or sets the BtsrApplicationTypes View Source. + ///</summary> + public ICollectionView BtsrApplicationTypesViewSource + { + get + { + return _btsrapplicationtypesViewSource; + } + + set + { + _btsrapplicationtypesViewSource = value; RaisePropertyChanged(nameof(BtsrApplicationTypesViewSource)); + } + + } + + private ObservableCollection<BtsrYarnType> _btsryarntypes; + /// <summary> + /// Gets or sets the BtsrYarnTypes. + /// </summary> + public ObservableCollection<BtsrYarnType> BtsrYarnTypes + { + get + { + return _btsryarntypes; + } + + set + { + _btsryarntypes = value; RaisePropertyChanged(nameof(BtsrYarnTypes)); + } + + } + + private ICollectionView _btsryarntypesViewSource; + /// <summary> + /// Gets or sets the BtsrYarnTypes View Source. + ///</summary> + public ICollectionView BtsrYarnTypesViewSource + { + get + { + return _btsryarntypesViewSource; + } + + set + { + _btsryarntypesViewSource = value; RaisePropertyChanged(nameof(BtsrYarnTypesViewSource)); + } + + } + private ObservableCollection<CartridgeType> _cartridgetypes; /// <summary> /// Gets or sets the CartridgeTypes. @@ -3133,6 +3205,10 @@ namespace Tango.BL BrushStopsViewSource = CreateCollectionView(BrushStops); + BtsrApplicationTypesViewSource = CreateCollectionView(BtsrApplicationTypes); + + BtsrYarnTypesViewSource = CreateCollectionView(BtsrYarnTypes); + CartridgeTypesViewSource = CreateCollectionView(CartridgeTypes); CatsViewSource = CreateCollectionView(Cats); diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs index de6e5f0a1..49679267e 100644 --- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs +++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs @@ -269,6 +269,78 @@ namespace Tango.BL } + private ObservableCollection<BtsrApplicationType> _btsrapplicationtypes; + /// <summary> + /// Gets or sets the BtsrApplicationTypes. + /// </summary> + public ObservableCollection<BtsrApplicationType> BtsrApplicationTypes + { + get + { + return _btsrapplicationtypes; + } + + set + { + _btsrapplicationtypes = value; RaisePropertyChanged(nameof(BtsrApplicationTypes)); + } + + } + + private ICollectionView _btsrapplicationtypesViewSource; + /// <summary> + /// Gets or sets the BtsrApplicationTypes View Source. + ///</summary> + public ICollectionView BtsrApplicationTypesViewSource + { + get + { + return _btsrapplicationtypesViewSource; + } + + set + { + _btsrapplicationtypesViewSource = value; RaisePropertyChanged(nameof(BtsrApplicationTypesViewSource)); + } + + } + + private ObservableCollection<BtsrYarnType> _btsryarntypes; + /// <summary> + /// Gets or sets the BtsrYarnTypes. + /// </summary> + public ObservableCollection<BtsrYarnType> BtsrYarnTypes + { + get + { + return _btsryarntypes; + } + + set + { + _btsryarntypes = value; RaisePropertyChanged(nameof(BtsrYarnTypes)); + } + + } + + private ICollectionView _btsryarntypesViewSource; + /// <summary> + /// Gets or sets the BtsrYarnTypes View Source. + ///</summary> + public ICollectionView BtsrYarnTypesViewSource + { + get + { + return _btsryarntypesViewSource; + } + + set + { + _btsryarntypesViewSource = value; RaisePropertyChanged(nameof(BtsrYarnTypesViewSource)); + } + + } + private ObservableCollection<CartridgeType> _cartridgetypes; /// <summary> /// Gets or sets the CartridgeTypes. @@ -3133,6 +3205,10 @@ namespace Tango.BL BrushStopsViewSource = CreateCollectionView(BrushStops); + BtsrApplicationTypesViewSource = CreateCollectionView(BtsrApplicationTypes); + + BtsrYarnTypesViewSource = CreateCollectionView(BtsrYarnTypes); + CartridgeTypesViewSource = CreateCollectionView(CartridgeTypes); CatsViewSource = CreateCollectionView(Cats); diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index cdbabb469..9f49af596 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -152,6 +152,10 @@ <Compile Include="DTO\ApplicationOsVersionDTOBase.cs" /> <Compile Include="DTO\BrushStopDTO.cs" /> <Compile Include="DTO\BrushStopDTOBase.cs" /> + <Compile Include="DTO\BtsrApplicationTypeDTO.cs" /> + <Compile Include="DTO\BtsrApplicationTypeDTOBase.cs" /> + <Compile Include="DTO\BtsrYarnTypeDTO.cs" /> + <Compile Include="DTO\BtsrYarnTypeDTOBase.cs" /> <Compile Include="DTO\CartridgeTypeDTO.cs" /> <Compile Include="DTO\CartridgeTypeDTOBase.cs" /> <Compile Include="DTO\CatDTO.cs" /> @@ -317,6 +321,10 @@ <Compile Include="Entities\ApplicationFirmwareVersionBase.cs" /> <Compile Include="Entities\ApplicationOsVersionBase.cs" /> <Compile Include="Entities\BrushStopBase.cs" /> + <Compile Include="Entities\BtsrApplicationType.cs" /> + <Compile Include="Entities\BtsrApplicationTypeBase.cs" /> + <Compile Include="Entities\BtsrYarnType.cs" /> + <Compile Include="Entities\BtsrYarnTypeBase.cs" /> <Compile Include="Entities\CartridgeTypeBase.cs" /> <Compile Include="Entities\CatBase.cs" /> <Compile Include="Entities\CctBase.cs" /> @@ -426,6 +434,8 @@ <Compile Include="Entities\UsersRoleBase.cs" /> <Compile Include="Entities\WindingMethodBase.cs" /> <Compile Include="Enumerations\ActionLogType.cs" /> + <Compile Include="Enumerations\BtsrApplicationTypes.cs" /> + <Compile Include="Enumerations\BtsrYarnTypes.cs" /> <Compile Include="Enumerations\CatalogDesignType.cs" /> <Compile Include="Enumerations\ColorCatalogsItems.cs" /> <Compile Include="Enumerations\HeadTypes.cs" /> @@ -658,7 +668,7 @@ </Target> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs new file mode 100644 index 000000000..a4ebc4b0f --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_APPLICATION_TYPES.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class BTSR_APPLICATION_TYPES + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public BTSR_APPLICATION_TYPES() + { + this.RMLS = new HashSet<RML>(); + } + + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public int CODE { get; set; } + public string NAME { get; set; } + public string DESCRIPTION { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection<RML> RMLS { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs new file mode 100644 index 000000000..256af7baf --- /dev/null +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BTSR_YARN_TYPES.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace Tango.DAL.Remote.DB +{ + using System; + using System.Collections.Generic; + + public partial class BTSR_YARN_TYPES + { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public BTSR_YARN_TYPES() + { + this.RMLS = new HashSet<RML>(); + } + + public int ID { get; set; } + public string GUID { get; set; } + public System.DateTime LAST_UPDATED { get; set; } + public int CODE { get; set; } + public string NAME { get; set; } + public string DESCRIPTION { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection<RML> RMLS { get; set; } + } +} diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs index 5896f742e..b4719188c 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs @@ -50,6 +50,9 @@ namespace Tango.DAL.Remote.DB public double L_BLOWER_FLOW { get; set; } public double L_BLOWER_TEMP { get; set; } public double PRESSURE_BUILD_UP { get; set; } + public double BTSR_FEEDING_TENSION { get; set; } + public double BTSR_EXIT_TENSION { get; set; } + public double BTSR_THREAD_LENGTH_OFFSET { get; set; } public virtual PROCESS_PARAMETERS_TABLES_GROUPS PROCESS_PARAMETERS_TABLES_GROUPS { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs index f00189ce7..b5f9cacf3 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs @@ -75,7 +75,11 @@ namespace Tango.DAL.Remote.DB public int CLEANER_FLOW { get; set; } public double ARC_HEAD_CLEANING_MOTOR_SPEED { get; set; } public double V_MAX { get; set; } + public string BTSR_APPLICATION_TYPE_GUID { get; set; } + public string BTSR_YARN_TYPE_GUID { get; set; } + public virtual BTSR_APPLICATION_TYPES BTSR_APPLICATION_TYPES { get; set; } + public virtual BTSR_YARN_TYPES BTSR_YARN_TYPES { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<CAT> CATS { get; set; } public virtual CCT CCT { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_SPOOLS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_SPOOLS.cs index a314530ec..e6f7d52f7 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_SPOOLS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RMLS_SPOOLS.cs @@ -23,6 +23,7 @@ namespace Tango.DAL.Remote.DB public Nullable<double> LENGTH { get; set; } public Nullable<int> BACKING_RATE { get; set; } public Nullable<int> BOTTOM_BACKING_RATE { get; set; } + public Nullable<int> BTSR_SPOOL_TENSION { get; set; } public virtual RML RML { get; set; } public virtual SPOOL_TYPES SPOOL_TYPES { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs index 49b63ad5d..c92b72726 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs @@ -32,6 +32,8 @@ namespace Tango.DAL.Remote.DB public virtual DbSet<APPLICATION_FIRMWARE_VERSIONS> APPLICATION_FIRMWARE_VERSIONS { get; set; } public virtual DbSet<APPLICATION_OS_VERSIONS> APPLICATION_OS_VERSIONS { get; set; } public virtual DbSet<BRUSH_STOPS> BRUSH_STOPS { get; set; } + public virtual DbSet<BTSR_APPLICATION_TYPES> BTSR_APPLICATION_TYPES { get; set; } + public virtual DbSet<BTSR_YARN_TYPES> BTSR_YARN_TYPES { get; set; } public virtual DbSet<CARTRIDGE_TYPES> CARTRIDGE_TYPES { get; set; } public virtual DbSet<CAT> CATS { get; set; } public virtual DbSet<CCT> CCTS { 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 26e142522..a40614cf0 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -110,6 +110,28 @@ <Property Name="COLOR_CATALOGS_ITEM_GUID" Type="varchar" MaxLength="36" /> <Property Name="IS_TRANSPARENT" Type="bit" Nullable="false" /> </EntityType> + <EntityType Name="BTSR_APPLICATION_TYPES"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" /> + <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" /> + <Property Name="CODE" Type="int" Nullable="false" /> + <Property Name="NAME" Type="varchar" MaxLength="100" Nullable="false" /> + <Property Name="DESCRIPTION" Type="varchar" MaxLength="100" Nullable="false" /> + </EntityType> + <EntityType Name="BTSR_YARN_TYPES"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" /> + <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" /> + <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" /> + <Property Name="CODE" Type="int" Nullable="false" /> + <Property Name="NAME" Type="varchar" MaxLength="100" Nullable="false" /> + <Property Name="DESCRIPTION" Type="varchar" MaxLength="100" Nullable="false" /> + </EntityType> <EntityType Name="CARTRIDGE_TYPES"> <Key> <PropertyRef Name="GUID" /> @@ -956,6 +978,9 @@ <Property Name="L_BLOWER_FLOW" Type="float" Nullable="false" /> <Property Name="L_BLOWER_TEMP" Type="float" Nullable="false" /> <Property Name="PRESSURE_BUILD_UP" Type="float" Nullable="false" /> + <Property Name="BTSR_FEEDING_TENSION" Type="float" Nullable="false" /> + <Property Name="BTSR_EXIT_TENSION" Type="float" Nullable="false" /> + <Property Name="BTSR_THREAD_LENGTH_OFFSET" Type="float" Nullable="false" /> </EntityType> <EntityType Name="PROCESS_PARAMETERS_TABLES_GROUPS"> <Key> @@ -1048,6 +1073,8 @@ <Property Name="CLEANER_FLOW" Type="int" Nullable="false" /> <Property Name="ARC_HEAD_CLEANING_MOTOR_SPEED" Type="float" Nullable="false" /> <Property Name="V_MAX" Type="float" Nullable="false" /> + <Property Name="BTSR_APPLICATION_TYPE_GUID" Type="varchar" MaxLength="36" /> + <Property Name="BTSR_YARN_TYPE_GUID" Type="varchar" MaxLength="36" /> </EntityType> <EntityType Name="RMLS_SPOOLS"> <Key> @@ -1062,6 +1089,7 @@ <Property Name="LENGTH" Type="float" /> <Property Name="BACKING_RATE" Type="int" /> <Property Name="BOTTOM_BACKING_RATE" Type="int" /> + <Property Name="BTSR_SPOOL_TENSION" Type="int" /> </EntityType> <EntityType Name="ROLES"> <Key> @@ -1145,6 +1173,7 @@ <Property Name="SEGMENT_OFFSET_PULSES" Type="int" Nullable="false" /> <Property Name="BOTTOM_BACKING_RATE" Type="int" Nullable="false" /> <Property Name="LIMIT_SWITCH_START_POINT_OFFSET" Type="int" Nullable="false" /> + <Property Name="BTSR_SPOOL_TENSION" Type="int" Nullable="false" /> </EntityType> <EntityType Name="SPOOLS"> <Key> @@ -2233,6 +2262,30 @@ </Dependent> </ReferentialConstraint> </Association> + <Association Name="FK_RMLS_BTSR_APPLICATION_TYPES"> + <End Role="BTSR_APPLICATION_TYPES" Type="Self.BTSR_APPLICATION_TYPES" Multiplicity="0..1" /> + <End Role="RMLS" Type="Self.RMLS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="BTSR_APPLICATION_TYPES"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="RMLS"> + <PropertyRef Name="BTSR_APPLICATION_TYPE_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_RMLS_BTSR_YARN_TYPES"> + <End Role="BTSR_YARN_TYPES" Type="Self.BTSR_YARN_TYPES" Multiplicity="0..1" /> + <End Role="RMLS" Type="Self.RMLS" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="BTSR_YARN_TYPES"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="RMLS"> + <PropertyRef Name="BTSR_YARN_TYPE_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> <Association Name="FK_RMLS_CCTS"> <End Role="CCTS" Type="Self.CCTS" Multiplicity="0..1" /> <End Role="RMLS" Type="Self.RMLS" Multiplicity="*" /> @@ -2506,6 +2559,8 @@ <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="Self.APPLICATION_FIRMWARE_VERSIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="APPLICATION_OS_VERSIONS" EntityType="Self.APPLICATION_OS_VERSIONS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="BRUSH_STOPS" EntityType="Self.BRUSH_STOPS" Schema="dbo" store:Type="Tables" /> + <EntitySet Name="BTSR_APPLICATION_TYPES" EntityType="Self.BTSR_APPLICATION_TYPES" Schema="dbo" store:Type="Tables" /> + <EntitySet Name="BTSR_YARN_TYPES" EntityType="Self.BTSR_YARN_TYPES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="CARTRIDGE_TYPES" EntityType="Self.CARTRIDGE_TYPES" Schema="dbo" store:Type="Tables" /> <EntitySet Name="CATS" EntityType="Self.CATS" Schema="dbo" store:Type="Tables" /> <EntitySet Name="CCTS" EntityType="Self.CCTS" Schema="dbo" store:Type="Tables" /> @@ -2862,6 +2917,14 @@ <End Role="MEDIA_PURPOSES" EntitySet="MEDIA_PURPOSES" /> <End Role="RMLS" EntitySet="RMLS" /> </AssociationSet> + <AssociationSet Name="FK_RMLS_BTSR_APPLICATION_TYPES" Association="Self.FK_RMLS_BTSR_APPLICATION_TYPES"> + <End Role="BTSR_APPLICATION_TYPES" EntitySet="BTSR_APPLICATION_TYPES" /> + <End Role="RMLS" EntitySet="RMLS" /> + </AssociationSet> + <AssociationSet Name="FK_RMLS_BTSR_YARN_TYPES" Association="Self.FK_RMLS_BTSR_YARN_TYPES"> + <End Role="BTSR_YARN_TYPES" EntitySet="BTSR_YARN_TYPES" /> + <End Role="RMLS" EntitySet="RMLS" /> + </AssociationSet> <AssociationSet Name="FK_RMLS_CCTS" Association="Self.FK_RMLS_CCTS"> <End Role="CCTS" EntitySet="CCTS" /> <End Role="RMLS" EntitySet="RMLS" /> @@ -2955,6 +3018,8 @@ <EntitySet Name="APPLICATION_FIRMWARE_VERSIONS" EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" /> <EntitySet Name="APPLICATION_OS_VERSIONS" EntityType="RemoteModel.APPLICATION_OS_VERSIONS" /> <EntitySet Name="BRUSH_STOPS" EntityType="RemoteModel.BRUSH_STOPS" /> + <EntitySet Name="BTSR_APPLICATION_TYPES" EntityType="RemoteModel.BTSR_APPLICATION_TYPES" /> + <EntitySet Name="BTSR_YARN_TYPES" EntityType="RemoteModel.BTSR_YARN_TYPES" /> <EntitySet Name="CARTRIDGE_TYPES" EntityType="RemoteModel.CARTRIDGE_TYPES" /> <EntitySet Name="CATS" EntityType="RemoteModel.CAT" /> <EntitySet Name="CCTS" EntityType="RemoteModel.CCT" /> @@ -3074,6 +3139,14 @@ <End Role="SEGMENT" EntitySet="SEGMENTS" /> <End Role="BRUSH_STOPS" EntitySet="BRUSH_STOPS" /> </AssociationSet> + <AssociationSet Name="FK_RMLS_BTSR_APPLICATION_TYPES" Association="RemoteModel.FK_RMLS_BTSR_APPLICATION_TYPES"> + <End Role="BTSR_APPLICATION_TYPES" EntitySet="BTSR_APPLICATION_TYPES" /> + <End Role="RML" EntitySet="RMLS" /> + </AssociationSet> + <AssociationSet Name="FK_RMLS_BTSR_YARN_TYPES" Association="RemoteModel.FK_RMLS_BTSR_YARN_TYPES"> + <End Role="BTSR_YARN_TYPES" EntitySet="BTSR_YARN_TYPES" /> + <End Role="RML" EntitySet="RMLS" /> + </AssociationSet> <AssociationSet Name="FK_IDS_PACKS_CARTRIDGE_TYPES" Association="RemoteModel.FK_IDS_PACKS_CARTRIDGE_TYPES"> <End Role="CARTRIDGE_TYPES" EntitySet="CARTRIDGE_TYPES" /> <End Role="IDS_PACKS" EntitySet="IDS_PACKS" /> @@ -3514,6 +3587,30 @@ <NavigationProperty Name="COLOR_SPACES" Relationship="RemoteModel.FK_BRUSH_STOPS_COLOR_SPACES" FromRole="BRUSH_STOPS" ToRole="COLOR_SPACES" /> <NavigationProperty Name="SEGMENT" Relationship="RemoteModel.FK_BRUSH_STOPS_SEGMENTS" FromRole="BRUSH_STOPS" ToRole="SEGMENT" /> </EntityType> + <EntityType Name="BTSR_APPLICATION_TYPES"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> + <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> + <Property Name="CODE" Type="Int32" Nullable="false" /> + <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" /> + <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" /> + <NavigationProperty Name="RMLS" Relationship="RemoteModel.FK_RMLS_BTSR_APPLICATION_TYPES" FromRole="BTSR_APPLICATION_TYPES" ToRole="RML" /> + </EntityType> + <EntityType Name="BTSR_YARN_TYPES"> + <Key> + <PropertyRef Name="GUID" /> + </Key> + <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> + <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" /> + <Property Name="CODE" Type="Int32" Nullable="false" /> + <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" /> + <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="false" /> + <NavigationProperty Name="RMLS" Relationship="RemoteModel.FK_RMLS_BTSR_YARN_TYPES" FromRole="BTSR_YARN_TYPES" ToRole="RML" /> + </EntityType> <EntityType Name="CARTRIDGE_TYPES"> <Key> <PropertyRef Name="GUID" /> @@ -4474,6 +4571,9 @@ <Property Name="L_BLOWER_FLOW" Type="Double" Nullable="false" /> <Property Name="L_BLOWER_TEMP" Type="Double" Nullable="false" /> <Property Name="PRESSURE_BUILD_UP" Type="Double" Nullable="false" /> + <Property Name="BTSR_FEEDING_TENSION" Type="Double" Nullable="false" /> + <Property Name="BTSR_EXIT_TENSION" Type="Double" Nullable="false" /> + <Property Name="BTSR_THREAD_LENGTH_OFFSET" Type="Double" Nullable="false" /> <NavigationProperty Name="PROCESS_PARAMETERS_TABLES_GROUPS" Relationship="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_PROCESS_PARAMETERS_TABLES_GROUPS" FromRole="PROCESS_PARAMETERS_TABLES" ToRole="PROCESS_PARAMETERS_TABLES_GROUPS" /> </EntityType> <EntityType Name="PROCESS_PARAMETERS_TABLES_GROUPS"> @@ -4571,6 +4671,10 @@ <Property Name="CLEANER_FLOW" Type="Int32" Nullable="false" /> <Property Name="ARC_HEAD_CLEANING_MOTOR_SPEED" Type="Double" Nullable="false" /> <Property Name="V_MAX" Type="Double" Nullable="false" /> + <Property Name="BTSR_APPLICATION_TYPE_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" /> + <Property Name="BTSR_YARN_TYPE_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" /> + <NavigationProperty Name="BTSR_APPLICATION_TYPES" Relationship="RemoteModel.FK_RMLS_BTSR_APPLICATION_TYPES" FromRole="RML" ToRole="BTSR_APPLICATION_TYPES" /> + <NavigationProperty Name="BTSR_YARN_TYPES" Relationship="RemoteModel.FK_RMLS_BTSR_YARN_TYPES" FromRole="RML" ToRole="BTSR_YARN_TYPES" /> <NavigationProperty Name="CATS" Relationship="RemoteModel.FK_CATS_RMLS" FromRole="RML" ToRole="CAT" /> <NavigationProperty Name="CCT" Relationship="RemoteModel.FK_RMLS_CCTS" FromRole="RML" ToRole="CCT" /> <NavigationProperty Name="COLOR_CATALOGS_ITEMS_RECIPES" Relationship="RemoteModel.FK_COLOR_CATALOGS_ITEMS_RECIPES_RMLS" FromRole="RML" ToRole="COLOR_CATALOGS_ITEMS_RECIPES" /> @@ -4599,6 +4703,7 @@ <Property Name="LENGTH" Type="Double" /> <Property Name="BACKING_RATE" Type="Int32" /> <Property Name="BOTTOM_BACKING_RATE" Type="Int32" /> + <Property Name="BTSR_SPOOL_TENSION" Type="Int32" /> <NavigationProperty Name="RML" Relationship="RemoteModel.FK_RMLS_SPOOLS_RMLS" FromRole="RMLS_SPOOLS" ToRole="RML" /> <NavigationProperty Name="SPOOL_TYPES" Relationship="RemoteModel.FK_RMLS_SPOOLS_SPOOL_TYPES" FromRole="RMLS_SPOOLS" ToRole="SPOOL_TYPES" /> </EntityType> @@ -4697,6 +4802,7 @@ <Property Name="SEGMENT_OFFSET_PULSES" Type="Int32" Nullable="false" /> <Property Name="BOTTOM_BACKING_RATE" Type="Int32" Nullable="false" /> <Property Name="LIMIT_SWITCH_START_POINT_OFFSET" Type="Int32" Nullable="false" /> + <Property Name="BTSR_SPOOL_TENSION" Type="Int32" Nullable="false" /> <NavigationProperty Name="JOBS" Relationship="RemoteModel.FK_JOBS_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="JOB" /> <NavigationProperty Name="RMLS_SPOOLS" Relationship="RemoteModel.FK_RMLS_SPOOLS_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="RMLS_SPOOLS" /> <NavigationProperty Name="SPOOLS" Relationship="RemoteModel.FK_SPOOLS_SPOOL_TYPES" FromRole="SPOOL_TYPES" ToRole="SPOOL" /> @@ -5023,6 +5129,30 @@ </Dependent> </ReferentialConstraint> </Association> + <Association Name="FK_RMLS_BTSR_APPLICATION_TYPES"> + <End Type="RemoteModel.BTSR_APPLICATION_TYPES" Role="BTSR_APPLICATION_TYPES" Multiplicity="0..1" /> + <End Type="RemoteModel.RML" Role="RML" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="BTSR_APPLICATION_TYPES"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="RML"> + <PropertyRef Name="BTSR_APPLICATION_TYPE_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> + <Association Name="FK_RMLS_BTSR_YARN_TYPES"> + <End Type="RemoteModel.BTSR_YARN_TYPES" Role="BTSR_YARN_TYPES" Multiplicity="0..1" /> + <End Type="RemoteModel.RML" Role="RML" Multiplicity="*" /> + <ReferentialConstraint> + <Principal Role="BTSR_YARN_TYPES"> + <PropertyRef Name="GUID" /> + </Principal> + <Dependent Role="RML"> + <PropertyRef Name="BTSR_YARN_TYPE_GUID" /> + </Dependent> + </ReferentialConstraint> + </Association> <Association Name="FK_IDS_PACKS_CARTRIDGE_TYPES"> <End Type="RemoteModel.CARTRIDGE_TYPES" Role="CARTRIDGE_TYPES" Multiplicity="0..1" /> <End Type="RemoteModel.IDS_PACKS" Role="IDS_PACKS" Multiplicity="*" /> @@ -6189,6 +6319,30 @@ </MappingFragment> </EntityTypeMapping> </EntitySetMapping> + <EntitySetMapping Name="BTSR_APPLICATION_TYPES"> + <EntityTypeMapping TypeName="RemoteModel.BTSR_APPLICATION_TYPES"> + <MappingFragment StoreEntitySet="BTSR_APPLICATION_TYPES"> + <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" /> + <ScalarProperty Name="NAME" ColumnName="NAME" /> + <ScalarProperty Name="CODE" ColumnName="CODE" /> + <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> + <ScalarProperty Name="GUID" ColumnName="GUID" /> + <ScalarProperty Name="ID" ColumnName="ID" /> + </MappingFragment> + </EntityTypeMapping> + </EntitySetMapping> + <EntitySetMapping Name="BTSR_YARN_TYPES"> + <EntityTypeMapping TypeName="RemoteModel.BTSR_YARN_TYPES"> + <MappingFragment StoreEntitySet="BTSR_YARN_TYPES"> + <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" /> + <ScalarProperty Name="NAME" ColumnName="NAME" /> + <ScalarProperty Name="CODE" ColumnName="CODE" /> + <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" /> + <ScalarProperty Name="GUID" ColumnName="GUID" /> + <ScalarProperty Name="ID" ColumnName="ID" /> + </MappingFragment> + </EntityTypeMapping> + </EntitySetMapping> <EntitySetMapping Name="CARTRIDGE_TYPES"> <EntityTypeMapping TypeName="RemoteModel.CARTRIDGE_TYPES"> <MappingFragment StoreEntitySet="CARTRIDGE_TYPES"> @@ -7051,6 +7205,9 @@ <EntitySetMapping Name="PROCESS_PARAMETERS_TABLES"> <EntityTypeMapping TypeName="RemoteModel.PROCESS_PARAMETERS_TABLES"> <MappingFragment StoreEntitySet="PROCESS_PARAMETERS_TABLES"> + <ScalarProperty Name="BTSR_THREAD_LENGTH_OFFSET" ColumnName="BTSR_THREAD_LENGTH_OFFSET" /> + <ScalarProperty Name="BTSR_EXIT_TENSION" ColumnName="BTSR_EXIT_TENSION" /> + <ScalarProperty Name="BTSR_FEEDING_TENSION" ColumnName="BTSR_FEEDING_TENSION" /> <ScalarProperty Name="PRESSURE_BUILD_UP" ColumnName="PRESSURE_BUILD_UP" /> <ScalarProperty Name="L_BLOWER_TEMP" ColumnName="L_BLOWER_TEMP" /> <ScalarProperty Name="L_BLOWER_FLOW" ColumnName="L_BLOWER_FLOW" /> @@ -7134,6 +7291,8 @@ <EntitySetMapping Name="RMLS"> <EntityTypeMapping TypeName="RemoteModel.RML"> <MappingFragment StoreEntitySet="RMLS"> + <ScalarProperty Name="BTSR_YARN_TYPE_GUID" ColumnName="BTSR_YARN_TYPE_GUID" /> + <ScalarProperty Name="BTSR_APPLICATION_TYPE_GUID" ColumnName="BTSR_APPLICATION_TYPE_GUID" /> <ScalarProperty Name="V_MAX" ColumnName="V_MAX" /> <ScalarProperty Name="ARC_HEAD_CLEANING_MOTOR_SPEED" ColumnName="ARC_HEAD_CLEANING_MOTOR_SPEED" /> <ScalarProperty Name="CLEANER_FLOW" ColumnName="CLEANER_FLOW" /> @@ -7189,6 +7348,7 @@ <EntitySetMapping Name="RMLS_SPOOLS"> <EntityTypeMapping TypeName="RemoteModel.RMLS_SPOOLS"> <MappingFragment StoreEntitySet="RMLS_SPOOLS"> + <ScalarProperty Name="BTSR_SPOOL_TENSION" ColumnName="BTSR_SPOOL_TENSION" /> <ScalarProperty Name="BOTTOM_BACKING_RATE" ColumnName="BOTTOM_BACKING_RATE" /> <ScalarProperty Name="BACKING_RATE" ColumnName="BACKING_RATE" /> <ScalarProperty Name="LENGTH" ColumnName="LENGTH" /> @@ -7274,6 +7434,7 @@ <EntitySetMapping Name="SPOOL_TYPES"> <EntityTypeMapping TypeName="RemoteModel.SPOOL_TYPES"> <MappingFragment StoreEntitySet="SPOOL_TYPES"> + <ScalarProperty Name="BTSR_SPOOL_TENSION" ColumnName="BTSR_SPOOL_TENSION" /> <ScalarProperty Name="LIMIT_SWITCH_START_POINT_OFFSET" ColumnName="LIMIT_SWITCH_START_POINT_OFFSET" /> <ScalarProperty Name="BOTTOM_BACKING_RATE" ColumnName="BOTTOM_BACKING_RATE" /> <ScalarProperty Name="SEGMENT_OFFSET_PULSES" ColumnName="SEGMENT_OFFSET_PULSES" /> 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 ef97ba374..41e56d6d9 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,91 +5,93 @@ <!-- 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="13" /> - <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="56.375" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="78.875" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="75.875" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="84.75" /> - <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="17.75" /> - <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="9" PointY="44.5" /> - <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="21" /> - <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="30.75" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="2.875" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="9.375" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="8.125" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="17" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="12.75" /> - <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="70.25" /> - <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="60.5" /> - <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="9.25" /> - <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="57.375" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="6.75" PointY="80.625" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="9" PointY="80" /> - <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="81.75" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="85.25" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="24.875" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="17" /> - <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="9.375" /> - <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="3.75" PointY="2" /> - <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="71.875" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="92.25" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="3.75" PointY="71" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="7.5" PointY="76.25" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="9.75" PointY="69.125" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="4.5" PointY="75.125" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="6.75" PointY="61.875" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="1.5" PointY="88.25" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="3.75" PointY="63.25" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="7.5" PointY="58.25" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="9.75" PointY="61" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="64.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="7.5" PointY="54.25" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="9.75" PointY="65" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="9" PointY="47.375" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="11.25" PointY="40.875" /> - <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="13.75" PointY="6" /> - <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="17.625" /> - <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="27.75" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="11.75" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="17.25" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="5.75" PointY="2" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="33.625" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="45.375" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="45.875" /> - <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="28.625" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="21.5" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="14" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="34" /> - <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="9" PointY="50.75" /> - <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="39.375" /> - <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="9" PointY="94.625" /> - <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="29.625" /> - <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="32.375" /> - <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="13.75" PointY="2.25" /> - <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="16" PointY="2.375" /> - <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="16" /> - <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="25" /> - <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="9" PointY="90.625" /> - <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="11.25" PointY="90.625" /> - <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="21.25" /> - <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="6" PointY="8.25" /> - <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="11.25" PointY="0.75" /> - <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="8.25" PointY="21.5" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="39.125" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="46.625" /> - <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="5.75" PointY="5" /> - <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="15.75" PointY="6" /> - <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="28.875" /> - <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="15.75" PointY="11" /> - <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="17.75" PointY="6" /> - <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="17.75" PointY="9" /> - <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="17.75" PointY="12" /> - <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="17.75" PointY="17" /> - <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="18.75" PointY="2" /> - <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="3.375" /> - <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="11.25" PointY="4.625" /> - <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="26.125" /> + <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="10.625" /> + <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="42" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="4.5" PointY="71.375" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="68.5" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="4.5" PointY="62.625" /> + <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="18.875" /> + <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="15" /> + <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="31.875" /> + <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="9.75" PointY="87" /> + <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="26.25" /> + <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="37.875" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="53" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="47.5" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="46.25" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="22.125" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="40.625" /> + <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6.75" PointY="64" /> + <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="1.125" /> + <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="15.125" /> + <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="11.25" PointY="74.375" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="7.5" PointY="90.5" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="9.75" PointY="90" /> + <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="65.625" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="95.125" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="22.625" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="29" /> + <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="15.125" /> + <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="5.75" PointY="2.75" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="10.5" PointY="79" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="12.75" PointY="58.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="43" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="58.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.5" PointY="83" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="11.75" PointY="62.875" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="12.5" PointY="68.875" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="14.75" PointY="62.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="7.5" PointY="37" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="9.75" PointY="55" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="10.5" PointY="47" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="12.75" PointY="54.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="58.375" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="7.5" PointY="45" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="9.75" PointY="50.75" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="9.75" PointY="30.5" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="12" PointY="38.875" /> + <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="13.75" PointY="5.75" /> + <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="18.75" /> + <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="12" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="13.875" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="18.375" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="5.75" PointY="6.75" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="6.375" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6.75" PointY="74.375" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="9" PointY="62.875" /> + <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="34.5" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="35" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="26" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="18.125" /> + <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="9.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="5.125" /> + <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="10" PointY="105" /> + <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="48.875" /> + <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="51.875" /> + <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="2.75" PointY="9.875" /> + <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="5" PointY="10.125" /> + <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="16.75" /> + <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="22.125" /> + <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="10" PointY="101" /> + <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="12.25" PointY="101" /> + <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="22.375" /> + <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="5.375" /> + <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="30.75" /> + <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="18.625" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="9.875" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="14.25" PointY="38.5" /> + <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="13.75" /> + <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="13.75" PointY="14.75" /> + <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="42.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="15.75" PointY="2.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="15.75" PointY="6.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="15.75" PointY="9.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="15.75" PointY="12.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="17.75" PointY="2.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="17.75" PointY="7.75" /> + <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="4.125" /> + <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="12.25" PointY="2.5" /> + <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="26.25" /> <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" /> <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" /> <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" /> @@ -100,6 +102,8 @@ <AssociationConnector Association="RemoteModel.FK_BRUSH_STOPS_COLOR_CATALOGS_ITEMS" /> <AssociationConnector Association="RemoteModel.FK_BRUSH_STOPS_COLOR_SPACES" /> <AssociationConnector Association="RemoteModel.FK_BRUSH_STOPS_SEGMENTS" /> + <AssociationConnector Association="RemoteModel.FK_RMLS_BTSR_APPLICATION_TYPES" /> + <AssociationConnector Association="RemoteModel.FK_RMLS_BTSR_YARN_TYPES" /> <AssociationConnector Association="RemoteModel.FK_IDS_PACKS_CARTRIDGE_TYPES" /> <AssociationConnector Association="RemoteModel.FK_CATS_LIQUID_TYPES1" /> <AssociationConnector Association="RemoteModel.FK_CATS_MACHINES" /> diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs index af2355553..836112ec7 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SPOOL_TYPES.cs @@ -36,6 +36,7 @@ namespace Tango.DAL.Remote.DB public int SEGMENT_OFFSET_PULSES { get; set; } public int BOTTOM_BACKING_RATE { get; set; } public int LIMIT_SWITCH_START_POINT_OFFSET { get; set; } + public int BTSR_SPOOL_TENSION { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection<JOB> JOBS { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj index bdb0b7715..6cf0f995c 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -84,6 +84,12 @@ <Compile Include="DB\BRUSH_STOPS.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> + <Compile Include="DB\BTSR_APPLICATION_TYPES.cs"> + <DependentUpon>RemoteADO.tt</DependentUpon> + </Compile> + <Compile Include="DB\BTSR_YARN_TYPES.cs"> + <DependentUpon>RemoteADO.tt</DependentUpon> + </Compile> <Compile Include="DB\CARTRIDGE_TYPES.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> </Compile> @@ -389,7 +395,7 @@ </Target> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.PMR/BTSR/BtsrApplicationType.cs b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrApplicationType.cs new file mode 100644 index 000000000..c7d6c2616 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrApplicationType.cs @@ -0,0 +1,65 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: BtsrApplicationType.proto +#pragma warning disable 1591, 0612, 3021 +#region Designer generated code + +using pb = global::Google.Protobuf; +using pbc = global::Google.Protobuf.Collections; +using pbr = global::Google.Protobuf.Reflection; +using scg = global::System.Collections.Generic; +namespace Tango.PMR.BTSR { + + /// <summary>Holder for reflection information generated from BtsrApplicationType.proto</summary> + public static partial class BtsrApplicationTypeReflection { + + #region Descriptor + /// <summary>File descriptor for BtsrApplicationType.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static BtsrApplicationTypeReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChlCdHNyQXBwbGljYXRpb25UeXBlLnByb3RvEg5UYW5nby5QTVIuQlRTUiqO", + "AgoTQnRzckFwcGxpY2F0aW9uVHlwZRIZChVVTkRFRklORURfQVBQTElDQVRJ", + "T04QABIJCgVTT0NLUxABEhEKDVJFVkVSU0VfU09DS1MQAhIRCg1NRURJQ0FM", + "X1NPQ0tTEAMSDQoJUEFOVFlIT1NFEAQSDAoIU0VBTUxFU1MQBRIICgRLTklU", + "EAYSEAoMUkVWRVJTRV9LTklUEAcSCwoHUkFTQ0hFTBAIEgoKBlNFV0lORxAJ", + "Eg0KCUZMQVRfS05JVBAKEg4KClNNQUxMX0xPT00QCxIJCgVTSE9FUxAMEg4K", + "CkZMQVRfU0hPRVMQERIJCgVJTkxBWRASEggKBFdBUlAQHhIKCgZSRVdJTkQQ", + "H0IaChhjb20udHdpbmUudGFuZ28ucG1yLmJ0c3JiBnByb3RvMw==")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.BTSR.BtsrApplicationType), }, null)); + } + #endregion + + } + #region Enums + public enum BtsrApplicationType { + [pbr::OriginalName("UNDEFINED_APPLICATION")] UndefinedApplication = 0, + [pbr::OriginalName("SOCKS")] Socks = 1, + [pbr::OriginalName("REVERSE_SOCKS")] ReverseSocks = 2, + [pbr::OriginalName("MEDICAL_SOCKS")] MedicalSocks = 3, + [pbr::OriginalName("PANTYHOSE")] Pantyhose = 4, + [pbr::OriginalName("SEAMLESS")] Seamless = 5, + [pbr::OriginalName("KNIT")] Knit = 6, + [pbr::OriginalName("REVERSE_KNIT")] ReverseKnit = 7, + [pbr::OriginalName("RASCHEL")] Raschel = 8, + [pbr::OriginalName("SEWING")] Sewing = 9, + [pbr::OriginalName("FLAT_KNIT")] FlatKnit = 10, + [pbr::OriginalName("SMALL_LOOM")] SmallLoom = 11, + [pbr::OriginalName("SHOES")] Shoes = 12, + [pbr::OriginalName("FLAT_SHOES")] FlatShoes = 17, + [pbr::OriginalName("INLAY")] Inlay = 18, + [pbr::OriginalName("WARP")] Warp = 30, + [pbr::OriginalName("REWIND")] Rewind = 31, + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/BTSR/BtsrParameters.cs b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrParameters.cs new file mode 100644 index 000000000..964e490d0 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrParameters.cs @@ -0,0 +1,219 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: BtsrParameters.proto +#pragma warning disable 1591, 0612, 3021 +#region Designer generated code + +using pb = global::Google.Protobuf; +using pbc = global::Google.Protobuf.Collections; +using pbr = global::Google.Protobuf.Reflection; +using scg = global::System.Collections.Generic; +namespace Tango.PMR.BTSR { + + /// <summary>Holder for reflection information generated from BtsrParameters.proto</summary> + public static partial class BtsrParametersReflection { + + #region Descriptor + /// <summary>File descriptor for BtsrParameters.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static BtsrParametersReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChRCdHNyUGFyYW1ldGVycy5wcm90bxIOVGFuZ28uUE1SLkJUU1IaGUJ0c3JB", + "cHBsaWNhdGlvblR5cGUucHJvdG8aEkJ0c3JZYXJuVHlwZS5wcm90byKcAQoO", + "QnRzclBhcmFtZXRlcnMSQAoTQnRzckFwcGxpY2F0aW9uVHlwZRgBIAEoDjIj", + "LlRhbmdvLlBNUi5CVFNSLkJ0c3JBcHBsaWNhdGlvblR5cGUSMgoMQnRzcllh", + "cm5UeXBlGAIgASgOMhwuVGFuZ28uUE1SLkJUU1IuQnRzcllhcm5UeXBlEhQK", + "DFRlbnNpb25FcnJvchgDIAEoAkIaChhjb20udHdpbmUudGFuZ28ucG1yLmJ0", + "c3JiBnByb3RvMw==")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { global::Tango.PMR.BTSR.BtsrApplicationTypeReflection.Descriptor, global::Tango.PMR.BTSR.BtsrYarnTypeReflection.Descriptor, }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.BTSR.BtsrParameters), global::Tango.PMR.BTSR.BtsrParameters.Parser, new[]{ "BtsrApplicationType", "BtsrYarnType", "TensionError" }, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class BtsrParameters : pb::IMessage<BtsrParameters> { + private static readonly pb::MessageParser<BtsrParameters> _parser = new pb::MessageParser<BtsrParameters>(() => new BtsrParameters()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser<BtsrParameters> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.BTSR.BtsrParametersReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public BtsrParameters() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public BtsrParameters(BtsrParameters other) : this() { + btsrApplicationType_ = other.btsrApplicationType_; + btsrYarnType_ = other.btsrYarnType_; + tensionError_ = other.tensionError_; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public BtsrParameters Clone() { + return new BtsrParameters(this); + } + + /// <summary>Field number for the "BtsrApplicationType" field.</summary> + public const int BtsrApplicationTypeFieldNumber = 1; + private global::Tango.PMR.BTSR.BtsrApplicationType btsrApplicationType_ = 0; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Tango.PMR.BTSR.BtsrApplicationType BtsrApplicationType { + get { return btsrApplicationType_; } + set { + btsrApplicationType_ = value; + } + } + + /// <summary>Field number for the "BtsrYarnType" field.</summary> + public const int BtsrYarnTypeFieldNumber = 2; + private global::Tango.PMR.BTSR.BtsrYarnType btsrYarnType_ = 0; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Tango.PMR.BTSR.BtsrYarnType BtsrYarnType { + get { return btsrYarnType_; } + set { + btsrYarnType_ = value; + } + } + + /// <summary>Field number for the "TensionError" field.</summary> + public const int TensionErrorFieldNumber = 3; + private float tensionError_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public float TensionError { + get { return tensionError_; } + set { + tensionError_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as BtsrParameters); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(BtsrParameters other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (BtsrApplicationType != other.BtsrApplicationType) return false; + if (BtsrYarnType != other.BtsrYarnType) return false; + if (TensionError != other.TensionError) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (BtsrApplicationType != 0) hash ^= BtsrApplicationType.GetHashCode(); + if (BtsrYarnType != 0) hash ^= BtsrYarnType.GetHashCode(); + if (TensionError != 0F) hash ^= TensionError.GetHashCode(); + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + if (BtsrApplicationType != 0) { + output.WriteRawTag(8); + output.WriteEnum((int) BtsrApplicationType); + } + if (BtsrYarnType != 0) { + output.WriteRawTag(16); + output.WriteEnum((int) BtsrYarnType); + } + if (TensionError != 0F) { + output.WriteRawTag(29); + output.WriteFloat(TensionError); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (BtsrApplicationType != 0) { + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) BtsrApplicationType); + } + if (BtsrYarnType != 0) { + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) BtsrYarnType); + } + if (TensionError != 0F) { + size += 1 + 4; + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(BtsrParameters other) { + if (other == null) { + return; + } + if (other.BtsrApplicationType != 0) { + BtsrApplicationType = other.BtsrApplicationType; + } + if (other.BtsrYarnType != 0) { + BtsrYarnType = other.BtsrYarnType; + } + if (other.TensionError != 0F) { + TensionError = other.TensionError; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + input.SkipLastField(); + break; + case 8: { + btsrApplicationType_ = (global::Tango.PMR.BTSR.BtsrApplicationType) input.ReadEnum(); + break; + } + case 16: { + btsrYarnType_ = (global::Tango.PMR.BTSR.BtsrYarnType) input.ReadEnum(); + break; + } + case 29: { + TensionError = input.ReadFloat(); + break; + } + } + } + } + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/BTSR/BtsrYarnType.cs b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrYarnType.cs new file mode 100644 index 000000000..995922a22 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/BTSR/BtsrYarnType.cs @@ -0,0 +1,52 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: BtsrYarnType.proto +#pragma warning disable 1591, 0612, 3021 +#region Designer generated code + +using pb = global::Google.Protobuf; +using pbc = global::Google.Protobuf.Collections; +using pbr = global::Google.Protobuf.Reflection; +using scg = global::System.Collections.Generic; +namespace Tango.PMR.BTSR { + + /// <summary>Holder for reflection information generated from BtsrYarnType.proto</summary> + public static partial class BtsrYarnTypeReflection { + + #region Descriptor + /// <summary>File descriptor for BtsrYarnType.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static BtsrYarnTypeReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChJCdHNyWWFyblR5cGUucHJvdG8SDlRhbmdvLlBNUi5CVFNSKn8KDEJ0c3JZ", + "YXJuVHlwZRISCg5VTkRFRklORURfWUFSThAAEg0KCUVMQVNUSUNfMRABEg4K", + "CkFMTF9ZQVJOXzEQAhIOCgpBTExfWUFSTl8yEAMSDgoKQUxMX1lBUk5fMxAE", + "Eg0KCUVMQVNUSUNfMhAFEg0KCUVMQVNUSUNfMxAGQhoKGGNvbS50d2luZS50", + "YW5nby5wbXIuYnRzcmIGcHJvdG8z")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.BTSR.BtsrYarnType), }, null)); + } + #endregion + + } + #region Enums + public enum BtsrYarnType { + [pbr::OriginalName("UNDEFINED_YARN")] UndefinedYarn = 0, + [pbr::OriginalName("ELASTIC_1")] Elastic1 = 1, + [pbr::OriginalName("ALL_YARN_1")] AllYarn1 = 2, + [pbr::OriginalName("ALL_YARN_2")] AllYarn2 = 3, + [pbr::OriginalName("ALL_YARN_3")] AllYarn3 = 4, + [pbr::OriginalName("ELASTIC_2")] Elastic2 = 5, + [pbr::OriginalName("ELASTIC_3")] Elastic3 = 6, + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs index d69fb761b..1af8dad60 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs @@ -1242,67 +1242,67 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("MIXER_CURRENT_LOOP_BREAK")] MixerCurrentLoopBreak = 6005, /// <summary> - ///Overpressure in @ dispenser . Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser . Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_1_OVERPRESSURE")] Dispenser1Overpressure = 7000, /// <summary> - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_2_OVERPRESSURE")] Dispenser2Overpressure = 7001, /// <summary> - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_3_OVERPRESSURE")] Dispenser3Overpressure = 7002, /// <summary> - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_4_OVERPRESSURE")] Dispenser4Overpressure = 7003, /// <summary> - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_5_OVERPRESSURE")] Dispenser5Overpressure = 7004, /// <summary> - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_6_OVERPRESSURE")] Dispenser6Overpressure = 7005, /// <summary> - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_7_OVERPRESSURE")] Dispenser7Overpressure = 7006, /// <summary> - ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_8_OVERPRESSURE")] Dispenser8Overpressure = 7007, /// <summary> - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_1_UNDERPRESSURE")] Dispenser1Underpressure = 7008, /// <summary> - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_2_UNDERPRESSURE")] Dispenser2Underpressure = 7009, /// <summary> - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_3_UNDERPRESSURE")] Dispenser3Underpressure = 7010, /// <summary> - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_4_UNDERPRESSURE")] Dispenser4Underpressure = 7011, /// <summary> - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_5_UNDERPRESSURE")] Dispenser5Underpressure = 7012, /// <summary> - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_6_UNDERPRESSURE")] Dispenser6Underpressure = 7013, /// <summary> - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_7_UNDERPRESSURE")] Dispenser7Underpressure = 7014, /// <summary> - ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in the @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_8_UNDERPRESSURE")] Dispenser8Underpressure = 7015, /// <summary> @@ -1562,227 +1562,227 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("DISPENSER_8_LOWER_HARD_LIMIT")] Dispenser8LowerHardLimit = 7079, /// <summary> - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_1_HIGH_PRESSURE")] Dispenser1HighPressure = 7080, /// <summary> - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_2_HIGH_PRESSURE")] Dispenser2HighPressure = 7081, /// <summary> - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_3_HIGH_PRESSURE")] Dispenser3HighPressure = 7082, /// <summary> - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_4_HIGH_PRESSURE")] Dispenser4HighPressure = 7083, /// <summary> - ///Pressure in @ dispenser is too high. Cannot execue job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execue job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_5_HIGH_PRESSURE")] Dispenser5HighPressure = 7084, /// <summary> - ///Pressure in@ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_6_HIGH_PRESSURE")] Dispenser6HighPressure = 7085, /// <summary> - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_7_HIGH_PRESSURE")] Dispenser7HighPressure = 7086, /// <summary> - ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_8_HIGH_PRESSURE")] Dispenser8HighPressure = 7087, /// <summary> - ///Overpressure in @. Cannot execute job (Group = Dispensers, Category = Error) + ///Overpressure in @ module. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_9_OVERPRESSURE")] Dispenser9Overpressure = 7088, /// <summary> - ///Pressure in @ is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ module is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_9_UNDERPRESSURE")] Dispenser9Underpressure = 7089, /// <summary> - ///Overpressure in @. Cannot execute job (Group = Dispensers, Category = Error) + ///Overpressure in @ module. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_10_OVERPRESSURE")] Dispenser10Overpressure = 7090, /// <summary> - ///Pressure in @ is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ module is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_10_UNDERPRESSURE")] Dispenser10Underpressure = 7091, /// <summary> - ///Malfunction in @ motor 1. Cannot execute job (Group = Dispensers, Category = Error) + ///Malfunction in @ module motor 1. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_9_MOTOR_1_MALFUNCTION")] Dispenser9Motor1Malfunction = 7092, /// <summary> - ///Malfunction in @ motor 2. Cannot execute job (Group = Dispensers, Category = Error) + ///Malfunction in @ module motor 2. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_9_MOTOR_2_MALFUNCTION")] Dispenser9Motor2Malfunction = 7093, /// <summary> - ///Malfunction in @ motor 1. Cannot execute job (Group = Dispensers, Category = Error) + ///Malfunction in @ module motor 1. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_10_MOTOR_1_MALFUNCTION")] Dispenser10Motor1Malfunction = 7094, /// <summary> - ///Malfunction in @ motor 2. Cannot execute job (Group = Dispensers, Category = Error) + ///Malfunction in @ module motor 2. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_10_MOTOR_2_MALFUNCTION")] Dispenser10Motor2Malfunction = 7095, /// <summary> - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_1_LOW_LEVEL")] MidTank1LowLevel = 8000, /// <summary> - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_2_LOW_LEVEL")] MidTank2LowLevel = 8001, /// <summary> - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_3_LOW_LEVEL")] MidTank3LowLevel = 8002, /// <summary> - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_4_LOW_LEVEL")] MidTank4LowLevel = 8003, /// <summary> - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_5_LOW_LEVEL")] MidTank5LowLevel = 8004, /// <summary> - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_6_LOW_LEVEL")] MidTank6LowLevel = 8005, /// <summary> - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_7_LOW_LEVEL")] MidTank7LowLevel = 8006, /// <summary> - ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_8_LOW_LEVEL")] MidTank8LowLevel = 8007, /// <summary> - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_1_EMPTY")] MidTank1Empty = 8008, /// <summary> - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_2_EMPTY")] MidTank2Empty = 8009, /// <summary> - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_3_EMPTY")] MidTank3Empty = 8010, /// <summary> - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_4_EMPTY")] MidTank4Empty = 8011, /// <summary> - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_5_EMPTY")] MidTank5Empty = 8012, /// <summary> - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_6_EMPTY")] MidTank6Empty = 8013, /// <summary> - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_7_EMPTY")] MidTank7Empty = 8014, /// <summary> - ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_8_EMPTY")] MidTank8Empty = 8015, /// <summary> - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_1_OVERFLOW")] MidTank1Overflow = 8016, /// <summary> - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_2_OVERFLOW")] MidTank2Overflow = 8017, /// <summary> - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_3_OVERFLOW")] MidTank3Overflow = 8018, /// <summary> - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_4_OVERFLOW")] MidTank4Overflow = 8019, /// <summary> - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_5_OVERFLOW")] MidTank5Overflow = 8020, /// <summary> - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_6_OVERFLOW")] MidTank6Overflow = 8021, /// <summary> - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_7_OVERFLOW")] MidTank7Overflow = 8022, /// <summary> - ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_8_OVERFLOW")] MidTank8Overflow = 8023, /// <summary> - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_1_FILL_TIMEOUT")] MidTank1FillTimeout = 8024, /// <summary> - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_2_FILL_TIMEOUT")] MidTank2FillTimeout = 8025, /// <summary> - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_3_FILL_TIMEOUT")] MidTank3FillTimeout = 8026, /// <summary> - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_4_FILL_TIMEOUT")] MidTank4FillTimeout = 8027, /// <summary> - ///Failed to fill @ ink. Canot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_5_FILL_TIMEOUT")] MidTank5FillTimeout = 8028, /// <summary> - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_6_FILL_TIMEOUT")] MidTank6FillTimeout = 8029, /// <summary> - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_7_FILL_TIMEOUT")] MidTank7FillTimeout = 8030, /// <summary> - ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_8_FILL_TIMEOUT")] MidTank8FillTimeout = 8031, /// <summary> - ///Level of @ is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_9_LOW_LEVEL")] MidTank9LowLevel = 8032, /// <summary> - ///The @ is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_9_EMPTY")] MidTank9Empty = 8033, /// <summary> - ///Overflow in @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_9_OVERFLOW")] MidTank9Overflow = 8034, /// <summary> - ///Failed to fill @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_9_FILL_TIMEOUT")] MidTank9FillTimeout = 8035, /// <summary> - ///Level of @ is low (Group = InkDeliverySystem, Category = Warning) + ///The @ tank level is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_10_LOW_LEVEL")] MidTank10LowLevel = 8036, /// <summary> - ///The @ is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ tank is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_10_EMPTY")] MidTank10Empty = 8037, /// <summary> - ///Overflow in @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_10_OVERFLOW")] MidTank10Overflow = 8038, /// <summary> - ///Failed to fill @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ tank. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_10_FILL_TIMEOUT")] MidTank10FillTimeout = 8039, /// <summary> diff --git a/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs b/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs index c716906e6..def81f838 100644 --- a/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs +++ b/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs @@ -23,18 +23,19 @@ namespace Tango.PMR.Printing { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "Cg5Kb2JTcG9vbC5wcm90bxISVGFuZ28uUE1SLlByaW50aW5nGhJKb2JTcG9v", - "bFR5cGUucHJvdG8ingIKCEpvYlNwb29sEjYKDEpvYlNwb29sVHlwZRgBIAEo", + "bFR5cGUucHJvdG8iuAIKCEpvYlNwb29sEjYKDEpvYlNwb29sVHlwZRgBIAEo", "DjIgLlRhbmdvLlBNUi5QcmludGluZy5Kb2JTcG9vbFR5cGUSDgoGTGVuZ3Ro", "GAIgASgBEg4KBldlaWdodBgDIAEoARIQCghEaWFtZXRlchgEIAEoARIbChNS", "b3RhdGlvbnNQZXJQYXNzYWdlGAUgASgBEhkKEVN0YXJ0T2Zmc2V0UHVsc2Vz", "GAYgASgFEhMKC0JhY2tpbmdSYXRlGAcgASgFEhsKE1NlZ21lbnRPZmZzZXRQ", "dWxzZXMYCCABKAUSGQoRQm90dG9tQmFja2luZ1JhdGUYCSABKAUSIwobTGlt", - "aXRTd2l0Y2hTdGFydFBvaW50T2Zmc2V0GAogASgFQh4KHGNvbS50d2luZS50", - "YW5nby5wbXIucHJpbnRpbmdiBnByb3RvMw==")); + "aXRTd2l0Y2hTdGFydFBvaW50T2Zmc2V0GAogASgFEhgKEEJ0c3JTcG9vbFRl", + "bnNpb24YCyABKAVCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IG", + "cHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSpoolTypeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobSpool), global::Tango.PMR.Printing.JobSpool.Parser, new[]{ "JobSpoolType", "Length", "Weight", "Diameter", "RotationsPerPassage", "StartOffsetPulses", "BackingRate", "SegmentOffsetPulses", "BottomBackingRate", "LimitSwitchStartPointOffset" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobSpool), global::Tango.PMR.Printing.JobSpool.Parser, new[]{ "JobSpoolType", "Length", "Weight", "Diameter", "RotationsPerPassage", "StartOffsetPulses", "BackingRate", "SegmentOffsetPulses", "BottomBackingRate", "LimitSwitchStartPointOffset", "BtsrSpoolTension" }, null, null, null) })); } #endregion @@ -75,6 +76,7 @@ namespace Tango.PMR.Printing { segmentOffsetPulses_ = other.segmentOffsetPulses_; bottomBackingRate_ = other.bottomBackingRate_; limitSwitchStartPointOffset_ = other.limitSwitchStartPointOffset_; + btsrSpoolTension_ = other.btsrSpoolTension_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -192,6 +194,17 @@ namespace Tango.PMR.Printing { } } + /// <summary>Field number for the "BtsrSpoolTension" field.</summary> + public const int BtsrSpoolTensionFieldNumber = 11; + private int btsrSpoolTension_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int BtsrSpoolTension { + get { return btsrSpoolTension_; } + set { + btsrSpoolTension_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as JobSpool); @@ -215,6 +228,7 @@ namespace Tango.PMR.Printing { if (SegmentOffsetPulses != other.SegmentOffsetPulses) return false; if (BottomBackingRate != other.BottomBackingRate) return false; if (LimitSwitchStartPointOffset != other.LimitSwitchStartPointOffset) return false; + if (BtsrSpoolTension != other.BtsrSpoolTension) return false; return true; } @@ -231,6 +245,7 @@ namespace Tango.PMR.Printing { if (SegmentOffsetPulses != 0) hash ^= SegmentOffsetPulses.GetHashCode(); if (BottomBackingRate != 0) hash ^= BottomBackingRate.GetHashCode(); if (LimitSwitchStartPointOffset != 0) hash ^= LimitSwitchStartPointOffset.GetHashCode(); + if (BtsrSpoolTension != 0) hash ^= BtsrSpoolTension.GetHashCode(); return hash; } @@ -281,6 +296,10 @@ namespace Tango.PMR.Printing { output.WriteRawTag(80); output.WriteInt32(LimitSwitchStartPointOffset); } + if (BtsrSpoolTension != 0) { + output.WriteRawTag(88); + output.WriteInt32(BtsrSpoolTension); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -316,6 +335,9 @@ namespace Tango.PMR.Printing { if (LimitSwitchStartPointOffset != 0) { size += 1 + pb::CodedOutputStream.ComputeInt32Size(LimitSwitchStartPointOffset); } + if (BtsrSpoolTension != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(BtsrSpoolTension); + } return size; } @@ -354,6 +376,9 @@ namespace Tango.PMR.Printing { if (other.LimitSwitchStartPointOffset != 0) { LimitSwitchStartPointOffset = other.LimitSwitchStartPointOffset; } + if (other.BtsrSpoolTension != 0) { + BtsrSpoolTension = other.BtsrSpoolTension; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -404,6 +429,10 @@ namespace Tango.PMR.Printing { LimitSwitchStartPointOffset = input.ReadInt32(); break; } + case 88: { + BtsrSpoolTension = input.ReadInt32(); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/Printing/JobTicket.cs b/Software/Visual_Studio/Tango.PMR/Printing/JobTicket.cs index 8e314704d..40460508f 100644 --- a/Software/Visual_Studio/Tango.PMR/Printing/JobTicket.cs +++ b/Software/Visual_Studio/Tango.PMR/Printing/JobTicket.cs @@ -26,26 +26,28 @@ namespace Tango.PMR.Printing { "bWVudC5wcm90bxoXUHJvY2Vzc1BhcmFtZXRlcnMucHJvdG8aFkpvYldpbmRp", "bmdNZXRob2QucHJvdG8aDkpvYlNwb29sLnByb3RvGhdKb2JVcGxvYWRTdHJh", "dGVneS5wcm90bxoWVGhyZWFkUGFyYW1ldGVycy5wcm90bxocSGVhZENsZWFu", - "aW5nUGFyYW1ldGVycy5wcm90byL9BAoJSm9iVGlja2V0EgwKBEd1aWQYASAB", - "KAkSDAoETmFtZRgCIAEoCRIaChJFbmFibGVJbnRlclNlZ21lbnQYAyABKAgS", - "GgoSSW50ZXJTZWdtZW50TGVuZ3RoGAQgASgBEg4KBkxlbmd0aBgFIAEoARJA", - "ChFQcm9jZXNzUGFyYW1ldGVycxgGIAEoCzIlLlRhbmdvLlBNUi5QcmludGlu", - "Zy5Qcm9jZXNzUGFyYW1ldGVycxI7Cg1XaW5kaW5nTWV0aG9kGAcgASgOMiQu", - "VGFuZ28uUE1SLlByaW50aW5nLkpvYldpbmRpbmdNZXRob2QSKwoFU3Bvb2wY", - "CCABKAsyHC5UYW5nby5QTVIuUHJpbnRpbmcuSm9iU3Bvb2wSMAoIU2VnbWVu", - "dHMYCSADKAsyHi5UYW5nby5QTVIuUHJpbnRpbmcuSm9iU2VnbWVudBI9Cg5V", - "cGxvYWRTdHJhdGVneRgKIAEoDjIlLlRhbmdvLlBNUi5QcmludGluZy5Kb2JV", - "cGxvYWRTdHJhdGVneRIaChJKb2JEZXNjcmlwdGlvbkZpbGUYCyABKAkSGQoR", - "RW5hYmxlTHVicmljYXRpb24YDCABKAgSFQoNTnVtYmVyT2ZVbml0cxgNIAEo", - "DRIVCg1TYW1wbGVXaW5kaW5nGA4gASgIEj4KEFRocmVhZFBhcmFtZXRlcnMY", - "DyABKAsyJC5UYW5nby5QTVIuUHJpbnRpbmcuVGhyZWFkUGFyYW1ldGVycxJK", - "ChZIZWFkQ2xlYW5pbmdQYXJhbWV0ZXJzGBAgASgLMiouVGFuZ28uUE1SLlBy", - "aW50aW5nLkhlYWRDbGVhbmluZ1BhcmFtZXRlcnNCHgocY29tLnR3aW5lLnRh", - "bmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); + "aW5nUGFyYW1ldGVycy5wcm90bxoUQnRzclBhcmFtZXRlcnMucHJvdG8itQUK", + "CUpvYlRpY2tldBIMCgRHdWlkGAEgASgJEgwKBE5hbWUYAiABKAkSGgoSRW5h", + "YmxlSW50ZXJTZWdtZW50GAMgASgIEhoKEkludGVyU2VnbWVudExlbmd0aBgE", + "IAEoARIOCgZMZW5ndGgYBSABKAESQAoRUHJvY2Vzc1BhcmFtZXRlcnMYBiAB", + "KAsyJS5UYW5nby5QTVIuUHJpbnRpbmcuUHJvY2Vzc1BhcmFtZXRlcnMSOwoN", + "V2luZGluZ01ldGhvZBgHIAEoDjIkLlRhbmdvLlBNUi5QcmludGluZy5Kb2JX", + "aW5kaW5nTWV0aG9kEisKBVNwb29sGAggASgLMhwuVGFuZ28uUE1SLlByaW50", + "aW5nLkpvYlNwb29sEjAKCFNlZ21lbnRzGAkgAygLMh4uVGFuZ28uUE1SLlBy", + "aW50aW5nLkpvYlNlZ21lbnQSPQoOVXBsb2FkU3RyYXRlZ3kYCiABKA4yJS5U", + "YW5nby5QTVIuUHJpbnRpbmcuSm9iVXBsb2FkU3RyYXRlZ3kSGgoSSm9iRGVz", + "Y3JpcHRpb25GaWxlGAsgASgJEhkKEUVuYWJsZUx1YnJpY2F0aW9uGAwgASgI", + "EhUKDU51bWJlck9mVW5pdHMYDSABKA0SFQoNU2FtcGxlV2luZGluZxgOIAEo", + "CBI+ChBUaHJlYWRQYXJhbWV0ZXJzGA8gASgLMiQuVGFuZ28uUE1SLlByaW50", + "aW5nLlRocmVhZFBhcmFtZXRlcnMSSgoWSGVhZENsZWFuaW5nUGFyYW1ldGVy", + "cxgQIAEoCzIqLlRhbmdvLlBNUi5QcmludGluZy5IZWFkQ2xlYW5pbmdQYXJh", + "bWV0ZXJzEjYKDkJ0c3JQYXJhbWV0ZXJzGBEgASgLMh4uVGFuZ28uUE1SLkJU", + "U1IuQnRzclBhcmFtZXRlcnNCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmlu", + "dGluZ2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSegmentReflection.Descriptor, global::Tango.PMR.Printing.ProcessParametersReflection.Descriptor, global::Tango.PMR.Printing.JobWindingMethodReflection.Descriptor, global::Tango.PMR.Printing.JobSpoolReflection.Descriptor, global::Tango.PMR.Printing.JobUploadStrategyReflection.Descriptor, global::Tango.PMR.Printing.ThreadParametersReflection.Descriptor, global::Tango.PMR.Printing.HeadCleaningParametersReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSegmentReflection.Descriptor, global::Tango.PMR.Printing.ProcessParametersReflection.Descriptor, global::Tango.PMR.Printing.JobWindingMethodReflection.Descriptor, global::Tango.PMR.Printing.JobSpoolReflection.Descriptor, global::Tango.PMR.Printing.JobUploadStrategyReflection.Descriptor, global::Tango.PMR.Printing.ThreadParametersReflection.Descriptor, global::Tango.PMR.Printing.HeadCleaningParametersReflection.Descriptor, global::Tango.PMR.BTSR.BtsrParametersReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobTicket), global::Tango.PMR.Printing.JobTicket.Parser, new[]{ "Guid", "Name", "EnableInterSegment", "InterSegmentLength", "Length", "ProcessParameters", "WindingMethod", "Spool", "Segments", "UploadStrategy", "JobDescriptionFile", "EnableLubrication", "NumberOfUnits", "SampleWinding", "ThreadParameters", "HeadCleaningParameters" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobTicket), global::Tango.PMR.Printing.JobTicket.Parser, new[]{ "Guid", "Name", "EnableInterSegment", "InterSegmentLength", "Length", "ProcessParameters", "WindingMethod", "Spool", "Segments", "UploadStrategy", "JobDescriptionFile", "EnableLubrication", "NumberOfUnits", "SampleWinding", "ThreadParameters", "HeadCleaningParameters", "BtsrParameters" }, null, null, null) })); } #endregion @@ -92,6 +94,7 @@ namespace Tango.PMR.Printing { sampleWinding_ = other.sampleWinding_; ThreadParameters = other.threadParameters_ != null ? other.ThreadParameters.Clone() : null; HeadCleaningParameters = other.headCleaningParameters_ != null ? other.HeadCleaningParameters.Clone() : null; + BtsrParameters = other.btsrParameters_ != null ? other.BtsrParameters.Clone() : null; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -277,6 +280,17 @@ namespace Tango.PMR.Printing { } } + /// <summary>Field number for the "BtsrParameters" field.</summary> + public const int BtsrParametersFieldNumber = 17; + private global::Tango.PMR.BTSR.BtsrParameters btsrParameters_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Tango.PMR.BTSR.BtsrParameters BtsrParameters { + get { return btsrParameters_; } + set { + btsrParameters_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as JobTicket); @@ -306,6 +320,7 @@ namespace Tango.PMR.Printing { if (SampleWinding != other.SampleWinding) return false; if (!object.Equals(ThreadParameters, other.ThreadParameters)) return false; if (!object.Equals(HeadCleaningParameters, other.HeadCleaningParameters)) return false; + if (!object.Equals(BtsrParameters, other.BtsrParameters)) return false; return true; } @@ -328,6 +343,7 @@ namespace Tango.PMR.Printing { if (SampleWinding != false) hash ^= SampleWinding.GetHashCode(); if (threadParameters_ != null) hash ^= ThreadParameters.GetHashCode(); if (headCleaningParameters_ != null) hash ^= HeadCleaningParameters.GetHashCode(); + if (btsrParameters_ != null) hash ^= BtsrParameters.GetHashCode(); return hash; } @@ -399,6 +415,10 @@ namespace Tango.PMR.Printing { output.WriteRawTag(130, 1); output.WriteMessage(HeadCleaningParameters); } + if (btsrParameters_ != null) { + output.WriteRawTag(138, 1); + output.WriteMessage(BtsrParameters); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -450,6 +470,9 @@ namespace Tango.PMR.Printing { if (headCleaningParameters_ != null) { size += 2 + pb::CodedOutputStream.ComputeMessageSize(HeadCleaningParameters); } + if (btsrParameters_ != null) { + size += 2 + pb::CodedOutputStream.ComputeMessageSize(BtsrParameters); + } return size; } @@ -516,6 +539,12 @@ namespace Tango.PMR.Printing { } HeadCleaningParameters.MergeFrom(other.HeadCleaningParameters); } + if (other.btsrParameters_ != null) { + if (btsrParameters_ == null) { + btsrParameters_ = new global::Tango.PMR.BTSR.BtsrParameters(); + } + BtsrParameters.MergeFrom(other.BtsrParameters); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -602,6 +631,13 @@ namespace Tango.PMR.Printing { input.ReadMessage(headCleaningParameters_); break; } + case 138: { + if (btsrParameters_ == null) { + btsrParameters_ = new global::Tango.PMR.BTSR.BtsrParameters(); + } + input.ReadMessage(btsrParameters_); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs index b0c29288f..0a92c27e3 100644 --- a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs +++ b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs @@ -23,7 +23,7 @@ namespace Tango.PMR.Printing { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChdQcm9jZXNzUGFyYW1ldGVycy5wcm90bxISVGFuZ28uUE1SLlByaW50aW5n", - "ItIFChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU", + "IqcGChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU", "CgxNaW5JbmtVcHRha2UYAiABKAESFAoMTWF4SW5rVXB0YWtlGAMgASgBEhUK", "DUZlZWRlclRlbnNpb24YBCABKAESFQoNUHVsbGVyVGVuc2lvbhgFIAEoARIV", "Cg1XaW5kZXJUZW5zaW9uGAYgASgBEhEKCU1peGVyVGVtcBgHIAEoARIVCg1I", @@ -39,11 +39,13 @@ namespace Tango.PMR.Printing { "cBgZIAEoARIWCg5IZWFkWm9uZTEyVGVtcBgaIAEoARITCgtSQmxvd2VyRmxv", "dxgbIAEoARITCgtSQmxvd2VyVGVtcBgcIAEoARITCgtMQmxvd2VyRmxvdxgd", "IAEoARITCgtMQmxvd2VyVGVtcBgeIAEoARIXCg9QcmVzc3VyZUJ1aWxkVXAY", - "HyABKAFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); + "HyABKAESGgoSQnRzckZlZWRpbmdUZW5zaW9uGCAgASgBEhcKD0J0c3JFeGl0", + "VGVuc2lvbhghIAEoARIeChZCdHNyVGhyZWFkTGVuZ3RoT2Zmc2V0GCIgASgB", + "Qh4KHGNvbS50d2luZS50YW5nby5wbXIucHJpbnRpbmdiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.ProcessParameters), global::Tango.PMR.Printing.ProcessParameters.Parser, new[]{ "DyeingSpeed", "MinInkUptake", "MaxInkUptake", "FeederTension", "PullerTension", "WinderTension", "MixerTemp", "HeadZone1Temp", "HeadZone2Temp", "HeadZone3Temp", "HeadZone4Temp", "HeadZone5Temp", "HeadZone6Temp", "DryerAirFlow", "DryerZone1Temp", "DryerZone2Temp", "DryerZone3Temp", "DryerBufferLength", "HeadAirFlow", "TableIndex", "HeadZone7Temp", "HeadZone8Temp", "HeadZone9Temp", "HeadZone10Temp", "HeadZone11Temp", "HeadZone12Temp", "RBlowerFlow", "RBlowerTemp", "LBlowerFlow", "LBlowerTemp", "PressureBuildUp" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.ProcessParameters), global::Tango.PMR.Printing.ProcessParameters.Parser, new[]{ "DyeingSpeed", "MinInkUptake", "MaxInkUptake", "FeederTension", "PullerTension", "WinderTension", "MixerTemp", "HeadZone1Temp", "HeadZone2Temp", "HeadZone3Temp", "HeadZone4Temp", "HeadZone5Temp", "HeadZone6Temp", "DryerAirFlow", "DryerZone1Temp", "DryerZone2Temp", "DryerZone3Temp", "DryerBufferLength", "HeadAirFlow", "TableIndex", "HeadZone7Temp", "HeadZone8Temp", "HeadZone9Temp", "HeadZone10Temp", "HeadZone11Temp", "HeadZone12Temp", "RBlowerFlow", "RBlowerTemp", "LBlowerFlow", "LBlowerTemp", "PressureBuildUp", "BtsrFeedingTension", "BtsrExitTension", "BtsrThreadLengthOffset" }, null, null, null) })); } #endregion @@ -105,6 +107,9 @@ namespace Tango.PMR.Printing { lBlowerFlow_ = other.lBlowerFlow_; lBlowerTemp_ = other.lBlowerTemp_; pressureBuildUp_ = other.pressureBuildUp_; + btsrFeedingTension_ = other.btsrFeedingTension_; + btsrExitTension_ = other.btsrExitTension_; + btsrThreadLengthOffset_ = other.btsrThreadLengthOffset_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -453,6 +458,39 @@ namespace Tango.PMR.Printing { } } + /// <summary>Field number for the "BtsrFeedingTension" field.</summary> + public const int BtsrFeedingTensionFieldNumber = 32; + private double btsrFeedingTension_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double BtsrFeedingTension { + get { return btsrFeedingTension_; } + set { + btsrFeedingTension_ = value; + } + } + + /// <summary>Field number for the "BtsrExitTension" field.</summary> + public const int BtsrExitTensionFieldNumber = 33; + private double btsrExitTension_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double BtsrExitTension { + get { return btsrExitTension_; } + set { + btsrExitTension_ = value; + } + } + + /// <summary>Field number for the "BtsrThreadLengthOffset" field.</summary> + public const int BtsrThreadLengthOffsetFieldNumber = 34; + private double btsrThreadLengthOffset_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double BtsrThreadLengthOffset { + get { return btsrThreadLengthOffset_; } + set { + btsrThreadLengthOffset_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as ProcessParameters); @@ -497,6 +535,9 @@ namespace Tango.PMR.Printing { if (LBlowerFlow != other.LBlowerFlow) return false; if (LBlowerTemp != other.LBlowerTemp) return false; if (PressureBuildUp != other.PressureBuildUp) return false; + if (BtsrFeedingTension != other.BtsrFeedingTension) return false; + if (BtsrExitTension != other.BtsrExitTension) return false; + if (BtsrThreadLengthOffset != other.BtsrThreadLengthOffset) return false; return true; } @@ -534,6 +575,9 @@ namespace Tango.PMR.Printing { if (LBlowerFlow != 0D) hash ^= LBlowerFlow.GetHashCode(); if (LBlowerTemp != 0D) hash ^= LBlowerTemp.GetHashCode(); if (PressureBuildUp != 0D) hash ^= PressureBuildUp.GetHashCode(); + if (BtsrFeedingTension != 0D) hash ^= BtsrFeedingTension.GetHashCode(); + if (BtsrExitTension != 0D) hash ^= BtsrExitTension.GetHashCode(); + if (BtsrThreadLengthOffset != 0D) hash ^= BtsrThreadLengthOffset.GetHashCode(); return hash; } @@ -668,6 +712,18 @@ namespace Tango.PMR.Printing { output.WriteRawTag(249, 1); output.WriteDouble(PressureBuildUp); } + if (BtsrFeedingTension != 0D) { + output.WriteRawTag(129, 2); + output.WriteDouble(BtsrFeedingTension); + } + if (BtsrExitTension != 0D) { + output.WriteRawTag(137, 2); + output.WriteDouble(BtsrExitTension); + } + if (BtsrThreadLengthOffset != 0D) { + output.WriteRawTag(145, 2); + output.WriteDouble(BtsrThreadLengthOffset); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -766,6 +822,15 @@ namespace Tango.PMR.Printing { if (PressureBuildUp != 0D) { size += 2 + 8; } + if (BtsrFeedingTension != 0D) { + size += 2 + 8; + } + if (BtsrExitTension != 0D) { + size += 2 + 8; + } + if (BtsrThreadLengthOffset != 0D) { + size += 2 + 8; + } return size; } @@ -867,6 +932,15 @@ namespace Tango.PMR.Printing { if (other.PressureBuildUp != 0D) { PressureBuildUp = other.PressureBuildUp; } + if (other.BtsrFeedingTension != 0D) { + BtsrFeedingTension = other.BtsrFeedingTension; + } + if (other.BtsrExitTension != 0D) { + BtsrExitTension = other.BtsrExitTension; + } + if (other.BtsrThreadLengthOffset != 0D) { + BtsrThreadLengthOffset = other.BtsrThreadLengthOffset; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1001,6 +1075,18 @@ namespace Tango.PMR.Printing { PressureBuildUp = input.ReadDouble(); break; } + case 257: { + BtsrFeedingTension = input.ReadDouble(); + break; + } + case 265: { + BtsrExitTension = input.ReadDouble(); + break; + } + case 273: { + BtsrThreadLengthOffset = input.ReadDouble(); + break; + } } } } diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs index a86454e26..b2ddc9c7d 100644 --- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Program.cs @@ -59,6 +59,8 @@ namespace Tango.PMRGenerator.CLI GenerateInsightsMonitors(db, pmrFolder); GenerateEventTypes(db, pmrFolder); GenerateInterfaceIOs(db, pmrFolder); + GenerateBtsrApplicationTypes(db, pmrFolder); + GenerateBtsrYarnTypes(db, pmrFolder); } Console.WriteLine("Done"); @@ -793,5 +795,61 @@ namespace Tango.PMRGenerator.CLI return null; } + + private static void GenerateBtsrApplicationTypes(ObservablesContext db, String pmrFolder) + { + Console.WriteLine("Generating BTSR Application Types..."); + + ProtoEnumFile enumFile = new ProtoEnumFile(); + enumFile.Name = "BtsrApplicationType"; + enumFile.Package = "Tango.PMR.BTSR"; + + enumFile.Fields.Add(new EnumerationField() + { + Name = "UNDEFINED_APPLICATION", + Value = 0, + }); + + foreach (var field in db.BtsrApplicationTypes.ToList().OrderBy(x => x.Code)) + { + enumFile.Fields.Add(new EnumerationField() + { + Name = field.Name.Replace(" ", ""), + Value = field.Code, + }); + } + + String enumString = enumFile.GenerateCode(); + + File.WriteAllText(Path.Combine(pmrFolder, "BTSR", enumFile.Name + ".proto"), enumString); + } + + private static void GenerateBtsrYarnTypes(ObservablesContext db, String pmrFolder) + { + Console.WriteLine("Generating BTSR Yarn Types..."); + + ProtoEnumFile enumFile = new ProtoEnumFile(); + enumFile.Name = "BtsrYarnType"; + enumFile.Package = "Tango.PMR.BTSR"; + + enumFile.Fields.Add(new EnumerationField() + { + Name = "UNDEFINED_YARN", + Value = 0, + }); + + foreach (var field in db.BtsrYarnTypes.ToList().OrderBy(x => x.Code)) + { + enumFile.Fields.Add(new EnumerationField() + { + Name = field.Name.Replace(" ", ""), + Value = field.Code, + }); + } + + String enumString = enumFile.GenerateCode(); + + File.WriteAllText(Path.Combine(pmrFolder, "BTSR", enumFile.Name + ".proto"), enumString); + } } } |